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, next has been updated
via 8279b2d7ffd4d6ebc054a6f763eed840b2c84ebf (commit)
via 5049f497aa974b1da80172820da66318aa1674f6 (commit)
via 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf (commit)
via 7119032e11ad50ed78bd6df2be8e8536d7191bf4 (commit)
via 17aa650da68eca57fb7f1cbd6f6d3654cea9f9a1 (commit)
via 6af27d7120da496521e7a313a4201be0438a67d2 (commit)
via f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 (commit)
via ac3b63071f903b110cbf0b87e5e8d3a9e5c99a77 (commit)
via 525839f74f6be04b59f8bb3874f5764fed078a78 (commit)
from 3a9c7a1a33b6844964775e0e082615d355058551 (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 8279b2d7ffd4d6ebc054a6f763eed840b2c84ebf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jun 21 19:04:33 2014 +0200
syslinux: add serial console output.
commit 5049f497aa974b1da80172820da66318aa1674f6
Merge: 3a9c7a1 4cb7c9b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jun 21 12:41:47 2014 +0200
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes:
config/syslinux/syslinux.cfg | 53 +++++++++++++--
config/urlfilter/redirect_wrapper | 137 ++++++++++++++++++++++----------------
doc/language_issues.de | 7 +-
doc/language_issues.en | 6 +-
doc/language_issues.es | 9 +--
doc/language_issues.fr | 9 +--
doc/language_issues.nl | 9 +--
doc/language_issues.pl | 9 +--
doc/language_issues.ru | 9 +--
doc/language_issues.tr | 9 +--
doc/language_missings | 8 +++
html/cgi-bin/ovpnmain.cgi | 11 ---
langs/de/cgi-bin/de.pl | 4 +-
langs/en/cgi-bin/en.pl | 2 +-
lfs/linux | 10 +--
15 files changed, 166 insertions(+), 126 deletions(-)
Difference in files:
diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 8832089..3c7ae87 100644
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,3 +1,4 @@
+SERIAL 0 115200
UI vesamenu.c32
PROMPT 0
@@ -25,8 +26,7 @@ MENU TITLE Welcome!
LABEL installer
MENU LABEL Install IPFire VERSION
TEXT HELP
-Install the version of IPFire that is
-on this disk.
+Install the version of IPFire that is on this disk.
ENDTEXT
KERNEL vmlinuz
INITRD instroot
@@ -80,12 +80,57 @@ Diagnose memory problems with memtest86+.
LABEL hdt
MENU LABEL Hardware Detection Tool
TEXT HELP
-Check your hardware with the Hardware Detection
-Tool!
+Check your hardware with the Hardware Detection Tool!
ENDTEXT
KERNEL hdt.c32
MENU END
+MENU BEGIN serial
+ MENU TITLE Serial console options
+
+ LABEL serial.back
+ MENU LABEL Back
+ MENU EXIT
+
+ MENU SEPARATOR
+
+ LABEL ipfire-serial
+ MENU LABEL Install IPFire (serial)
+ TEXT HELP
+Run the installer with serial console.
+ ENDTEXT
+ KERNEL vmlinuz
+ INITRD instroot
+ APPEND console=ttyS0,115200 novga
+
+ LABEL unattended-serial
+ MENU LABEL Unattended installation (serial)
+ TEXT HELP
+Run an unattended installation wit serial console.
+ ENDTEXT
+ KERNEL vmlinuz
+ INITRD instroot
+ APPEND console=ttyS0,115200 novga unattended
+
+ MENU SEPARATOR
+
+ LABEL memtest-serial
+ MENU LABEL memtest86+ (serial)
+ TEXT HELP
+Diagnose memory problems with memtest86+ with serial console.
+ ENDTEXT
+ KERNEL memtest
+ APPEND console=ttyS0,115200
+
+ LABEL hdt-serial
+ MENU LABEL Hardware Detection Tool
+ TEXT HELP
+Check your hardware with the Hardware Detection Tool!
+ ENDTEXT
+ KERNEL hdt.c32
+
+MENU END
+
MENU SEPARATOR
LABEL netboot
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index 96cc0a0..3e8b49e 100644
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -21,12 +21,9 @@
# #
###############################################################################
-use strict;
use IPC::Open2;
use IO::Handle;
-my $redirectors;
-
require '/var/ipfire/general-functions.pl';
my %proxysettings=();
@@ -35,15 +32,20 @@ $proxysettings{'ENABLE_CLAMAV'} = 'off';
$proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
-# define here your redirectors (use a comma sperated list)
-if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){$redirectors = [ '/usr/bin/squidGuard', '/usr/bin/squidclamav', '/usr/sbin/updxlrator' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){$redirectors = [ '/usr/bin/squidGuard', '/usr/bin/squidclamav' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){$redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){$redirectors = [ '/usr/bin/squidGuard' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){$redirectors = [ '/usr/bin/squidclamav', '/usr/sbin/updxlrator' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){$redirectors = [ '/usr/bin/squidclamav' ];}
-elsif ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){$redirectors = [ '/usr/sbin/updxlrator' ];}
-else { $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];}
+# define here your redirectors
+my @redirectors = ();
+
+if ($proxysettings{'ENABLE_FILTER'} eq 'on') {
+ push(@redirectors, "/usr/bin/squidGuard");
+}
+
+if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
+ push(@redirectors, "/usr/bin/squidclamav");
+}
+
+if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') {
+ push(@redirectors, "/usr/sbin/updxlrator");
+}
# Attention: keep in mind that the order of your redirectors is important.
# It doesn't make sense to scan for viruses on pages you restrict access to...
@@ -55,68 +57,89 @@ else { $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];}
# init
$| = 1;
STDOUT->autoflush(1);
-my $line;
-my $return;
-my $i;
+
my $debug=0; # enable only for debugging
-if ( -e "/var/ipfire/proxy/enable_redirector_debug" ){
- $debug = 1;
+if (-e "/var/ipfire/proxy/enable_redirector_debug") {
writetolog("Urlfilter = ".$proxysettings{'ENABLE_FILTER'}." Clamav = ".$proxysettings{'ENABLE_CLAMAV'}." Updxlrator = ".$proxysettings{'ENABLE_UPDXLRATOR'});
- }
+ $debug = 1;
+}
-# open progamms
-my $pidlist = [];
-my $rlist = [];
-my $wlist = [];
+# Open one instance for each redirector in the list and
+# put them into an array with the STDIN and STDOUT file
+# descriptors.
+my @instances = ();
-for($i = 0; $i < @$redirectors; $i++) {
- $pidlist->[$i] = open2($rlist->[$i], $wlist->[$i], $redirectors->[$i]);
- if ($debug){
- writetolog("Current redirector is ".$redirectors->[$i]." number ".$i." PID ".$pidlist->[$i]);
- }
+foreach my $redirector (@redirectors) {
+ my $desc_out = new IO::Handle();
+ my $desc_in = new IO::Handle();
+
+ my $pid = open2($desc_out, $desc_in, $redirector);
+
+ if ($debug) {
+ &writetolog("Started an instance of $redirector with PID $pid");
}
+ push(@instances, [$redirector, $desc_out, $desc_in]);
+}
+
# wait for data...
-while($line = <>) {
- $return = "";
+my $line;
+while ($line = <>) {
+ my $return = "ERR\n";
- for($i = 0; $i < @$redirectors; $i++) {
- $wlist->[$i]->print($line);
- $return = $rlist->[$i]->getline;
+ foreach my $instance (@instances) {
+ my $redirector = @$instance[0];
+ my $desc_out = @$instance[1];
+ my $desc_in = @$instance[2];
+ my $response;
- if ( $return eq "Processing file and database" ){
+ # Send request to the redirector.
+ $desc_in->print($line);
+
+ # Wait for a response.
+ $response = $desc_out->getline;
+
+ # Catch invalid responses from squidGuard.
+ if ($redirector eq "/usr/bin/squidGuard" && $response eq "Processing file and database") {
system("logger -t ipfire 'Emergency - squidGuard not initialised please run squidGuard -C all'");
- }
+ next;
+ }
- if ($debug){
- my $dline = $line;my $dreturn = $return;chomp $dline;chomp $dreturn;
- if ( $return eq $line or $return eq "\n" or $return eq "" ){
- writetolog("Request equals result by ".$redirectors->[$i]." ".$dline);
- }
- else {
- writetolog($redirectors->[$i]." answers ".$dreturn."\n Querried ".$dline);
- }
- }
+ # Writing debug output.
+ if ($debug) {
+ my $len_response = length($response);
+
+ &writetolog("Queried $redirector for: $line");
+ &writetolog(" --> Response ($len_response): $response");
+ }
- # break if redirector changes data
- if($return ne "ERR\n" and $return ne $line ){
- if ( $redirectors->[$i] ne "/usr/sbin/updxlrator"){
- if ($debug){
- writetolog($redirectors->[$i]." is stopping querry because block was found.");
- }
- $i = @$redirectors;
- }
+ # If we got a decisive response, we send it back to squid
+ # and stop querying any more redirectors.
+ if ($response =~ /^(OK|BH)/) {
+ if ($debug) {
+ &writetolog(" -- Stopped querying redirectors");
}
+
+ $return = $response;
+ last;
}
- print $return;
}
+ # Send response back to squid.
+ if ($debug) {
+ &writetolog("Sending back to squid: $return");
+ }
+ print $return;
+}
+
exit 0;
sub writetolog {
- open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/squid/redirector_debug";
- my $log = shift;
- print DATEI $log."\n";
- close(DATEI);
- }
+ my $message = shift;
+ chomp($message);
+
+ open(FILE, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/squid/redirector_debug";
+ print FILE "$message\n";
+ close(FILE);
+}
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 9d1e0ad..e814281 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -145,6 +145,7 @@ WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
+WARNING: translation string unused: download dh parameter
WARNING: translation string unused: driver
WARNING: translation string unused: dstprt range overlaps
WARNING: translation string unused: dstprt within existing
@@ -459,16 +460,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -495,7 +492,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -630,4 +626,5 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: uplink
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 55ee3e2..57e0dd3 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -168,6 +168,7 @@ WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: download dh parameter
WARNING: translation string unused: driver
WARNING: translation string unused: dstprt range overlaps
WARNING: translation string unused: dstprt within existing
@@ -486,16 +487,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -525,7 +522,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6bbdc18..a872503 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -420,16 +420,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -459,7 +455,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -655,7 +650,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: downlink
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
@@ -920,6 +915,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
@@ -929,6 +925,7 @@ WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
+WARNING: untranslated string: ta key
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 13a3c88..ed42fe5 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -431,16 +431,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -470,7 +466,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -666,7 +661,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: downlink
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
@@ -927,6 +922,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: snort working
WARNING: untranslated string: software version
@@ -937,6 +933,7 @@ WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
+WARNING: untranslated string: ta key
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index aff38ca..fbe4ba1 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -485,16 +485,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -524,7 +520,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -662,7 +657,7 @@ WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dns servers
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwhost err hostip
@@ -699,7 +694,9 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
+WARNING: untranslated string: ta key
WARNING: untranslated string: upload dh key
WARNING: untranslated string: vendor
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6bbdc18..a872503 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -420,16 +420,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -459,7 +455,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -655,7 +650,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: downlink
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
@@ -920,6 +915,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
@@ -929,6 +925,7 @@ WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
+WARNING: untranslated string: ta key
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e553af7..6104715 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -425,16 +425,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -464,7 +460,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -660,7 +655,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: downlink
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
@@ -910,6 +905,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
@@ -918,6 +914,7 @@ WARNING: untranslated string: static routes
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
+WARNING: untranslated string: ta key
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 5d3dbc8..cb73478 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -484,16 +484,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -523,7 +519,6 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
-WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -659,7 +654,7 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
-WARNING: untranslated string: download dh parameter
+WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: gen dh
@@ -694,7 +689,9 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
+WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
+WARNING: untranslated string: ta key
WARNING: untranslated string: upload dh key
WARNING: untranslated string: vendor
diff --git a/doc/language_missings b/doc/language_missings
index a20a8d7..edbccbd 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -96,6 +96,7 @@
< dnsforward zone
< dns servers
< download dh parameter
+< download tls-auth key
< dpd delay
< dpd timeout
< drop action
@@ -410,6 +411,7 @@
< system has hwrng
< system has rdrand
< system information
+< ta key
< tor
< tor 0 = disabled
< tor accounting
@@ -616,6 +618,7 @@
< dnsforward zone
< dns servers
< download dh parameter
+< download tls-auth key
< dpd delay
< dpd timeout
< drop action
@@ -946,6 +949,7 @@
< system has hwrng
< system has rdrand
< system information
+< ta key
< tor
< tor 0 = disabled
< tor accounting
@@ -1128,6 +1132,7 @@
< dnsforward zone
< dns servers
< download dh parameter
+< download tls-auth key
< dpd delay
< dpd timeout
< drop action
@@ -1434,6 +1439,7 @@
< support donation
< system has hwrng
< system has rdrand
+< ta key
< tor
< tor 0 = disabled
< tor accounting
@@ -1619,6 +1625,7 @@
< dnsforward zone
< dns servers
< download dh parameter
+< download tls-auth key
< dpd delay
< dpd timeout
< drop action
@@ -1927,6 +1934,7 @@
< support donation
< system has hwrng
< system has rdrand
+< ta key
< tor
< tor 0 = disabled
< tor accounting
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 45c2f6c..b2ce05e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1520,17 +1520,6 @@ END
}
###
-### Download Diffie-Hellman parameter
-###
-}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download dh parameter'}) {
- if ( -f "${General::swroot}/ovpn/ca/dh1024.pem" ) {
- print "Content-Type: application/octet-stream\r\n";
- print "Content-Disposition: filename=dh1024.pem\r\n\r\n";
- print `/usr/bin/openssl dhparam -in ${General::swroot}/ovpn/ca/dh1024.pem`;
- exit(0);
- }
-
-###
### Download tls-auth key
###
}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download tls-auth key'}) {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ae4d694..33a2fd4 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -665,7 +665,7 @@
'devices on blue' => 'Geräte auf Blau',
'dh' => 'Diffie-Hellman-Parameter',
'dh key move failed' => 'Verschieben der Diffie-Hellman-Parameter fehlgeschlagen.',
-'dh key warn' => 'Das Generieren der Diffie-Hellman-Parameter mit 1024 oder 2048 Bit dauert üblicherweise mehrere Minuten. Schlüssellängen von 3072 oder 4096 Bit beanspruchen mehrere Stunden. Bitte haben Sie etwas Geduld.',
+'dh key warn' => 'Das Generieren der DH-Parameter mit 1024 oder 2048 Bit dauert üblicherweise mehrere Minuten. Schlüssellängen von 3072 oder 4096 Bit beanspruchen mehrere Stunden. Bitte haben Sie etwas Geduld.',
'dh key warn1' => 'Bei schwachen Systemen oder Systeme mit wenig Entropie wird empfohlen lange Diffie-Hellman-Parameter über die Upload-Funktion hochzuladen.',
'dh parameter' => 'Diffie-Hellman-Parameter',
'dhcp advopt add' => 'DHCP Option hinzufügen',
@@ -2054,6 +2054,7 @@
'system log viewer' => 'Betrachter der System-Logdateien',
'system logs' => 'System-Logdateien',
'system status information' => 'System-Statusinformationen',
+'ta key' => 'TLS-Authentifizierungsschlüssel',
'telephone not set' => 'Telefonnummer nicht angegeben.',
'template' => 'Vorlage',
'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Entweder Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.',
@@ -2079,7 +2080,6 @@
'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 b1cfa83..19c7807 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -687,7 +687,7 @@
'devices on blue' => 'Devices on BLUE',
'dh' => 'Diffie-Hellman parameters',
'dh key move failed' => 'Diffie-Hellman parameters move failed.',
-'dh key warn' => 'Creating Diffie-Hellman parameters with lengths of 1024 or 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient.',
+'dh key warn' => 'Creating DH-parameters with lengths of 1024 or 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient.',
'dh key warn1' => 'For weak systems or systems with little entropy, it is recommended to upload long Diffie-Hellman parameters by usage of the upload function.',
'dh name is invalid' => 'Name is invalid, please use "dh1024.pem".',
'dh parameter' => 'Diffie-Hellman parameters',
diff --git a/lfs/linux b/lfs/linux
index 45e9ce6..72166c4 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
include Config
-VER = 3.10.43
+VER = 3.10.44
RPI_PATCHES = linux-3.10.38-grsec-1b49b45
-GRS_PATCHES = grsecurity-2.9.1-3.10.43-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.44-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 49
+PAK_VER = 50
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
-$(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220
+$(DL_FILE)_MD5 = 8a4006eff3bbd8aff58fe4b443223e7a
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff
-$(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b
+$(GRS_PATCHES)_MD5 = 07e5d812146063ed5b2ce49d0d24099b
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
