From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7c56112cf4014e2b4c887e48301dfb68df48bd68
Date: Thu, 12 Jun 2014 16:57:13 +0200 [thread overview]
Message-ID: <20140612145713.B625D20F97@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 26826 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 7c56112cf4014e2b4c887e48301dfb68df48bd68 (commit)
via b3b33f858651308c27b340ed94bf8eb4e82accfc (commit)
via d6e6e213415cca408a1bf93692e7643bd58bc066 (commit)
via edc08821f1fbeee5c9ae7fc4b4d4bd03f8821351 (commit)
via acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661 (commit)
via ad09461a43931ae0949ebc151c935230c268ccbb (commit)
via fd5ccb2dd5d0d4ee15bcae61c720eede3874bfbf (commit)
via c8f503560f9498723b042246c93ee83e26982102 (commit)
via a0ad10ca687d308f6b038fc50f7e5b156e8e64b3 (commit)
via 2511d78887a67436480b6bdfb267c6db412a0492 (commit)
from a7bbea30d49a1b98f6404d23cb3d218020ef67d8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7c56112cf4014e2b4c887e48301dfb68df48bd68
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 12 16:55:29 2014 +0200
libpcap: Update to 1.4.0.
commit b3b33f858651308c27b340ed94bf8eb4e82accfc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 12 16:44:07 2014 +0200
modem-lib.pl: Check if character device exists before trying to connect to it.
commit d6e6e213415cca408a1bf93692e7643bd58bc066
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 12 16:31:43 2014 +0200
samba: Show a simple example for default shares.
commit edc08821f1fbeee5c9ae7fc4b4d4bd03f8821351
Merge: acac5f2 ad09461
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 12 16:26:55 2014 +0200
Merge remote-tracking branch 'ummeegge/openvpn'
commit acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661
Merge: 2511d78 a7bbea3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 12 16:21:41 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit ad09461a43931ae0949ebc151c935230c268ccbb
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Thu Jun 12 16:17:02 2014 +0200
openvpn:Deleted download possibility for DH param and fixed some typos.
* Deleted DH-parameter download possibility in CA/key chart section.
* Fixed some typos in CA/key section.
commit fd5ccb2dd5d0d4ee15bcae61c720eede3874bfbf
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Thu Jun 12 09:11:52 2014 +0200
openvpn: Renamed CA chart, added ta.key to chart.
* Added keys to CA chart and renamed CA specifics infos to
CA and key infos.
* Added ta.key to CA/key chart listing.
commit c8f503560f9498723b042246c93ee83e26982102
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Thu Jun 12 08:37:07 2014 +0200
openvpn: Changed chart string for DH parameter and code cleanup.
* Added PKCS infos for DH parameter string in the chart.
* Deleted some redundant '<td>'s and indent some code in chart section.
commit a0ad10ca687d308f6b038fc50f7e5b156e8e64b3
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Thu Jun 12 08:27:43 2014 +0200
openvpn: Deleted double entry.
* 'my $authactive;' was two times defined, but only one time needed.
commit 2511d78887a67436480b6bdfb267c6db412a0492
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 8 11:26:13 2014 +0200
Fix typo in English translation (Monitor Interface).
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/modem-lib.pl | 12 +-
config/rootfiles/common/libpcap | 11 +-
.../{oldcore/28 => core/79}/filelists/libpcap | 0
config/samba/default.shares | 21 +---
html/cgi-bin/ovpnmain.cgi | 122 +++++++++++++++++----
langs/de/cgi-bin/de.pl | 12 +-
langs/en/cgi-bin/en.pl | 15 ++-
lfs/libpcap | 17 +--
8 files changed, 149 insertions(+), 61 deletions(-)
copy config/rootfiles/{oldcore/28 => core/79}/filelists/libpcap (100%)
Difference in files:
diff --git a/config/cfgroot/modem-lib.pl b/config/cfgroot/modem-lib.pl
index 51b6d68..5d43cc1 100644
--- a/config/cfgroot/modem-lib.pl
+++ b/config/cfgroot/modem-lib.pl
@@ -33,7 +33,10 @@ sub new() {
bless $self, $class;
# Initialize the connetion to the modem.
- $self->_initialize($port, $baud);
+ my $ret = $self->_initialize($port, $baud);
+ if ($ret) {
+ return undef;
+ }
if ($self->_is_working()) {
return $self;
@@ -54,9 +57,16 @@ sub DESTROY() {
sub _initialize() {
my ($self, $port, $baud) = @_;
+ # Check if the character device actually exists.
+ if (! -c $port) {
+ return 1;
+ }
+
# Establish connection to the modem.
$self->{modem} = new Device::Modem(port => $port);
$self->{modem}->connect(baudrate => $baud);
+
+ return 0;
}
sub _is_working() {
diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap
index 0fc7c00..e300c9b 100644
--- a/config/rootfiles/common/libpcap
+++ b/config/rootfiles/common/libpcap
@@ -1,7 +1,9 @@
#usr/bin/pcap-config
#usr/include/pcap
+#usr/include/pcap/bluetooth.h
#usr/include/pcap-bpf.h
#usr/include/pcap-int.h
+#usr/include/pcap/ipnet.h
#usr/include/pcap-namedb.h
#usr/include/pcap.h
#usr/include/pcap/bpf.h
@@ -9,11 +11,12 @@
#usr/include/pcap/pcap.h
#usr/include/pcap/sll.h
#usr/include/pcap/usb.h
+#usr/include/pcap/vlan.h
#usr/lib/libpcap.a
usr/lib/libpcap.so
usr/lib/libpcap.so.1
usr/lib/libpcap.so.1.0
-usr/lib/libpcap.so.1.0.0
+usr/lib/libpcap.so.1.4.0
#usr/share/man/man1/pcap-config.1
#usr/share/man/man3/pcap.3pcap
#usr/share/man/man3/pcap_activate.3pcap
@@ -39,6 +42,7 @@ usr/lib/libpcap.so.1.0.0
#usr/share/man/man3/pcap_findalldevs.3pcap
#usr/share/man/man3/pcap_fopen_offline.3pcap
#usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
#usr/share/man/man3/pcap_freealldevs.3pcap
#usr/share/man/man3/pcap_freecode.3pcap
#usr/share/man/man3/pcap_get_selectable_fd.3pcap
@@ -48,6 +52,7 @@ usr/lib/libpcap.so.1.0.0
#usr/share/man/man3/pcap_is_swapped.3pcap
#usr/share/man/man3/pcap_lib_version.3pcap
#usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
#usr/share/man/man3/pcap_lookupdev.3pcap
#usr/share/man/man3/pcap_lookupnet.3pcap
#usr/share/man/man3/pcap_loop.3pcap
@@ -67,6 +72,7 @@ usr/lib/libpcap.so.1.0.0
#usr/share/man/man3/pcap_set_rfmon.3pcap
#usr/share/man/man3/pcap_set_snaplen.3pcap
#usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
#usr/share/man/man3/pcap_setdirection.3pcap
#usr/share/man/man3/pcap_setfilter.3pcap
#usr/share/man/man3/pcap_setnonblock.3pcap
@@ -74,6 +80,9 @@ usr/lib/libpcap.so.1.0.0
#usr/share/man/man3/pcap_stats.3pcap
#usr/share/man/man3/pcap_statustostr.3pcap
#usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
#usr/share/man/man5/pcap-savefile.5
#usr/share/man/man7/pcap-filter.7
#usr/share/man/man7/pcap-linktype.7
+#usr/share/man/man7/pcap-tstamp.7
diff --git a/config/rootfiles/core/79/filelists/libpcap b/config/rootfiles/core/79/filelists/libpcap
new file mode 120000
index 0000000..c7f9f52
--- /dev/null
+++ b/config/rootfiles/core/79/filelists/libpcap
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/config/samba/default.shares b/config/samba/default.shares
index aa21965..ee297fe 100644
--- a/config/samba/default.shares
+++ b/config/samba/default.shares
@@ -1,18 +1,9 @@
-[Temp]
-path = /tmp
-comment = Temp
-browseable = yes
+[Share1]
+path = /mnt/share1
+comment = Shared Folder
+browsable = yes
writeable = yes
-create mask = 0777
-directory mask = 0777
-guest ok = yes
-force user = samba
-[P2P]
-path = /var/ipfire/samba/p2p
-comment = P2P
-browseable = yes
-writeable = yes
-create mask = 0777
-directory mask = 0777
+create mask = 0644
+directory mask = 0755
guest ok = yes
force user = samba
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 921009f..45c2f6c 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1531,6 +1531,17 @@ END
}
###
+### Download tls-auth key
+###
+}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download tls-auth key'}) {
+ if ( -f "${General::swroot}/ovpn/certs/ta.key" ) {
+ print "Content-Type: application/octet-stream\r\n";
+ print "Content-Disposition: filename=ta.key\r\n\r\n";
+ print `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ exit(0);
+ }
+
+###
### Form for generating a root certificate
###
}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'} ||
@@ -2370,6 +2381,28 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
}
###
+### Display tls-auth key
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show tls-auth key'}) {
+
+ if (! -e "${General::swroot}/ovpn/certs/ta.key") {
+ $errormessage = $Lang::tr{'not present'};
+ } else {
+ &Header::showhttpheaders();
+ &Header::openpage($Lang::tr{'ovpn'}, 1, '');
+ &Header::openbigbox('100%', 'LEFT', '', '');
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'ta key'}:");
+ my $output = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ $output = &Header::cleanhtml($output,"y");
+ print "<pre>$output</pre>\n";
+ &Header::closebox();
+ print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
+ &Header::closebigbox();
+ &Header::closepage();
+ exit(0);
+ }
+
+###
### Display Certificate Revoke List
###
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show crl'}) {
@@ -3155,7 +3188,6 @@ my $complzoactive;
my $mssfixactive;
my $authactive;
my $n2nfragment;
-my $authactive;
my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);
my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]);
my @n2nproto = split(/-/, $n2nproto2[1]);
@@ -5215,6 +5247,8 @@ END
;
&Header::closebox();
}
+
+ # CA/key listing
&Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
print <<END;
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
@@ -5227,7 +5261,10 @@ END
;
my $col1="bgcolor='$color{'color22'}'";
my $col2="bgcolor='$color{'color20'}'";
+ # DH parameter line
my $col3="bgcolor='$color{'color22'}'";
+ # ta.key line
+ my $col4="bgcolor='$color{'color20'}'";
if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/cacert.pem`;
@@ -5239,15 +5276,16 @@ END
<tr>
<td class='base' $col1>$Lang::tr{'root certificate'}</td>
<td class='base' $col1>$casubject</td>
- <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
+ <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
<input type='hidden' name='ACTION' value='$Lang::tr{'show root certificate'}' />
<input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
+ </form>
+ <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
<input type='image' name='$Lang::tr{'download root certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' border='0' />
<input type='hidden' name='ACTION' value='$Lang::tr{'download root certificate'}' />
- </td></form>
- <td width='4%' $col1> </td></tr>
+ </form>
+ <td width='4%' $col1> </td>
+ </tr>
END
;
} else {
@@ -5256,7 +5294,8 @@ END
<tr>
<td class='base' $col1>$Lang::tr{'root certificate'}:</td>
<td class='base' $col1>$Lang::tr{'not present'}</td>
- <td colspan='3' $col1> </td></tr>
+ <td colspan='3' $col1> </td>
+ </tr>
END
;
}
@@ -5272,15 +5311,16 @@ END
<tr>
<td class='base' $col2>$Lang::tr{'host certificate'}</td>
<td class='base' $col2>$hostsubject</td>
- <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
+ <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
<input type='hidden' name='ACTION' value='$Lang::tr{'show host certificate'}' />
<input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
+ </form>
+ <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
<input type='image' name="$Lang::tr{'download host certificate'}" src='/images/media-floppy.png' alt="$Lang::tr{'download host certificate'}" title="$Lang::tr{'download host certificate'}" border='0' />
<input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" />
- </td></form>
- <td width='4%' $col2> </td></tr>
+ </td></form>
+ <td width='4%' $col2> </td>
+ </tr>
END
;
} else {
@@ -5289,7 +5329,8 @@ END
<tr>
<td width='25%' class='base' $col2>$Lang::tr{'host certificate'}:</td>
<td class='base' $col2>$Lang::tr{'not present'}</td>
- </td><td colspan='3' $col2> </td></tr>
+ </td><td colspan='3' $col2> </td>
+ </tr>
END
;
}
@@ -5297,7 +5338,7 @@ END
# Adding DH parameter to chart
if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
my $dhsubject = `/usr/bin/openssl dhparam -text -in ${General::swroot}/ovpn/ca/dh1024.pem`;
- $dhsubject =~ /PKCS#3 (.*)[\n]/;
+ $dhsubject =~ / (.*)[\n]/;
$dhsubject = $1;
@@ -5305,15 +5346,14 @@ END
<tr>
<td class='base' $col3>$Lang::tr{'dh parameter'}</td>
<td class='base' $col3>$dhsubject</td>
- <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
+ <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
<input type='hidden' name='ACTION' value='$Lang::tr{'show dh'}' />
<input type='image' name='$Lang::tr{'show dh'}' src='/images/info.gif' alt='$Lang::tr{'show dh'}' title='$Lang::tr{'show dh'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
- <input type='image' name="$Lang::tr{'download dh parameter'}" src='/images/media-floppy.png' alt="$Lang::tr{'download dh parameter'}" title="$Lang::tr{'download dh parameter'}" border='0' />
- <input type='hidden' name='ACTION' value="$Lang::tr{'download dh parameter'}" />
- </td></form>
- <td width='4%' $col3> </td></tr>
+ </form>
+ <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
+ </form>
+ <td width='4%' $col3> </td>
+ </tr>
END
;
} else {
@@ -5322,7 +5362,42 @@ END
<tr>
<td width='25%' class='base' $col3>$Lang::tr{'dh parameter'}:</td>
<td class='base' $col3>$Lang::tr{'not present'}</td>
- </td><td colspan='3' $col3> </td></tr>
+ </td><td colspan='3' $col3> </td>
+ </tr>
+END
+ ;
+ }
+
+ # Adding ta.key to chart
+ if (-f "${General::swroot}/ovpn/certs/ta.key") {
+ my $tasubject = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ $tasubject =~ /# (.*)[\n]/;
+ $tasubject = $1;
+ print <<END;
+
+ <tr>
+ <td class='base' $col4>$Lang::tr{'ta key'}</td>
+ <td class='base' $col4>$tasubject</td>
+ <form method='post' name='frmtakey'><td width='3%' align='center' $col4>
+ <input type='hidden' name='ACTION' value='$Lang::tr{'show tls-auth key'}' />
+ <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show tls-auth key'}' title='$Lang::tr{'show tls-auth key'}' width='20' height='20' border='0' />
+ </form>
+ <form method='post' name='frmtakey'><td width='3%' align='center' $col4>
+ <input type='image' name='$Lang::tr{'download tls-auth key'}' src='/images/media-floppy.png' alt='$Lang::tr{'download tls-auth key'}' title='$Lang::tr{'download tls-auth key'}' border='0' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'download tls-auth key'}' />
+ </form>
+ <td width='4%' $col4> </td>
+ </tr>
+END
+ ;
+ } else {
+ # Nothing
+ print <<END;
+ <tr>
+ <td width='25%' class='base' $col4>$Lang::tr{'ta key'}:</td>
+ <td class='base' $col4>$Lang::tr{'not present'}</td>
+ <td colspan='3' $col4> </td>
+ </tr>
END
;
}
@@ -5386,6 +5461,9 @@ END
<form method='post' enctype='multipart/form-data'>
<table width='100%' border='0'cellspacing='1' cellpadding='0'>
<tr>
+ <td class'base'><b>$Lang::tr{'upload ca certificate'}</b></td>
+ </tr>
+ <tr>
<td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
<td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td>
<td nowrap='nowrap'><input type='file' name='FH' size='25' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c604ef0..ae4d694 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -518,7 +518,7 @@
'ccd used' => 'Genutzte Adressen',
'cert' => 'Zertifikat',
'certificate' => 'Zertifikat',
-'certificate authorities' => 'Zertifizierungsstellen (CAs)',
+'certificate authorities' => 'Zertifizierungsstellen und -Schlüssel',
'certificate does not have a valid ca associated with it' => 'Mit dem Zertifikat ist keine gültige CA verbunden.',
'certificate file move failed' => 'Verschieben der Zertifikatsdatei fehlgeschlagen',
'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.',
@@ -554,7 +554,7 @@
'connection' => 'Verbindung',
'connection closed' => 'Nicht Verbunden...',
'connection debugging' => 'Verbindungs-Debugging',
-'connection status and controlc' => 'Verbindungsstatus und -kontrolle',
+'connection status and controlc' => 'Verbindungsstatus und -Kontrolle',
'connection tracking' => 'iptables-Verbindungsverfolgung',
'connection type' => 'Verbindungstyp',
'connection type is invalid' => 'Verbindungstyp ist ungültig',
@@ -769,12 +769,13 @@
'downlink std class' => 'Downloadstandardklasse',
'download' => 'herunterladen',
'download ca certificate' => 'CA-Zertifikat herunterladen',
-'download certificate' => 'Zertifikate herunterladen',
+'download certificate' => 'Datei herunterladen',
'download dh parameter' => 'Diffie-Hellman-Parameter herunterladen',
'download host certificate' => 'Host-Zertifikat herunterladen',
'download new ruleset' => 'Neuen Regelsatz herunterladen',
'download pkcs12 file' => 'PKCS12-Datei herunterladen',
'download root certificate' => 'Root-Zertifikat herunterladen',
+'download tls-auth key' => 'tls-auth Key herunterladen',
'dpd action' => 'Aktion für Dead Peer Detection',
'dpd delay' => 'Verzögerung',
'dpd timeout' => 'Zeitüberschreitung',
@@ -1666,7 +1667,7 @@
'ovpn device' => 'OpenVPN-Gerät',
'ovpn dh' => 'Diffie-Hellman-Parameter-Länge',
'ovpn dh new key' => 'Neuen Diffie-Hellman Parameter erstellen',
-'ovpn dh parameters' => 'Diffie-Hellman-Parameter-Optionen',
+'ovpn dh parameters' => 'Diffie-Hellman-Parameter Optionen',
'ovpn dh upload' => 'Neuen Diffie-Hellman-Parameter hochladen',
'ovpn dl' => 'OVPN-Konfiguration downloaden',
'ovpn engines' => 'Krypto Engine',
@@ -1935,7 +1936,7 @@
'shares' => 'Freigaben',
'show ajax speedmeter in footer' => 'Ajax Speed Anzeige',
'show ca certificate' => 'CA Zertifikat anzeigen',
-'show certificate' => 'Zertifikat anzeigen',
+'show certificate' => 'Datei anzeigen',
'show crl' => 'Certificate Revocation List anzeigen',
'show dh' => 'Diffie-Hellman-Parameter anzeigen',
'show host certificate' => 'Host-Zertifikat anzeigen',
@@ -2078,6 +2079,7 @@
'time server' => 'Zeitserver',
'timeout must be a number' => 'Wartezeit muss eine Zahl sein.',
'title' => 'Titel',
+'ta key' => 'TLS-Authentifizierungsschlüssel',
'to' => 'Bis',
'to email adr' => 'An Email Adresse',
'to install an update' => 'Um ein Update zu installieren, laden Sie zuerst die folgende .tgz.gpg Datei hoch:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f87607f..b1cfa83 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -536,7 +536,7 @@
'ccd used' => 'Used addresses',
'cert' => 'Certificate',
'certificate' => 'Certificate',
-'certificate authorities' => 'Certificate Authorities',
+'certificate authorities' => 'Certificate Authorities and -Keys',
'certificate does not have a valid ca associated with it' => 'Certificate does not have a valid CA associated with it.',
'certificate file move failed' => 'Certificate file move failed',
'cfg restart' => 'A reboot is suggested after restoring a configuration archive.',
@@ -574,7 +574,7 @@
'connection' => 'Connection',
'connection closed' => 'Not connected...',
'connection debugging' => 'Connection debugging',
-'connection status and controlc' => 'Connection status and control',
+'connection status and controlc' => 'Connection Status and -Control',
'connection tracking' => 'iptables Connection Tracking',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
@@ -795,12 +795,13 @@
'downlink std class' => 'downlink standard class',
'download' => 'download',
'download ca certificate' => 'Download CA certificate',
-'download certificate' => 'Download certificate',
+'download certificate' => 'Download file',
'download dh parameter' => 'Download Diffie-Hellman parameters',
'download host certificate' => 'Download host certificate',
'download new ruleset' => 'Download new ruleset',
'download pkcs12 file' => 'Download PKCS12 file',
'download root certificate' => 'Download root certificate',
+'download tls-auth key' => 'Download tls-auth key',
'dpd action' => 'Action',
'dpd delay' => 'Delay',
'dpd timeout' => 'Timeout',
@@ -1171,7 +1172,7 @@
'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient.',
'genkey' => 'Generate PSK',
'genre' => 'Genre',
-'global settings' => 'Global settings',
+'global settings' => 'Global Settings',
'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
'gpl license agreement' => 'License Agreement',
'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below',
@@ -1522,7 +1523,7 @@
'modify' => 'Modify',
'modulation' => 'Modulation',
'monday' => 'Monday',
-'monitor interface' => 'Monitior interface',
+'monitor interface' => 'Monitor Interface',
'month' => 'Month',
'month-graph' => 'Month',
'monthly firewallhits' => 'monthly firewallhits',
@@ -1969,7 +1970,7 @@
'show ajax speedmeter in footer' => 'Show Ajax speedmeter',
'show areas' => 'show areas',
'show ca certificate' => 'Show CA certificate',
-'show certificate' => 'Show certificate',
+'show certificate' => 'Show file',
'show crl' => 'Show certificate revocation list',
'show dh' => 'Show Diffie-Hellman parameters',
'show host certificate' => 'Show host certificate',
@@ -1977,6 +1978,7 @@
'show lines' => 'Show lines',
'show root certificate' => 'Show root certificate',
'show share options' => 'Show shares options',
+'show tls-auth key' => 'Show tls-auth key',
'shuffle' => 'Shuffle',
'shutdown' => 'Shutdown',
'shutdown ask' => 'Shutdown?',
@@ -2088,6 +2090,7 @@
'system log viewer' => 'System Log Viewer',
'system logs' => 'System Logs',
'system status information' => 'System Status Information',
+'ta key' => 'TLS-Authentification-Key',
'telephone not set' => 'Telephone not set.',
'template' => 'Preset',
'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.',
diff --git a/lfs/libpcap b/lfs/libpcap
index c6fdc2e..0f118a4 100644
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.0
+VER = 1.4.0
THISAPP = libpcap-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fno-strict-aliasing
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d
+$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c
install : $(TARGET)
@@ -70,15 +72,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make shared
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- cd $(DIR_APP) && make install-shared-so
- ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0
- ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1
- ln -svf libpcap.so.1 /usr/lib/libpcap.so
- cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-06-12 14:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140612145713.B625D20F97@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox