IPFire-SCM June 2014

ipfire-scm@lists.ipfire.org

1 participants
72 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core79, updated. 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf
by git＠ipfire.org 17 Jun '14

17 Jun '14

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, core79 has been updated via 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf (commit) via 7119032e11ad50ed78bd6df2be8e8536d7191bf4 (commit) via 17aa650da68eca57fb7f1cbd6f6d3654cea9f9a1 (commit) via 6af27d7120da496521e7a313a4201be0438a67d2 (commit) via ac3b63071f903b110cbf0b87e5e8d3a9e5c99a77 (commit) via 525839f74f6be04b59f8bb3874f5764fed078a78 (commit) from f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 (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 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:48:34 2014 +0200 Update translations. commit 7119032e11ad50ed78bd6df2be8e8536d7191bf4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:47:06 2014 +0200 Rewrite redirect_wrapper. The wrapper had multiple errors in handling the new version of the squid redirector protocol and was awful to maintain as it did not fulfill any coding guidelines at all. commit 17aa650da68eca57fb7f1cbd6f6d3654cea9f9a1 Merge: 6af27d7 ac3b630 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:30:37 2014 +0200 Merge remote-tracking branch 'ummeegge/openvpn' commit 6af27d7120da496521e7a313a4201be0438a67d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 17 16:11:03 2014 +0200 clamav: update to 0.98.4. commit ac3b63071f903b110cbf0b87e5e8d3a9e5c99a77 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 16 09:50:20 2014 +0200 openvpn: Shortened word to prevent line break. * Shortened Diffie-Hellman to DH in language files to affort a better look in WUI. commit 525839f74f6be04b59f8bb3874f5764fed078a78 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Jun 12 17:36:57 2014 +0200 openvpn: Clean up DH download code. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +- 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/clamav | 6 +- 15 files changed, 118 insertions(+), 123 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index e27eba6..c2aee7c 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -11,15 +11,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.22 +usr/lib/libclamav.so.6.1.23 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.22 +usr/lib/libclamunrar.so.6.1.23 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.22 +usr/lib/libclamunrar_iface.so.6.1.23 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav 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/clamav b/lfs/clamav index 8cb849b..58f0341 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.98.3 +VER = 0.98.4 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 25 +PAK_VER = 26 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17 +$(DL_FILE)_MD5 = 6d409eab6c311de05a0a591fccd2ec83 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf
by git＠ipfire.org 17 Jun '14

17 Jun '14

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 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf (commit) via 7119032e11ad50ed78bd6df2be8e8536d7191bf4 (commit) via 17aa650da68eca57fb7f1cbd6f6d3654cea9f9a1 (commit) via ac3b63071f903b110cbf0b87e5e8d3a9e5c99a77 (commit) via 525839f74f6be04b59f8bb3874f5764fed078a78 (commit) from 6af27d7120da496521e7a313a4201be0438a67d2 (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 4cb7c9b47fbc265c3f503591b9aae4fb095a18bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:48:34 2014 +0200 Update translations. commit 7119032e11ad50ed78bd6df2be8e8536d7191bf4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:47:06 2014 +0200 Rewrite redirect_wrapper. The wrapper had multiple errors in handling the new version of the squid redirector protocol and was awful to maintain as it did not fulfill any coding guidelines at all. commit 17aa650da68eca57fb7f1cbd6f6d3654cea9f9a1 Merge: 6af27d7 ac3b630 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:30:37 2014 +0200 Merge remote-tracking branch 'ummeegge/openvpn' commit ac3b63071f903b110cbf0b87e5e8d3a9e5c99a77 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Jun 16 09:50:20 2014 +0200 openvpn: Shortened word to prevent line break. * Shortened Diffie-Hellman to DH in language files to affort a better look in WUI. commit 525839f74f6be04b59f8bb3874f5764fed078a78 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Jun 12 17:36:57 2014 +0200 openvpn: Clean up DH download code. ----------------------------------------------------------------------- Summary of changes: 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 +- 13 files changed, 112 insertions(+), 117 deletions(-) Difference in files: 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', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2f9e90ee1cfc7d535f69be244227b27a9260ee1d
by git＠ipfire.org 17 Jun '14

17 Jun '14

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 2f9e90ee1cfc7d535f69be244227b27a9260ee1d (commit) via 9b81a18eb9f6a97ff42427f9b8a3bece234fd88a (commit) via 7eb25cb302c28a7969a160a8672df6744c0b85af (commit) from 654a8ece848581428d91e32ff511956e840b688f (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 2f9e90ee1cfc7d535f69be244227b27a9260ee1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:26:28 2014 +0200 core80: Ship setddns.pl. commit 9b81a18eb9f6a97ff42427f9b8a3bece234fd88a Merge: 654a8ec 7eb25cb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 17 19:24:29 2014 +0200 Merge remote-tracking branch 'ferstl/dynu-ddns-fix' into next commit 7eb25cb302c28a7969a160a8672df6744c0b85af Author: Stefan Ferstl <st.ferstl(a)gmail.com> Date: Tue Jun 17 11:22:21 2014 +0200 DDNS: Fix API call for the "Dynu" DDNS service This affects the DDNS service "dynu.ca dyn.ee dynserv.(ca|org|net|com)". DNS updates using this service were made using the URL http://dynserv.ca/ . However, the domain dynserv.ca does not exist anymore. The Dynu service is now only reachable via the dynu.com domain. This commit changes the API call according to Dynu's specification on http://www.dynu.com/Default.aspx?page=dnsapi . ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/80/filelists/files | 1 + src/scripts/setddns.pl | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index 409e5fe..82e4376 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -1,2 +1,3 @@ etc/system-release etc/issue +usr/local/bin/setddns.pl diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index 5e77fce..5a19565 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -632,23 +632,22 @@ if ($ip ne $ipcache) { $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; } - my ($out, $response) = Net::SSLeay::get_http( 'dynserv.ca', - 80, - "/dyn/dynengine.cgi?func=set&name=$settings{'LOGIN'}&pass=$settings{'PASSWORD'}&ip=$ip&domain=$settings{'DOMAIN'}", + my ($out, $response) = Net::SSLeay::get_https( 'api.dynu.com', + 443, + "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip&username=$settings{'LOGIN'}&password=$settings{'PASSWORD'}", Net::SSLeay::make_headers('User-Agent' => 'IPFire' ) ); - #Valid responses from service are: - # 02 == Domain already exists, refreshing data for ... => xxx.xxx.xxx.xxx - # + # Valid responses are 'good xxx.xxx.xxx.xxx', 'nochg' + # see http://www.dynu.com/Default.aspx?page=dnsapi for further details if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/Domain already exists, refreshing data for/ig ) { + if ( $out !~ m/^(good|nochg)/ ) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure ($out)"); } else { - &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : success"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : success ($out)"); $success++; } } else { - &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server---$out-$response)"); } } elsif ($settings{'SERVICE'} eq 'udmedia') { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6af27d7120da496521e7a313a4201be0438a67d2
by git＠ipfire.org 17 Jun '14

17 Jun '14

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 6af27d7120da496521e7a313a4201be0438a67d2 (commit) from f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 (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 6af27d7120da496521e7a313a4201be0438a67d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 17 16:11:03 2014 +0200 clamav: update to 0.98.4. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index e27eba6..c2aee7c 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -11,15 +11,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.22 +usr/lib/libclamav.so.6.1.23 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.22 +usr/lib/libclamunrar.so.6.1.23 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.22 +usr/lib/libclamunrar_iface.so.6.1.23 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index 8cb849b..58f0341 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.98.3 +VER = 0.98.4 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 25 +PAK_VER = 26 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17 +$(DL_FILE)_MD5 = 6d409eab6c311de05a0a591fccd2ec83 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core79, updated. f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49
by git＠ipfire.org 17 Jun '14

17 Jun '14

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, core79 has been updated via f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 (commit) from da6424d983c51391774541c2717278421a1cc659 (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 f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 17 13:45:40 2014 +0200 kernel: update to 3.10.44. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Difference in files: 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

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49
by git＠ipfire.org 17 Jun '14

17 Jun '14

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 f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 (commit) from da6424d983c51391774541c2717278421a1cc659 (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 f98bc1feb7e3f6f29588c9c0d2dc124382ae4e49 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 17 13:45:40 2014 +0200 kernel: update to 3.10.44. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Difference in files: 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

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 654a8ece848581428d91e32ff511956e840b688f
by git＠ipfire.org 17 Jun '14

17 Jun '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 581f19ddf155e5eb5d309825ad9515d6e98c9ad7
by git＠ipfire.org 14 Jun '14

14 Jun '14

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 581f19ddf155e5eb5d309825ad9515d6e98c9ad7 (commit) from 58786f762dccb7ab9922ac42a393cf344d0aa8b7 (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 581f19ddf155e5eb5d309825ad9515d6e98c9ad7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 14 22:21:08 2014 +0200 start core80. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{77 => 80}/exclude | 0 config/rootfiles/{oldcore/55 => core/80}/filelists/files | 0 config/rootfiles/core/{77 => 80}/meta | 0 config/rootfiles/{oldcore/75 => core/80}/update.sh | 15 +++------------ config/rootfiles/{core/79 => oldcore/77}/exclude | 0 config/rootfiles/{core => oldcore}/77/filelists/GeoIP | 0 .../rootfiles/{core => oldcore}/77/filelists/Net_SSLeay | 0 config/rootfiles/{core => oldcore}/77/filelists/apache2 | 0 .../{core => oldcore}/77/filelists/armv5tel/binutils | 0 .../{core => oldcore}/77/filelists/armv5tel/dracut | 0 .../rootfiles/{core => oldcore}/77/filelists/armv5tel/gcc | 0 .../{core => oldcore}/77/filelists/armv5tel/glibc | 0 .../{core => oldcore}/77/filelists/armv5tel/initscripts | 0 .../77/filelists/armv5tel/linux-kirkwood | 0 .../{core => oldcore}/77/filelists/armv5tel/linux-multi | 0 .../{core => oldcore}/77/filelists/armv5tel/linux-rpi | 0 .../{core => oldcore}/77/filelists/armv5tel/lm_sensors | 0 .../{core => oldcore}/77/filelists/armv5tel/rpi-firmware | 0 .../{core => oldcore}/77/filelists/armv5tel/u-boot | 0 .../{core => oldcore}/77/filelists/armv5tel/util-linux | 0 config/rootfiles/{core => oldcore}/77/filelists/beep | 0 .../rootfiles/{core => oldcore}/77/filelists/bridge-utils | 0 config/rootfiles/{core => oldcore}/77/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/77/filelists/cyrus-sasl | 0 .../rootfiles/{core => oldcore}/77/filelists/dosfstools | 0 .../{core => oldcore}/77/filelists/dvb-firmwares | 0 config/rootfiles/{core => oldcore}/77/filelists/e2fsprogs | 0 config/rootfiles/{core => oldcore}/77/filelists/files | 0 config/rootfiles/{core => oldcore}/77/filelists/fireinfo | 0 config/rootfiles/{core => oldcore}/77/filelists/firewall | 0 config/rootfiles/{core => oldcore}/77/filelists/hwdata | 0 .../{core => oldcore}/77/filelists/i586/binutils | 0 .../rootfiles/{core => oldcore}/77/filelists/i586/dracut | 0 config/rootfiles/{core => oldcore}/77/filelists/i586/gcc | 0 .../rootfiles/{core => oldcore}/77/filelists/i586/glibc | 0 config/rootfiles/{core => oldcore}/77/filelists/i586/grub | 0 .../{core => oldcore}/77/filelists/i586/initscripts | 0 .../rootfiles/{core => oldcore}/77/filelists/i586/linux | 0 .../{core => oldcore}/77/filelists/i586/lm_sensors | 0 .../77/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/77/filelists/i586/util-linux | 0 config/rootfiles/{core => oldcore}/77/filelists/iptables | 0 config/rootfiles/{core => oldcore}/77/filelists/iw | 0 config/rootfiles/{core => oldcore}/77/filelists/jquery | 0 config/rootfiles/{core => oldcore}/77/filelists/kmod | 0 config/rootfiles/{core => oldcore}/77/filelists/libnl | 0 config/rootfiles/{core => oldcore}/77/filelists/libusbx | 0 config/rootfiles/{core => oldcore}/77/filelists/libxml2 | 0 .../{core => oldcore}/77/filelists/linux-firmware | 0 config/rootfiles/{core => oldcore}/77/filelists/lzo | 0 .../rootfiles/{core => oldcore}/77/filelists/misc-progs | 0 .../rootfiles/{core => oldcore}/77/filelists/mysql-libs | 0 config/rootfiles/{core => oldcore}/77/filelists/net-tools | 0 config/rootfiles/{core => oldcore}/77/filelists/ntp | 0 config/rootfiles/{core => oldcore}/77/filelists/openssh | 0 config/rootfiles/{core => oldcore}/77/filelists/openssl | 0 .../{core => oldcore}/77/filelists/openssl-compat | 0 config/rootfiles/{core => oldcore}/77/filelists/openvpn | 0 config/rootfiles/{core => oldcore}/77/filelists/pakfire | 0 config/rootfiles/{core => oldcore}/77/filelists/paxctl | 0 config/rootfiles/{core => oldcore}/77/filelists/php | 0 config/rootfiles/{core => oldcore}/77/filelists/rng-tools | 0 config/rootfiles/{core => oldcore}/77/filelists/setup | 0 .../rootfiles/{core => oldcore}/77/filelists/strongswan | 0 config/rootfiles/{core => oldcore}/77/filelists/tzdata | 0 config/rootfiles/{core => oldcore}/77/filelists/udev | 0 .../{core => oldcore}/77/filelists/usb_modeswitch | 0 .../{core => oldcore}/77/filelists/usb_modeswitch_data | 0 config/rootfiles/{core => oldcore}/77/filelists/usbutils | 0 config/rootfiles/{core => oldcore}/77/filelists/vim | 0 config/rootfiles/{core => oldcore}/77/filelists/wget | 0 .../{core => oldcore}/77/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/77/filelists/xz | 0 config/rootfiles/{core/79 => oldcore/77}/meta | 0 config/rootfiles/{core => oldcore}/77/update.sh | 0 config/rootfiles/{core/77 => oldcore/79}/exclude | 0 .../79/filelists/armv5tel/linux-kirkwood | 0 .../{core => oldcore}/79/filelists/armv5tel/linux-multi | 0 .../{core => oldcore}/79/filelists/armv5tel/linux-rpi | 0 config/rootfiles/{core => oldcore}/79/filelists/daq | 0 config/rootfiles/{core => oldcore}/79/filelists/files | 0 config/rootfiles/{core => oldcore}/79/filelists/hostname | 0 config/rootfiles/{core => oldcore}/79/filelists/i586/grub | 0 .../rootfiles/{core => oldcore}/79/filelists/i586/linux | 0 .../{core => oldcore}/79/filelists/i586/syslinux | 0 config/rootfiles/{core => oldcore}/79/filelists/libpcap | 0 config/rootfiles/{core => oldcore}/79/filelists/openssh | 0 config/rootfiles/{core => oldcore}/79/filelists/openssl | 0 config/rootfiles/{core => oldcore}/79/filelists/openvpn | 0 .../{core => oldcore}/79/filelists/perl-Device-Modem | 0 .../{core => oldcore}/79/filelists/perl-Device-SerialPort | 0 config/rootfiles/{core => oldcore}/79/filelists/ppp | 0 config/rootfiles/{core => oldcore}/79/filelists/snort | 0 config/rootfiles/{core => oldcore}/79/filelists/squid | 0 config/rootfiles/{core => oldcore}/79/filelists/sudo | 0 config/rootfiles/{core => oldcore}/79/filelists/vnstat | 0 config/rootfiles/{core/77 => oldcore/79}/meta | 0 config/rootfiles/{core => oldcore}/79/update.sh | 0 make.sh | 2 +- 99 files changed, 4 insertions(+), 13 deletions(-) copy config/rootfiles/core/{77 => 80}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/80}/filelists/files (100%) copy config/rootfiles/core/{77 => 80}/meta (100%) copy config/rootfiles/{oldcore/75 => core/80}/update.sh (84%) rename config/rootfiles/{core/79 => oldcore/77}/exclude (100%) rename config/rootfiles/{core => oldcore}/77/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/77/filelists/Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/77/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/dracut (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/initscripts (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/77/filelists/armv5tel/util-linux (100%) rename config/rootfiles/{core => oldcore}/77/filelists/beep (100%) rename config/rootfiles/{core => oldcore}/77/filelists/bridge-utils (100%) rename config/rootfiles/{core => oldcore}/77/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/77/filelists/cyrus-sasl (100%) rename config/rootfiles/{core => oldcore}/77/filelists/dosfstools (100%) rename config/rootfiles/{core => oldcore}/77/filelists/dvb-firmwares (100%) rename config/rootfiles/{core => oldcore}/77/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/77/filelists/files (100%) rename config/rootfiles/{core => oldcore}/77/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/77/filelists/firewall (100%) rename config/rootfiles/{core => oldcore}/77/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/dracut (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/initscripts (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/77/filelists/i586/util-linux (100%) rename config/rootfiles/{core => oldcore}/77/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/77/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/77/filelists/jquery (100%) rename config/rootfiles/{core => oldcore}/77/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/77/filelists/libnl (100%) rename config/rootfiles/{core => oldcore}/77/filelists/libusbx (100%) rename config/rootfiles/{core => oldcore}/77/filelists/libxml2 (100%) rename config/rootfiles/{core => oldcore}/77/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/77/filelists/lzo (100%) rename config/rootfiles/{core => oldcore}/77/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/77/filelists/mysql-libs (100%) rename config/rootfiles/{core => oldcore}/77/filelists/net-tools (100%) rename config/rootfiles/{core => oldcore}/77/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/77/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/77/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/77/filelists/openssl-compat (100%) rename config/rootfiles/{core => oldcore}/77/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/77/filelists/pakfire (100%) rename config/rootfiles/{core => oldcore}/77/filelists/paxctl (100%) rename config/rootfiles/{core => oldcore}/77/filelists/php (100%) rename config/rootfiles/{core => oldcore}/77/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/77/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/77/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/77/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/77/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/77/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/77/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core => oldcore}/77/filelists/usbutils (100%) rename config/rootfiles/{core => oldcore}/77/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/77/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/77/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/77/filelists/xz (100%) rename config/rootfiles/{core/79 => oldcore/77}/meta (100%) rename config/rootfiles/{core => oldcore}/77/update.sh (100%) rename config/rootfiles/{core/77 => oldcore/79}/exclude (100%) rename config/rootfiles/{core => oldcore}/79/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/79/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/79/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/79/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/79/filelists/files (100%) rename config/rootfiles/{core => oldcore}/79/filelists/hostname (100%) rename config/rootfiles/{core => oldcore}/79/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/79/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/79/filelists/i586/syslinux (100%) rename config/rootfiles/{core => oldcore}/79/filelists/libpcap (100%) rename config/rootfiles/{core => oldcore}/79/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/79/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/79/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/79/filelists/perl-Device-Modem (100%) rename config/rootfiles/{core => oldcore}/79/filelists/perl-Device-SerialPort (100%) rename config/rootfiles/{core => oldcore}/79/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/79/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/79/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/79/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/79/filelists/vnstat (100%) rename config/rootfiles/{core/77 => oldcore/79}/meta (100%) rename config/rootfiles/{core => oldcore}/79/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/77/exclude b/config/rootfiles/core/77/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/77/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/77/filelists/GeoIP b/config/rootfiles/core/77/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/77/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/77/filelists/Net_SSLeay b/config/rootfiles/core/77/filelists/Net_SSLeay deleted file mode 120000 index 13fe056..0000000 --- a/config/rootfiles/core/77/filelists/Net_SSLeay +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/apache2 b/config/rootfiles/core/77/filelists/apache2 deleted file mode 120000 index eef95ef..0000000 --- a/config/rootfiles/core/77/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/binutils b/config/rootfiles/core/77/filelists/armv5tel/binutils deleted file mode 120000 index ac971f9..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/dracut b/config/rootfiles/core/77/filelists/armv5tel/dracut deleted file mode 120000 index 861df3f..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/gcc b/config/rootfiles/core/77/filelists/armv5tel/gcc deleted file mode 120000 index 84f7b93..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/glibc b/config/rootfiles/core/77/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/initscripts b/config/rootfiles/core/77/filelists/armv5tel/initscripts deleted file mode 120000 index af1d762..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/initscripts +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-multi b/config/rootfiles/core/77/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-rpi b/config/rootfiles/core/77/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/lm_sensors b/config/rootfiles/core/77/filelists/armv5tel/lm_sensors deleted file mode 120000 index eec84cd..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/lm_sensors +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware deleted file mode 120000 index 428fdf8..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/u-boot b/config/rootfiles/core/77/filelists/armv5tel/u-boot deleted file mode 120000 index 3df31a8..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/armv5tel/util-linux b/config/rootfiles/core/77/filelists/armv5tel/util-linux deleted file mode 120000 index 2596908..0000000 --- a/config/rootfiles/core/77/filelists/armv5tel/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/beep b/config/rootfiles/core/77/filelists/beep deleted file mode 120000 index 6db094e..0000000 --- a/config/rootfiles/core/77/filelists/beep +++ /dev/null @@ -1 +0,0 @@ -../../../common/beep \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/bridge-utils b/config/rootfiles/core/77/filelists/bridge-utils deleted file mode 120000 index 3dee211..0000000 --- a/config/rootfiles/core/77/filelists/bridge-utils +++ /dev/null @@ -1 +0,0 @@ -../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/coreutils b/config/rootfiles/core/77/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/77/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/cyrus-sasl b/config/rootfiles/core/77/filelists/cyrus-sasl deleted file mode 120000 index bb51b4c..0000000 --- a/config/rootfiles/core/77/filelists/cyrus-sasl +++ /dev/null @@ -1 +0,0 @@ -../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/dosfstools b/config/rootfiles/core/77/filelists/dosfstools deleted file mode 120000 index 087ccb0..0000000 --- a/config/rootfiles/core/77/filelists/dosfstools +++ /dev/null @@ -1 +0,0 @@ -../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/dvb-firmwares b/config/rootfiles/core/77/filelists/dvb-firmwares deleted file mode 120000 index 69d0cdc..0000000 --- a/config/rootfiles/core/77/filelists/dvb-firmwares +++ /dev/null @@ -1 +0,0 @@ -../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/e2fsprogs b/config/rootfiles/core/77/filelists/e2fsprogs deleted file mode 120000 index 37b55de..0000000 --- a/config/rootfiles/core/77/filelists/e2fsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/files b/config/rootfiles/core/77/filelists/files deleted file mode 100644 index dd35042..0000000 --- a/config/rootfiles/core/77/filelists/files +++ /dev/null @@ -1,35 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/rc.d/init.d/network -etc/sysctl.conf -run -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/gui.cgi -srv/web/ipfire/cgi-bin/entropy.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/netinternal.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/upnp.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/themes/darkdos -srv/web/ipfire/html/themes/ipfire -srv/web/ipfire/html/themes/ipfire-legacy -srv/web/ipfire/html/themes/maniac -usr/lib/firewall -usr/local/bin/backupiso -usr/local/bin/timezone-transition -usr/local/bin/setddns.pl -usr/sbin/updxlrator -var/ipfire/backup/bin/backup.pl -var/ipfire/backup/exclude -var/ipfire/backup/include -var/ipfire/general-functions.pl -var/ipfire/header.pl -var/ipfire/graphs.pl -var/ipfire/langs -var/ipfire/menu.d/10-system.menu -var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/77/filelists/fireinfo b/config/rootfiles/core/77/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/77/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/firewall b/config/rootfiles/core/77/filelists/firewall deleted file mode 100644 index 6eeaeae..0000000 --- a/config/rootfiles/core/77/filelists/firewall +++ /dev/null @@ -1,14 +0,0 @@ -etc/rc.d/init.d/firewall -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/p2p-block.cgi -usr/sbin/convert-dmz -usr/sbin/convert-outgoingfw -usr/sbin/convert-portfw -usr/sbin/convert-xtaccess -usr/sbin/firewall-policy -var/ipfire/firewall/p2protocols -var/ipfire/fwhosts/icmp-types -var/ipfire/menu.d/50-firewall.menu -var/ipfire/fwhosts/customservices.default diff --git a/config/rootfiles/core/77/filelists/hwdata b/config/rootfiles/core/77/filelists/hwdata deleted file mode 100644 index 5a9672f..0000000 --- a/config/rootfiles/core/77/filelists/hwdata +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/77/filelists/i586/binutils b/config/rootfiles/core/77/filelists/i586/binutils deleted file mode 120000 index 78695d7..0000000 --- a/config/rootfiles/core/77/filelists/i586/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/dracut b/config/rootfiles/core/77/filelists/i586/dracut deleted file mode 120000 index 9a09010..0000000 --- a/config/rootfiles/core/77/filelists/i586/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/gcc b/config/rootfiles/core/77/filelists/i586/gcc deleted file mode 120000 index ba328e3..0000000 --- a/config/rootfiles/core/77/filelists/i586/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/glibc b/config/rootfiles/core/77/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/77/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/grub b/config/rootfiles/core/77/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/77/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/initscripts b/config/rootfiles/core/77/filelists/i586/initscripts deleted file mode 120000 index 12d8770..0000000 --- a/config/rootfiles/core/77/filelists/i586/initscripts +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/linux b/config/rootfiles/core/77/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/77/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/lm_sensors b/config/rootfiles/core/77/filelists/i586/lm_sensors deleted file mode 120000 index 17d6c01..0000000 --- a/config/rootfiles/core/77/filelists/i586/lm_sensors +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/strongswan-padlock b/config/rootfiles/core/77/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/77/filelists/i586/strongswan-padlock +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/i586/util-linux b/config/rootfiles/core/77/filelists/i586/util-linux deleted file mode 120000 index c973106..0000000 --- a/config/rootfiles/core/77/filelists/i586/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/iptables b/config/rootfiles/core/77/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/77/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/iw b/config/rootfiles/core/77/filelists/iw deleted file mode 120000 index 7c58a20..0000000 --- a/config/rootfiles/core/77/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/jquery b/config/rootfiles/core/77/filelists/jquery deleted file mode 120000 index 65df10c..0000000 --- a/config/rootfiles/core/77/filelists/jquery +++ /dev/null @@ -1 +0,0 @@ -../../../common/jquery \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/kmod b/config/rootfiles/core/77/filelists/kmod deleted file mode 120000 index 0020e19..0000000 --- a/config/rootfiles/core/77/filelists/kmod +++ /dev/null @@ -1 +0,0 @@ -../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/libnl b/config/rootfiles/core/77/filelists/libnl deleted file mode 120000 index 7181849..0000000 --- a/config/rootfiles/core/77/filelists/libnl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/libusbx b/config/rootfiles/core/77/filelists/libusbx deleted file mode 120000 index 96c9995..0000000 --- a/config/rootfiles/core/77/filelists/libusbx +++ /dev/null @@ -1 +0,0 @@ -../../../common/libusbx \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/libxml2 b/config/rootfiles/core/77/filelists/libxml2 deleted file mode 120000 index 242e69f..0000000 --- a/config/rootfiles/core/77/filelists/libxml2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/linux-firmware b/config/rootfiles/core/77/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/77/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/lzo b/config/rootfiles/core/77/filelists/lzo deleted file mode 120000 index 8e11e78..0000000 --- a/config/rootfiles/core/77/filelists/lzo +++ /dev/null @@ -1 +0,0 @@ -../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/misc-progs b/config/rootfiles/core/77/filelists/misc-progs deleted file mode 120000 index 7223cad..0000000 --- a/config/rootfiles/core/77/filelists/misc-progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/mysql-libs b/config/rootfiles/core/77/filelists/mysql-libs deleted file mode 120000 index c63bc7f..0000000 --- a/config/rootfiles/core/77/filelists/mysql-libs +++ /dev/null @@ -1 +0,0 @@ -../../../common/mysql-libs \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/net-tools b/config/rootfiles/core/77/filelists/net-tools deleted file mode 120000 index bac6b00..0000000 --- a/config/rootfiles/core/77/filelists/net-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/net-tools \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/ntp b/config/rootfiles/core/77/filelists/ntp deleted file mode 100644 index 6adc47b..0000000 --- a/config/rootfiles/core/77/filelists/ntp +++ /dev/null @@ -1,15 +0,0 @@ -etc/ntp.conf -usr/bin/ntp-keygen -usr/bin/ntp-wait -usr/bin/ntpd -usr/bin/ntpdate -usr/bin/ntpdc -usr/bin/ntpq -usr/bin/ntptime -usr/bin/ntptrace -usr/bin/sntp -usr/bin/tickadj -var/ipfire/time/counter.conf -var/ipfire/time/enable -var/ipfire/time/settime.conf -var/ipfire/time/settings diff --git a/config/rootfiles/core/77/filelists/openssh b/config/rootfiles/core/77/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/77/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/openssl b/config/rootfiles/core/77/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/77/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/openssl-compat b/config/rootfiles/core/77/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/77/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/openvpn b/config/rootfiles/core/77/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/77/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/pakfire b/config/rootfiles/core/77/filelists/pakfire deleted file mode 100644 index fd324bb..0000000 --- a/config/rootfiles/core/77/filelists/pakfire +++ /dev/null @@ -1,4 +0,0 @@ -opt/pakfire/etc/pakfire.conf -opt/pakfire/lib/functions.pl -opt/pakfire/lib/functions.sh -opt/pakfire/pakfire diff --git a/config/rootfiles/core/77/filelists/paxctl b/config/rootfiles/core/77/filelists/paxctl deleted file mode 120000 index dda8d9f..0000000 --- a/config/rootfiles/core/77/filelists/paxctl +++ /dev/null @@ -1 +0,0 @@ -../../../common/paxctl \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/php b/config/rootfiles/core/77/filelists/php deleted file mode 120000 index 1ae48d7..0000000 --- a/config/rootfiles/core/77/filelists/php +++ /dev/null @@ -1 +0,0 @@ -../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/rng-tools b/config/rootfiles/core/77/filelists/rng-tools deleted file mode 120000 index a7853e4..0000000 --- a/config/rootfiles/core/77/filelists/rng-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/setup b/config/rootfiles/core/77/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/77/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/strongswan b/config/rootfiles/core/77/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/77/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/tzdata b/config/rootfiles/core/77/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/77/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/udev b/config/rootfiles/core/77/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/77/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch b/config/rootfiles/core/77/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/77/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch_data b/config/rootfiles/core/77/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/77/filelists/usb_modeswitch_data +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/usbutils b/config/rootfiles/core/77/filelists/usbutils deleted file mode 120000 index 31db5a7..0000000 --- a/config/rootfiles/core/77/filelists/usbutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/vim b/config/rootfiles/core/77/filelists/vim deleted file mode 120000 index 9861317..0000000 --- a/config/rootfiles/core/77/filelists/vim +++ /dev/null @@ -1 +0,0 @@ -../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/wget b/config/rootfiles/core/77/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/77/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/wpa_supplicant b/config/rootfiles/core/77/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/77/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/77/filelists/xz b/config/rootfiles/core/77/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/77/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/77/meta b/config/rootfiles/core/77/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/77/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh deleted file mode 100644 index e9cf770..0000000 --- a/config/rootfiles/core/77/update.sh +++ /dev/null @@ -1,530 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -core=77 -for (( i=1; i<=${core}; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" -MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -add_to_backup lib/modules -add_to_backup etc/udev -add_to_backup lib/udev -add_to_backup boot -add_to_backup etc/sysconfig/lm_sensors -add_to_backup etc/sysconfig/rc.local -add_to_backup srv/web/ipfire/html/themes/ipfire -add_to_backup usr/lib/engines -add_to_backup etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl -add_to_backup etc/rc.d/init.d/networking/red.up/25-portfw -add_to_backup etc/rc.d/init.d/networking/red.up/26-xtaccess -add_to_backup usr/local/bin/setportfw -add_to_backup usr/local/bin/setdmzholes -add_to_backup usr/local/bin/setxtaccess -add_to_backup usr/local/bin/outgoingfwctrl -add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi -add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess} -add_to_backup etc/inittab -add_to_backup etc/fstab -add_to_backup usr/share/usb_modeswitch -add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl -add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl -add_to_backup usr/local/bin/dialctrl.pl -add_to_backup usr/lib/locale/locale-archive - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules - -# Remove old usb_modeswitch_data -rm -rf /usr/share/usb_modeswitch -# Remove old tzdata -rm -rf /usr/share/zoneinfo - -# Remoce old locale-archive -rm -rf /usr/lib/locale/locale-archive - -# Remove dialctrl.pl script -rm -f \ - /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \ - /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \ - /usr/local/bin/dialctrl.pl - -# -# Remove old udev rules. -# -if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then - cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ -fi -cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ -rm -rf /etc/udev -rm -rf /lib/udev -mkdir -p /etc/udev/rules.d -if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then - mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ -fi -mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ - -case $(uname -m) in - i?86 ) - # - # Backup grub.conf - # - cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - ;; -esac -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Remove the old default theme -rm -rf /srv/web/ipfire/html/themes/ipfire - -# rename /etc/modprobe.d files -for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do - mv $i $i.conf -done - -# Move /var/run to /run. -if [ -L "/run" ]; then - rm -f /run -fi - -mkdir -p /run -if mountpoint /var/run; then - mount --move /var/run /run - rm -rf /var/run -fi - -ln -svf ../run /var/run - -# Creating directories for new firewall. -mkdir -p /var/ipfire/firewall -mkdir -p /var/ipfire/fwhosts - -# Remove old ntp binaries -rm -f /usr/sbin/ntp-keygen -rm -f /usr/sbin/ntp-wait -rm -f /usr/sbin/ntpq -rm -f /usr/sbin/ntptime -rm -f /usr/sbin/ntptrace -rm -f /usr/sbin/tickadj - -# Remove old firewall helper link -rm -f /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# -#Reload init to close old linker/glibc -telinit u - -# Regenerate ipsec configuration files. -/srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Remove old openssl engines -rm -rf /usr/lib/engines - -# Remove old initscripts -rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl -rm -f /etc/rc.d/init.d/networking/red.up/25-portfw -rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess -rm -f /etc/rc.d/rcsysinit.d/S90sysctl - -# Remove old firewallscripts -rm -f /usr/local/bin/setportfw -rm -f /usr/local/bin/setdmzholes -rm -f /usr/local/bin/setxtaccess -rm -f /usr/local/bin/outgoingfwctrl - -# Remove old CGI files -rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi - -# Generate chains for new firewall -/sbin/iptables -N INPUTFW 2>/dev/null -/sbin/iptables -N FORWARDFW 2>/dev/null -/sbin/iptables -N POLICYFWD 2>/dev/null -/sbin/iptables -N POLICYIN 2>/dev/null -/sbin/iptables -N POLICYOUT 2>/dev/null -/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null -/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null -/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null - -# Create config files for firewall and fix permissions. -touch /var/ipfire/firewall/config -touch /var/ipfire/firewall/input -touch /var/ipfire/firewall/outgoing -touch /var/ipfire/firewall/settings -touch /var/ipfire/fwhosts/customhosts -touch /var/ipfire/fwhosts/customnetworks -touch /var/ipfire/fwhosts/customgroups -touch /var/ipfire/fwhosts/customservices -touch /var/ipfire/fwhosts/customservicegrp - -if [ ! -s "/var/ipfire/fwhosts/customservices" ];then - cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices -fi - -# Fix ownership. -chown -R nobody:nobody /var/ipfire/firewall -chown -R nobody:nobody /var/ipfire/fwhosts - -# Convert firewall configuration -/usr/sbin/convert-xtaccess -/usr/sbin/convert-outgoingfw -/usr/sbin/convert-portfw -/usr/sbin/convert-dmz - -# Remove old firewall configuration files -rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess} - -# In previously released IPFire versions the DROPOUTPUT and DROPINPUT -# option have two identical lines in the optionsfw/settings file as long as -# the user hasn't done any changes on the WUI. -# -# To prevent from any kind of side effects we are going to solve this issue now. - -# Fix doubble enties of DROPOUTPUT when the default settings are still in use -# (the save button on the WUI page never has been clicked) or convert to the -# new option name required by the firewall of IPFire 2.15. - -optionsfw_file="/var/ipfire/optionsfw/settings" - -if [ $(grep -c "DROPOUTPUT" ${optionsfw_file}) -gt 1 ] ; then - - # Drop all DROPUTPUT entries. - sed -e "/DROPOUTPUT/d" -i ${optionsfw_file} - - # Add default line for new option. - echo "DROPOUTGOING=on" >> ${optionsfw_file} -else - - # Convert option name to new format. - sed -e "s/DROPOUTPUT/DROPOUTGOING/g" -i ${optionsfw_file} -fi - -# Fix doubble enties of DROPINPUT when the default settings are still in use -# (the save button on the WUI page never has been clicked). -if [ $(grep -c "DROPINPUT" ${optionsfw_file}) -gt 1 ] ; then - - # We only can remove all entries with an defined string. - sed -e "/DROPINPUT/d" -i ${optionsfw_file} - - # Afterwards we have to add the required string with the default - # value again. - echo "DROPINPUT=on" >> ${optionsfw_file} -fi - -# Add strings and default values for new options of the firewall. -echo "DROPFORWARD=on" >> ${optionsfw_file} -echo "FWPOLICY=DROP" >> ${optionsfw_file} -echo "FWPOLICY1=DROP" >> ${optionsfw_file} -echo "FWPOLICY2=DROP" >> ${optionsfw_file} -echo "DROPSAMBA=off" >> ${optionsfw_file} -echo "DROPPROXY=off" >> ${optionsfw_file} -echo "SHOWREMARK=on" >> ${optionsfw_file} -echo "SHOWCOLORS=on" >> ${optionsfw_file} -echo "SHOWTABLES=off" >> ${optionsfw_file} -echo "SHOWDROPDOWN=off" >> ${optionsfw_file} -echo "DROPWIRELESSINPUT=on" >> ${optionsfw_file} -echo "DROPWIRELESSFORWARD=on" >> ${optionsfw_file} - -unset optionsfw_file - -# Convert inittab and fstab -sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab -sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab -sed -i -e "s/^proc/#proc/g" /etc/fstab -sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab -sed -i -e "s/^devpts/#devpts/g" /etc/fstab -sed -i -e "s|^none\s/var/run|#none /var/run|g" /etc/fstab - -# Convert udev persistent network rules -sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules - -# Firstsetup was already run -touch /var/ipfire/main/firstsetup_ok - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# -# Rebuild qosscript if enabled -# -if [ -e /var/ipfire/qos/enable ]; then - /usr/local/bin/qosctrl stop - /usr/local/bin/qosctrl generate - /usr/local/bin/qosctrl start -fi - -chown cron:cron /var/spool/cron -# Update crontab -grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time -00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl -00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl -EOF - -# Remove dialctrl script. -sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d" -fcrontab -z &>/dev/null - - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf - else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf - fi - sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf - sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - - if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." - else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf - fi - - # - # ReInstall grub - # - echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map - grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} - ;; -esac -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae - fi -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -# Update Package list for addon installation -/opt/pakfire/pakfire update -y --force - -echo -echo Please wait until pakfire has ended... -echo -#Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/79/exclude b/config/rootfiles/core/79/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/79/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-multi b/config/rootfiles/core/79/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/79/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-rpi b/config/rootfiles/core/79/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/79/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/daq b/config/rootfiles/core/79/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/79/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core/79/filelists/files deleted file mode 100644 index 4a557d2..0000000 --- a/config/rootfiles/core/79/filelists/files +++ /dev/null @@ -1,26 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/leds -etc/rc.d/init.d/sshd -etc/rc.d/init.d/udev -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat -srv/web/ipfire/cgi-bin/modem-status.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/traffic.cgi -srv/web/ipfire/html/themes/ipfire/include/functions.pl -usr/bin/squidGuard -usr/sbin/firewall-policy -usr/sbin/redirect_wrapper -usr/sbin/updxlrator -usr/local/bin/setddns.pl -var/ipfire/header.pl -var/ipfire/langs -var/ipfire/menu.d/20-status.menu -var/ipfire/menu.d/70-log.menu -var/ipfire/modem-lib.pl -var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/79/filelists/hostname b/config/rootfiles/core/79/filelists/hostname deleted file mode 120000 index 2a96fdd..0000000 --- a/config/rootfiles/core/79/filelists/hostname +++ /dev/null @@ -1 +0,0 @@ -../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/grub b/config/rootfiles/core/79/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/79/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/linux b/config/rootfiles/core/79/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/79/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/syslinux b/config/rootfiles/core/79/filelists/i586/syslinux deleted file mode 120000 index 74a776d..0000000 --- a/config/rootfiles/core/79/filelists/i586/syslinux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/syslinux \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/libpcap b/config/rootfiles/core/79/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/79/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssh b/config/rootfiles/core/79/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/79/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssl b/config/rootfiles/core/79/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/79/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openvpn b/config/rootfiles/core/79/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/79/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-Modem b/config/rootfiles/core/79/filelists/perl-Device-Modem deleted file mode 120000 index ea70f08..0000000 --- a/config/rootfiles/core/79/filelists/perl-Device-Modem +++ /dev/null @@ -1 +0,0 @@ -../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-SerialPort b/config/rootfiles/core/79/filelists/perl-Device-SerialPort deleted file mode 120000 index 2eb1527..0000000 --- a/config/rootfiles/core/79/filelists/perl-Device-SerialPort +++ /dev/null @@ -1 +0,0 @@ -../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/ppp b/config/rootfiles/core/79/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/79/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/snort b/config/rootfiles/core/79/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/79/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/squid b/config/rootfiles/core/79/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/79/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/sudo b/config/rootfiles/core/79/filelists/sudo deleted file mode 120000 index 0d3c45e..0000000 --- a/config/rootfiles/core/79/filelists/sudo +++ /dev/null @@ -1 +0,0 @@ -../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/vnstat b/config/rootfiles/core/79/filelists/vnstat deleted file mode 120000 index 2e2e610..0000000 --- a/config/rootfiles/core/79/filelists/vnstat +++ /dev/null @@ -1 +0,0 @@ -../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/79/meta b/config/rootfiles/core/79/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/79/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/79/update.sh b/config/rootfiles/core/79/update.sh deleted file mode 100644 index 2085d43..0000000 --- a/config/rootfiles/core/79/update.sh +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -core=79 -for (( i=1; i<=${core}; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" -MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -add_to_backup lib/modules -add_to_backup boot - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules - -case $(uname -m) in - i?86 ) - # - # Backup grub.conf - # - cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - ;; -esac -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# rename /etc/modprobe.d files -for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do - mv $i $i.conf -done - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Update ping -rm -f /bin/ping -ln -sf ../usr/bin/ping /bin/ping -chmod 4755 /usr/bin/ping - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Add nobody to group dialout -usermod -a -G dialout nobody - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf - else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf - fi - sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf - sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - - if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." - else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf - fi - - # - # ReInstall grub - # - echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map - grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} - ;; -esac - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae - fi -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -# Update Package list for addon installation -/opt/pakfire/pakfire update -y --force - -echo -echo Please wait until pakfire has ended... -echo -#Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/80/exclude b/config/rootfiles/core/80/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/80/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/80/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/80/meta b/config/rootfiles/core/80/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/80/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh new file mode 100644 index 0000000..f878cfe --- /dev/null +++ b/config/rootfiles/core/80/update.sh @@ -0,0 +1,54 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=80 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Start services + +# Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/77/exclude b/config/rootfiles/oldcore/77/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/77/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/77/filelists/GeoIP b/config/rootfiles/oldcore/77/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/77/filelists/Net_SSLeay b/config/rootfiles/oldcore/77/filelists/Net_SSLeay new file mode 120000 index 0000000..13fe056 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/Net_SSLeay @@ -0,0 +1 @@ +../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/apache2 b/config/rootfiles/oldcore/77/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/binutils b/config/rootfiles/oldcore/77/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/dracut b/config/rootfiles/oldcore/77/filelists/armv5tel/dracut new file mode 120000 index 0000000..861df3f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/dracut @@ -0,0 +1 @@ +../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/gcc b/config/rootfiles/oldcore/77/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/glibc b/config/rootfiles/oldcore/77/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/initscripts b/config/rootfiles/oldcore/77/filelists/armv5tel/initscripts new file mode 120000 index 0000000..af1d762 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/initscripts @@ -0,0 +1 @@ +../../../../common/armv5tel/initscripts \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors b/config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors new file mode 120000 index 0000000..eec84cd --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors @@ -0,0 +1 @@ +../../../../common/armv5tel/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware new file mode 120000 index 0000000..428fdf8 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/77/filelists/armv5tel/u-boot new file mode 120000 index 0000000..3df31a8 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/77/filelists/armv5tel/util-linux new file mode 120000 index 0000000..2596908 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/armv5tel/util-linux @@ -0,0 +1 @@ +../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/beep b/config/rootfiles/oldcore/77/filelists/beep new file mode 120000 index 0000000..6db094e --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/beep @@ -0,0 +1 @@ +../../../common/beep \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/bridge-utils b/config/rootfiles/oldcore/77/filelists/bridge-utils new file mode 120000 index 0000000..3dee211 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/bridge-utils @@ -0,0 +1 @@ +../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/coreutils b/config/rootfiles/oldcore/77/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/cyrus-sasl b/config/rootfiles/oldcore/77/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/dosfstools b/config/rootfiles/oldcore/77/filelists/dosfstools new file mode 120000 index 0000000..087ccb0 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/dosfstools @@ -0,0 +1 @@ +../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/dvb-firmwares b/config/rootfiles/oldcore/77/filelists/dvb-firmwares new file mode 120000 index 0000000..69d0cdc --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/e2fsprogs b/config/rootfiles/oldcore/77/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/files b/config/rootfiles/oldcore/77/filelists/files new file mode 100644 index 0000000..dd35042 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/files @@ -0,0 +1,35 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/rc.d/init.d/network +etc/sysctl.conf +run +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/gui.cgi +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/netinternal.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/upnp.cgi +srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos +srv/web/ipfire/html/themes/ipfire +srv/web/ipfire/html/themes/ipfire-legacy +srv/web/ipfire/html/themes/maniac +usr/lib/firewall +usr/local/bin/backupiso +usr/local/bin/timezone-transition +usr/local/bin/setddns.pl +usr/sbin/updxlrator +var/ipfire/backup/bin/backup.pl +var/ipfire/backup/exclude +var/ipfire/backup/include +var/ipfire/general-functions.pl +var/ipfire/header.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/oldcore/77/filelists/fireinfo b/config/rootfiles/oldcore/77/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/firewall b/config/rootfiles/oldcore/77/filelists/firewall new file mode 100644 index 0000000..6eeaeae --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/firewall @@ -0,0 +1,14 @@ +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/p2p-block.cgi +usr/sbin/convert-dmz +usr/sbin/convert-outgoingfw +usr/sbin/convert-portfw +usr/sbin/convert-xtaccess +usr/sbin/firewall-policy +var/ipfire/firewall/p2protocols +var/ipfire/fwhosts/icmp-types +var/ipfire/menu.d/50-firewall.menu +var/ipfire/fwhosts/customservices.default diff --git a/config/rootfiles/oldcore/77/filelists/hwdata b/config/rootfiles/oldcore/77/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/oldcore/77/filelists/i586/binutils b/config/rootfiles/oldcore/77/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/dracut b/config/rootfiles/oldcore/77/filelists/i586/dracut new file mode 120000 index 0000000..9a09010 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/dracut @@ -0,0 +1 @@ +../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/gcc b/config/rootfiles/oldcore/77/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/glibc b/config/rootfiles/oldcore/77/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/grub b/config/rootfiles/oldcore/77/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/initscripts b/config/rootfiles/oldcore/77/filelists/i586/initscripts new file mode 120000 index 0000000..12d8770 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/initscripts @@ -0,0 +1 @@ +../../../../common/i586/initscripts \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/linux b/config/rootfiles/oldcore/77/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/lm_sensors b/config/rootfiles/oldcore/77/filelists/i586/lm_sensors new file mode 120000 index 0000000..17d6c01 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/lm_sensors @@ -0,0 +1 @@ +../../../../common/i586/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/i586/util-linux b/config/rootfiles/oldcore/77/filelists/i586/util-linux new file mode 120000 index 0000000..c973106 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/i586/util-linux @@ -0,0 +1 @@ +../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/iptables b/config/rootfiles/oldcore/77/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/iw b/config/rootfiles/oldcore/77/filelists/iw new file mode 120000 index 0000000..7c58a20 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/jquery b/config/rootfiles/oldcore/77/filelists/jquery new file mode 120000 index 0000000..65df10c --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/jquery @@ -0,0 +1 @@ +../../../common/jquery \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/kmod b/config/rootfiles/oldcore/77/filelists/kmod new file mode 120000 index 0000000..0020e19 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/libnl b/config/rootfiles/oldcore/77/filelists/libnl new file mode 120000 index 0000000..7181849 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/libnl @@ -0,0 +1 @@ +../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/libusbx b/config/rootfiles/oldcore/77/filelists/libusbx new file mode 120000 index 0000000..96c9995 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/libusbx @@ -0,0 +1 @@ +../../../common/libusbx \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/libxml2 b/config/rootfiles/oldcore/77/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/linux-firmware b/config/rootfiles/oldcore/77/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/lzo b/config/rootfiles/oldcore/77/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/misc-progs b/config/rootfiles/oldcore/77/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/mysql-libs b/config/rootfiles/oldcore/77/filelists/mysql-libs new file mode 120000 index 0000000..c63bc7f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/mysql-libs @@ -0,0 +1 @@ +../../../common/mysql-libs \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/net-tools b/config/rootfiles/oldcore/77/filelists/net-tools new file mode 120000 index 0000000..bac6b00 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/net-tools @@ -0,0 +1 @@ +../../../common/net-tools \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/ntp b/config/rootfiles/oldcore/77/filelists/ntp new file mode 100644 index 0000000..6adc47b --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/ntp @@ -0,0 +1,15 @@ +etc/ntp.conf +usr/bin/ntp-keygen +usr/bin/ntp-wait +usr/bin/ntpd +usr/bin/ntpdate +usr/bin/ntpdc +usr/bin/ntpq +usr/bin/ntptime +usr/bin/ntptrace +usr/bin/sntp +usr/bin/tickadj +var/ipfire/time/counter.conf +var/ipfire/time/enable +var/ipfire/time/settime.conf +var/ipfire/time/settings diff --git a/config/rootfiles/oldcore/77/filelists/openssh b/config/rootfiles/oldcore/77/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/openssl b/config/rootfiles/oldcore/77/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/openssl-compat b/config/rootfiles/oldcore/77/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/openvpn b/config/rootfiles/oldcore/77/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/pakfire b/config/rootfiles/oldcore/77/filelists/pakfire new file mode 100644 index 0000000..fd324bb --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/pakfire @@ -0,0 +1,4 @@ +opt/pakfire/etc/pakfire.conf +opt/pakfire/lib/functions.pl +opt/pakfire/lib/functions.sh +opt/pakfire/pakfire diff --git a/config/rootfiles/oldcore/77/filelists/paxctl b/config/rootfiles/oldcore/77/filelists/paxctl new file mode 120000 index 0000000..dda8d9f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/paxctl @@ -0,0 +1 @@ +../../../common/paxctl \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/php b/config/rootfiles/oldcore/77/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/rng-tools b/config/rootfiles/oldcore/77/filelists/rng-tools new file mode 120000 index 0000000..a7853e4 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/setup b/config/rootfiles/oldcore/77/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/strongswan b/config/rootfiles/oldcore/77/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/tzdata b/config/rootfiles/oldcore/77/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/udev b/config/rootfiles/oldcore/77/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/usb_modeswitch b/config/rootfiles/oldcore/77/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/77/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/usbutils b/config/rootfiles/oldcore/77/filelists/usbutils new file mode 120000 index 0000000..31db5a7 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/usbutils @@ -0,0 +1 @@ +../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/vim b/config/rootfiles/oldcore/77/filelists/vim new file mode 120000 index 0000000..9861317 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/vim @@ -0,0 +1 @@ +../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/wget b/config/rootfiles/oldcore/77/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/wpa_supplicant b/config/rootfiles/oldcore/77/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/filelists/xz b/config/rootfiles/oldcore/77/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/77/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/77/meta b/config/rootfiles/oldcore/77/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/77/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/77/update.sh b/config/rootfiles/oldcore/77/update.sh new file mode 100644 index 0000000..e9cf770 --- /dev/null +++ b/config/rootfiles/oldcore/77/update.sh @@ -0,0 +1,530 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +core=77 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +add_to_backup lib/modules +add_to_backup etc/udev +add_to_backup lib/udev +add_to_backup boot +add_to_backup etc/sysconfig/lm_sensors +add_to_backup etc/sysconfig/rc.local +add_to_backup srv/web/ipfire/html/themes/ipfire +add_to_backup usr/lib/engines +add_to_backup etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl +add_to_backup etc/rc.d/init.d/networking/red.up/25-portfw +add_to_backup etc/rc.d/init.d/networking/red.up/26-xtaccess +add_to_backup usr/local/bin/setportfw +add_to_backup usr/local/bin/setdmzholes +add_to_backup usr/local/bin/setxtaccess +add_to_backup usr/local/bin/outgoingfwctrl +add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi +add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess} +add_to_backup etc/inittab +add_to_backup etc/fstab +add_to_backup usr/share/usb_modeswitch +add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl +add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl +add_to_backup usr/local/bin/dialctrl.pl +add_to_backup usr/lib/locale/locale-archive + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules + +# Remove old usb_modeswitch_data +rm -rf /usr/share/usb_modeswitch +# Remove old tzdata +rm -rf /usr/share/zoneinfo + +# Remoce old locale-archive +rm -rf /usr/lib/locale/locale-archive + +# Remove dialctrl.pl script +rm -f \ + /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \ + /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \ + /usr/local/bin/dialctrl.pl + +# +# Remove old udev rules. +# +if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then + cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +fi +cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ +rm -rf /etc/udev +rm -rf /lib/udev +mkdir -p /etc/udev/rules.d +if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then + mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +fi +mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ + +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Remove the old default theme +rm -rf /srv/web/ipfire/html/themes/ipfire + +# rename /etc/modprobe.d files +for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do + mv $i $i.conf +done + +# Move /var/run to /run. +if [ -L "/run" ]; then + rm -f /run +fi + +mkdir -p /run +if mountpoint /var/run; then + mount --move /var/run /run + rm -rf /var/run +fi + +ln -svf ../run /var/run + +# Creating directories for new firewall. +mkdir -p /var/ipfire/firewall +mkdir -p /var/ipfire/fwhosts + +# Remove old ntp binaries +rm -f /usr/sbin/ntp-keygen +rm -f /usr/sbin/ntp-wait +rm -f /usr/sbin/ntpq +rm -f /usr/sbin/ntptime +rm -f /usr/sbin/ntptrace +rm -f /usr/sbin/tickadj + +# Remove old firewall helper link +rm -f /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# +#Reload init to close old linker/glibc +telinit u + +# Regenerate ipsec configuration files. +/srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Remove old openssl engines +rm -rf /usr/lib/engines + +# Remove old initscripts +rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl +rm -f /etc/rc.d/init.d/networking/red.up/25-portfw +rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess +rm -f /etc/rc.d/rcsysinit.d/S90sysctl + +# Remove old firewallscripts +rm -f /usr/local/bin/setportfw +rm -f /usr/local/bin/setdmzholes +rm -f /usr/local/bin/setxtaccess +rm -f /usr/local/bin/outgoingfwctrl + +# Remove old CGI files +rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi + +# Generate chains for new firewall +/sbin/iptables -N INPUTFW 2>/dev/null +/sbin/iptables -N FORWARDFW 2>/dev/null +/sbin/iptables -N POLICYFWD 2>/dev/null +/sbin/iptables -N POLICYIN 2>/dev/null +/sbin/iptables -N POLICYOUT 2>/dev/null +/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null +/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null +/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null + +# Create config files for firewall and fix permissions. +touch /var/ipfire/firewall/config +touch /var/ipfire/firewall/input +touch /var/ipfire/firewall/outgoing +touch /var/ipfire/firewall/settings +touch /var/ipfire/fwhosts/customhosts +touch /var/ipfire/fwhosts/customnetworks +touch /var/ipfire/fwhosts/customgroups +touch /var/ipfire/fwhosts/customservices +touch /var/ipfire/fwhosts/customservicegrp + +if [ ! -s "/var/ipfire/fwhosts/customservices" ];then + cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices +fi + +# Fix ownership. +chown -R nobody:nobody /var/ipfire/firewall +chown -R nobody:nobody /var/ipfire/fwhosts + +# Convert firewall configuration +/usr/sbin/convert-xtaccess +/usr/sbin/convert-outgoingfw +/usr/sbin/convert-portfw +/usr/sbin/convert-dmz + +# Remove old firewall configuration files +rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess} + +# In previously released IPFire versions the DROPOUTPUT and DROPINPUT +# option have two identical lines in the optionsfw/settings file as long as +# the user hasn't done any changes on the WUI. +# +# To prevent from any kind of side effects we are going to solve this issue now. + +# Fix doubble enties of DROPOUTPUT when the default settings are still in use +# (the save button on the WUI page never has been clicked) or convert to the +# new option name required by the firewall of IPFire 2.15. + +optionsfw_file="/var/ipfire/optionsfw/settings" + +if [ $(grep -c "DROPOUTPUT" ${optionsfw_file}) -gt 1 ] ; then + + # Drop all DROPUTPUT entries. + sed -e "/DROPOUTPUT/d" -i ${optionsfw_file} + + # Add default line for new option. + echo "DROPOUTGOING=on" >> ${optionsfw_file} +else + + # Convert option name to new format. + sed -e "s/DROPOUTPUT/DROPOUTGOING/g" -i ${optionsfw_file} +fi + +# Fix doubble enties of DROPINPUT when the default settings are still in use +# (the save button on the WUI page never has been clicked). +if [ $(grep -c "DROPINPUT" ${optionsfw_file}) -gt 1 ] ; then + + # We only can remove all entries with an defined string. + sed -e "/DROPINPUT/d" -i ${optionsfw_file} + + # Afterwards we have to add the required string with the default + # value again. + echo "DROPINPUT=on" >> ${optionsfw_file} +fi + +# Add strings and default values for new options of the firewall. +echo "DROPFORWARD=on" >> ${optionsfw_file} +echo "FWPOLICY=DROP" >> ${optionsfw_file} +echo "FWPOLICY1=DROP" >> ${optionsfw_file} +echo "FWPOLICY2=DROP" >> ${optionsfw_file} +echo "DROPSAMBA=off" >> ${optionsfw_file} +echo "DROPPROXY=off" >> ${optionsfw_file} +echo "SHOWREMARK=on" >> ${optionsfw_file} +echo "SHOWCOLORS=on" >> ${optionsfw_file} +echo "SHOWTABLES=off" >> ${optionsfw_file} +echo "SHOWDROPDOWN=off" >> ${optionsfw_file} +echo "DROPWIRELESSINPUT=on" >> ${optionsfw_file} +echo "DROPWIRELESSFORWARD=on" >> ${optionsfw_file} + +unset optionsfw_file + +# Convert inittab and fstab +sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab +sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab +sed -i -e "s/^proc/#proc/g" /etc/fstab +sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab +sed -i -e "s/^devpts/#devpts/g" /etc/fstab +sed -i -e "s|^none\s/var/run|#none /var/run|g" /etc/fstab + +# Convert udev persistent network rules +sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules + +# Firstsetup was already run +touch /var/ipfire/main/firstsetup_ok + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +# Rebuild qosscript if enabled +# +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi + +chown cron:cron /var/spool/cron +# Update crontab +grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time +00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl +00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl +EOF + +# Remove dialctrl script. +sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d" +fcrontab -z &>/dev/null + + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf + sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + + if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." + else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen + # Add xvc0 to /etc/securetty + echo "xvc0" >> /etc/securetty +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +# Update Package list for addon installation +/opt/pakfire/pakfire update -y --force + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/oldcore/79/exclude b/config/rootfiles/oldcore/79/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/79/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/daq b/config/rootfiles/oldcore/79/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/files b/config/rootfiles/oldcore/79/filelists/files new file mode 100644 index 0000000..4a557d2 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/files @@ -0,0 +1,26 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/leds +etc/rc.d/init.d/sshd +etc/rc.d/init.d/udev +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/modem-status.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/traffic.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +usr/bin/squidGuard +usr/sbin/firewall-policy +usr/sbin/redirect_wrapper +usr/sbin/updxlrator +usr/local/bin/setddns.pl +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/70-log.menu +var/ipfire/modem-lib.pl +var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/oldcore/79/filelists/hostname b/config/rootfiles/oldcore/79/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/i586/grub b/config/rootfiles/oldcore/79/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/i586/linux b/config/rootfiles/oldcore/79/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/i586/syslinux b/config/rootfiles/oldcore/79/filelists/i586/syslinux new file mode 120000 index 0000000..74a776d --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/i586/syslinux @@ -0,0 +1 @@ +../../../../common/i586/syslinux \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/libpcap b/config/rootfiles/oldcore/79/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/openssh b/config/rootfiles/oldcore/79/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/openssl b/config/rootfiles/oldcore/79/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/openvpn b/config/rootfiles/oldcore/79/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/perl-Device-Modem b/config/rootfiles/oldcore/79/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort b/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/ppp b/config/rootfiles/oldcore/79/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/snort b/config/rootfiles/oldcore/79/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/squid b/config/rootfiles/oldcore/79/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/sudo b/config/rootfiles/oldcore/79/filelists/sudo new file mode 120000 index 0000000..0d3c45e --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/vnstat b/config/rootfiles/oldcore/79/filelists/vnstat new file mode 120000 index 0000000..2e2e610 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/meta b/config/rootfiles/oldcore/79/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/79/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/79/update.sh b/config/rootfiles/oldcore/79/update.sh new file mode 100644 index 0000000..2085d43 --- /dev/null +++ b/config/rootfiles/oldcore/79/update.sh @@ -0,0 +1,299 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +core=79 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +add_to_backup lib/modules +add_to_backup boot + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules + +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# rename /etc/modprobe.d files +for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do + mv $i $i.conf +done + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Update ping +rm -f /bin/ping +ln -sf ../usr/bin/ping /bin/ping +chmod 4755 /usr/bin/ping + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Add nobody to group dialout +usermod -a -G dialout nobody + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf + sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + + if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." + else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen + # Add xvc0 to /etc/securetty + echo "xvc0" >> /etc/securetty +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +# Update Package list for addon installation +/opt/pakfire/pakfire update -y --force + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + diff --git a/make.sh b/make.sh index 1c10f32..162128d 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="79" # Core Level (Filename) +CORE="80" # Core Level (Filename) PAKFIRE_CORE="79" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 58786f762dccb7ab9922ac42a393cf344d0aa8b7
by git＠ipfire.org 14 Jun '14

14 Jun '14

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 58786f762dccb7ab9922ac42a393cf344d0aa8b7 (commit) via da6424d983c51391774541c2717278421a1cc659 (commit) via ebaf391b480a4b3da36933f93b2720f34cd92d57 (commit) via 8815d10bc1e9c68fd50983211477f1ce95feda83 (commit) via 0e37b55202738c4eb0e4be042b64ed8e2a161953 (commit) via 7c56112cf4014e2b4c887e48301dfb68df48bd68 (commit) via b3b33f858651308c27b340ed94bf8eb4e82accfc (commit) via d6e6e213415cca408a1bf93692e7643bd58bc066 (commit) via edc08821f1fbeee5c9ae7fc4b4d4bd03f8821351 (commit) via acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661 (commit) via ad09461a43931ae0949ebc151c935230c268ccbb (commit) via a7bbea30d49a1b98f6404d23cb3d218020ef67d8 (commit) via 2734fb7e72015f0615dfdf483f498419e78dea22 (commit) via 8f94a6092cf602d5817332aa4e7d86deb80e67a9 (commit) via fd5ccb2dd5d0d4ee15bcae61c720eede3874bfbf (commit) via c8f503560f9498723b042246c93ee83e26982102 (commit) via a0ad10ca687d308f6b038fc50f7e5b156e8e64b3 (commit) via 3d2415f9242ae312bb4dc1d812e8f4ce0bf9a880 (commit) via 1445c9e062c6a17a8be1f248e9098cf99d787bf2 (commit) via 21e17764249dbd10053811ba581886e3f16d0b66 (commit) via 2511d78887a67436480b6bdfb267c6db412a0492 (commit) via 1f8a6d96707125596c6ee98a3765f7857351f2c5 (commit) via 8dc9629e80007817e2f4295864f474a7f510c938 (commit) via 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 (commit) via 5eee2654771c7dbe8571ea376017fed7042bae57 (commit) via 6335e4a6054b2393c1e1d38a0c58ac8014948213 (commit) via d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit) via a65b9c3268ffacc27e703025ffd246e95f906a79 (commit) via f891fd74bdc6e12f0a69a554d4a00ad5c8687803 (commit) via 34a5f039399d782e090be2fa42604de9380ccaec (commit) via 43ea947fb413125d577225f81c138b449c7247f1 (commit) from 0ee45bcff61a57c924cea6642ae3961e7b0675c3 (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 58786f762dccb7ab9922ac42a393cf344d0aa8b7 Merge: 0ee45bc da6424d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 14 22:13:37 2014 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 4 +- config/cfgroot/modem-lib.pl | 12 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- config/kernel/kernel.config.i586-ipfire | 4 +- config/kernel/kernel.config.i586-ipfire-pae | 4 +- config/rootfiles/common/armv5tel/linux-headers | 1 + config/rootfiles/common/i586/linux-headers | 1 + config/rootfiles/common/libpcap | 12 +- config/rootfiles/core/{78 => 79}/exclude | 0 .../{78 => 79}/filelists/armv5tel/linux-kirkwood | 0 .../core/{78 => 79}/filelists/armv5tel/linux-multi | 0 .../core/{78 => 79}/filelists/armv5tel/linux-rpi | 0 config/rootfiles/core/{78 => 79}/filelists/daq | 0 config/rootfiles/core/{78 => 79}/filelists/files | 6 + .../rootfiles/core/{78 => 79}/filelists/hostname | 0 .../rootfiles/core/{78 => 79}/filelists/i586/grub | 0 .../rootfiles/core/{78 => 79}/filelists/i586/linux | 0 .../core/{78 => 79}/filelists/i586/syslinux | 0 .../{oldcore/28 => core/79}/filelists/libpcap | 0 config/rootfiles/core/{77 => 79}/filelists/openssh | 0 config/rootfiles/core/{77 => 79}/filelists/openssl | 0 config/rootfiles/core/{78 => 79}/filelists/openvpn | 0 .../rootfiles/core/79/filelists/perl-Device-Modem | 1 + .../core/79/filelists/perl-Device-SerialPort | 1 + config/rootfiles/core/{78 => 79}/filelists/ppp | 0 config/rootfiles/core/{78 => 79}/filelists/snort | 0 config/rootfiles/core/{78 => 79}/filelists/squid | 0 config/rootfiles/core/{78 => 79}/filelists/sudo | 0 config/rootfiles/core/{78 => 79}/filelists/vnstat | 0 config/rootfiles/core/{78 => 79}/meta | 0 config/rootfiles/core/{78 => 79}/update.sh | 2 +- config/samba/default.shares | 21 +--- doc/language_issues.de | 6 +- doc/language_issues.en | 6 +- doc/language_issues.es | 5 + doc/language_issues.fr | 5 + doc/language_issues.nl | 5 + doc/language_issues.pl | 5 + doc/language_issues.ru | 5 + doc/language_issues.tr | 5 + doc/language_missings | 4 + html/cgi-bin/modem-status.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 122 +++++++++++++++++---- html/cgi-bin/pppsetup.cgi | 74 +++++++++++-- html/cgi-bin/traffic.cgi | 17 +-- langs/de/cgi-bin/de.pl | 17 ++- langs/en/cgi-bin/en.pl | 18 +-- langs/es/cgi-bin/es.pl | 4 - langs/fr/cgi-bin/fr.pl | 4 - langs/nl/cgi-bin/nl.pl | 4 - langs/pl/cgi-bin/pl.pl | 4 - langs/ru/cgi-bin/ru.pl | 4 - langs/tr/cgi-bin/tr.pl | 4 - lfs/libpcap | 17 +-- lfs/linux | 13 ++- lfs/openssl | 4 +- make.sh | 4 +- src/initscripts/init.d/leds | 8 +- src/initscripts/init.d/udev | 2 +- src/install+setup/install/main.c | 2 +- src/install+setup/setup/misc.c | 2 +- ...-3.10.y-usbnet_mcs7830_rework_link_detect.patch | 71 ++++++++++++ 62 files changed, 376 insertions(+), 138 deletions(-) rename config/rootfiles/core/{78 => 79}/exclude (100%) rename config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/core/{78 => 79}/filelists/daq (100%) rename config/rootfiles/core/{78 => 79}/filelists/files (79%) rename config/rootfiles/core/{78 => 79}/filelists/hostname (100%) rename config/rootfiles/core/{78 => 79}/filelists/i586/grub (100%) rename config/rootfiles/core/{78 => 79}/filelists/i586/linux (100%) rename config/rootfiles/core/{78 => 79}/filelists/i586/syslinux (100%) copy config/rootfiles/{oldcore/28 => core/79}/filelists/libpcap (100%) copy config/rootfiles/core/{77 => 79}/filelists/openssh (100%) copy config/rootfiles/core/{77 => 79}/filelists/openssl (100%) rename config/rootfiles/core/{78 => 79}/filelists/openvpn (100%) create mode 120000 config/rootfiles/core/79/filelists/perl-Device-Modem create mode 120000 config/rootfiles/core/79/filelists/perl-Device-SerialPort rename config/rootfiles/core/{78 => 79}/filelists/ppp (100%) rename config/rootfiles/core/{78 => 79}/filelists/snort (100%) rename config/rootfiles/core/{78 => 79}/filelists/squid (100%) rename config/rootfiles/core/{78 => 79}/filelists/sudo (100%) rename config/rootfiles/core/{78 => 79}/filelists/vnstat (100%) rename config/rootfiles/core/{78 => 79}/meta (100%) rename config/rootfiles/core/{78 => 79}/update.sh (99%) mode change 100755 => 100644 html/cgi-bin/modem-status.cgi create mode 100644 src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index bbb7e21..d90086d 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -45,6 +45,7 @@ my %menuhash = (); my $menu = \%menuhash; %settings = (); %ethsettings = (); +%pppsettings = (); @URI = (); ### Make sure this is an SSL request @@ -57,6 +58,7 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { ### Initialize environment &General::readhash("${swroot}/main/settings", \%settings); &General::readhash("${swroot}/ethernet/settings", \%ethsettings); +&General::readhash("${swroot}/ppp/settings", \%pppsettings); $language = $settings{'LANGUAGE'}; $hostname = $settings{'HOSTNAME'}; $hostnameintitle = 0; @@ -154,7 +156,7 @@ sub genmenu { $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1; } - if ($ethsettings{'RED_TYPE'} eq "PPPOE") { + if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1; } } 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/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 127542f..34045f2 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -2552,7 +2552,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y -# CONFIG_SERIAL_8250_DW is not set +CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_EM is not set # diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 8a3e089..ea1faff 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -632,8 +632,8 @@ CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4f71362..9ade872 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -645,8 +645,8 @@ CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y diff --git a/config/rootfiles/common/armv5tel/linux-headers b/config/rootfiles/common/armv5tel/linux-headers index a4da621..7fa9a24 100644 --- a/config/rootfiles/common/armv5tel/linux-headers +++ b/config/rootfiles/common/armv5tel/linux-headers @@ -625,6 +625,7 @@ #usr/include/linux/unix_diag.h #usr/include/linux/usb #usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc-wdm.h #usr/include/linux/usb/cdc.h #usr/include/linux/usb/ch11.h #usr/include/linux/usb/ch9.h diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/common/i586/linux-headers index 8f8123c..deaa97f 100644 --- a/config/rootfiles/common/i586/linux-headers +++ b/config/rootfiles/common/i586/linux-headers @@ -654,6 +654,7 @@ #usr/include/linux/unix_diag.h #usr/include/linux/usb #usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc-wdm.h #usr/include/linux/usb/cdc.h #usr/include/linux/usb/ch11.h #usr/include/linux/usb/ch9.h diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 0fc7c00..52169a7 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,11 @@ #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 +41,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 +51,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 +71,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 +79,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/78/exclude b/config/rootfiles/core/78/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/78/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-multi b/config/rootfiles/core/78/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/78/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-rpi b/config/rootfiles/core/78/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/78/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/daq b/config/rootfiles/core/78/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/78/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files deleted file mode 100644 index 851ce36..0000000 --- a/config/rootfiles/core/78/filelists/files +++ /dev/null @@ -1,20 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/sshd -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat -srv/web/ipfire/cgi-bin/modem-status.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/html/themes/ipfire/include/functions.pl -usr/bin/squidGuard -usr/sbin/redirect_wrapper -usr/sbin/updxlrator -usr/local/bin/setddns.pl -var/ipfire/langs -var/ipfire/menu.d/20-status.menu -var/ipfire/menu.d/70-log.menu -var/ipfire/modem-lib.pl -var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname deleted file mode 120000 index 2a96fdd..0000000 --- a/config/rootfiles/core/78/filelists/hostname +++ /dev/null @@ -1 +0,0 @@ -../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/grub b/config/rootfiles/core/78/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/78/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/linux b/config/rootfiles/core/78/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/78/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/syslinux b/config/rootfiles/core/78/filelists/i586/syslinux deleted file mode 120000 index 74a776d..0000000 --- a/config/rootfiles/core/78/filelists/i586/syslinux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/syslinux \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/openvpn b/config/rootfiles/core/78/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/78/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/ppp b/config/rootfiles/core/78/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/78/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/snort b/config/rootfiles/core/78/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/78/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/squid b/config/rootfiles/core/78/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/78/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/sudo b/config/rootfiles/core/78/filelists/sudo deleted file mode 120000 index 0d3c45e..0000000 --- a/config/rootfiles/core/78/filelists/sudo +++ /dev/null @@ -1 +0,0 @@ -../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/vnstat b/config/rootfiles/core/78/filelists/vnstat deleted file mode 120000 index 2e2e610..0000000 --- a/config/rootfiles/core/78/filelists/vnstat +++ /dev/null @@ -1 +0,0 @@ -../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/78/meta b/config/rootfiles/core/78/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/78/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh deleted file mode 100644 index f3e0593..0000000 --- a/config/rootfiles/core/78/update.sh +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -core=78 -for (( i=1; i<=${core}; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" -MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -add_to_backup lib/modules -add_to_backup boot - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules - -case $(uname -m) in - i?86 ) - # - # Backup grub.conf - # - cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - ;; -esac -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# rename /etc/modprobe.d files -for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do - mv $i $i.conf -done - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Update ping -rm -f /bin/ping -ln -sf ../usr/bin/ping /bin/ping -chmod 4755 /usr/bin/ping - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Add nobody to group dialout -usermod -a -G dialout nobody - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf - else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf - fi - sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf - sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - - if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." - else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf - fi - - # - # ReInstall grub - # - echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map - grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} - ;; -esac - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae - fi -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -# Update Package list for addon installation -/opt/pakfire/pakfire update -y --force - -echo -echo Please wait until pakfire has ended... -echo -#Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/79/exclude b/config/rootfiles/core/79/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/79/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-multi b/config/rootfiles/core/79/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-rpi b/config/rootfiles/core/79/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/daq b/config/rootfiles/core/79/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/79/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core/79/filelists/files new file mode 100644 index 0000000..4a557d2 --- /dev/null +++ b/config/rootfiles/core/79/filelists/files @@ -0,0 +1,26 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/leds +etc/rc.d/init.d/sshd +etc/rc.d/init.d/udev +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/modem-status.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/traffic.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +usr/bin/squidGuard +usr/sbin/firewall-policy +usr/sbin/redirect_wrapper +usr/sbin/updxlrator +usr/local/bin/setddns.pl +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/70-log.menu +var/ipfire/modem-lib.pl +var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/79/filelists/hostname b/config/rootfiles/core/79/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/79/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/grub b/config/rootfiles/core/79/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/linux b/config/rootfiles/core/79/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/syslinux b/config/rootfiles/core/79/filelists/i586/syslinux new file mode 120000 index 0000000..74a776d --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/syslinux @@ -0,0 +1 @@ +../../../../common/i586/syslinux \ No newline at end of file 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/rootfiles/core/79/filelists/openssh b/config/rootfiles/core/79/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssl b/config/rootfiles/core/79/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openvpn b/config/rootfiles/core/79/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/79/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-Modem b/config/rootfiles/core/79/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/core/79/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-SerialPort b/config/rootfiles/core/79/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/core/79/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/ppp b/config/rootfiles/core/79/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/core/79/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/snort b/config/rootfiles/core/79/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/79/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/squid b/config/rootfiles/core/79/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/79/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/sudo b/config/rootfiles/core/79/filelists/sudo new file mode 120000 index 0000000..0d3c45e --- /dev/null +++ b/config/rootfiles/core/79/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/vnstat b/config/rootfiles/core/79/filelists/vnstat new file mode 120000 index 0000000..2e2e610 --- /dev/null +++ b/config/rootfiles/core/79/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/79/meta b/config/rootfiles/core/79/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/79/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/79/update.sh b/config/rootfiles/core/79/update.sh new file mode 100644 index 0000000..2085d43 --- /dev/null +++ b/config/rootfiles/core/79/update.sh @@ -0,0 +1,299 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +core=79 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +add_to_backup lib/modules +add_to_backup boot + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules + +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# rename /etc/modprobe.d files +for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do + mv $i $i.conf +done + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Update ping +rm -f /bin/ping +ln -sf ../usr/bin/ping /bin/ping +chmod 4755 /usr/bin/ping + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Add nobody to group dialout +usermod -a -G dialout nobody + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf + sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + + if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." + else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen + # Add xvc0 to /etc/securetty + echo "xvc0" >> /etc/securetty +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +# Update Package list for addon installation +/opt/pakfire/pakfire update -y --force + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + 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/doc/language_issues.de b/doc/language_issues.de index 2140296..9d1e0ad 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -459,12 +459,16 @@ 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 @@ -491,6 +495,7 @@ 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 @@ -620,7 +625,6 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.en b/doc/language_issues.en index 3a0a4c7..55ee3e2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -486,12 +486,16 @@ 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 @@ -521,6 +525,7 @@ 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 @@ -651,7 +656,6 @@ WARNING: untranslated string: downlink WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -420,12 +420,16 @@ 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 @@ -455,6 +459,7 @@ 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.fr b/doc/language_issues.fr index 2446583..13a3c88 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -431,12 +431,16 @@ 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 @@ -466,6 +470,7 @@ 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.nl b/doc/language_issues.nl index 8dd0a3c..aff38ca 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -485,12 +485,16 @@ 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 @@ -520,6 +524,7 @@ 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.pl b/doc/language_issues.pl index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -420,12 +420,16 @@ 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 @@ -455,6 +459,7 @@ 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.ru b/doc/language_issues.ru index 2d12fc6..e553af7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -425,12 +425,16 @@ 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 @@ -460,6 +464,7 @@ 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.tr b/doc/language_issues.tr index 7ce95e0..5d3dbc8 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -484,12 +484,16 @@ 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 @@ -519,6 +523,7 @@ 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_missings b/doc/language_missings index 7ae53f8..a20a8d7 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -344,6 +344,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -863,6 +864,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1366,6 +1368,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1860,6 +1863,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < month-graph < most preferred < MTU settings diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi old mode 100755 new mode 100644 index d278c77..2d33a3d --- a/html/cgi-bin/modem-status.cgi +++ b/html/cgi-bin/modem-status.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # 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/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 7bceb80..33f521e 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -70,10 +70,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -333,19 +333,49 @@ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; $selected{'COMPORT'}{'ttyACM3'} = ''; +$selected{'COMPORT'}{'ttyACM4'} = ''; +$selected{'COMPORT'}{'ttyACM5'} = ''; +$selected{'COMPORT'}{'ttyACM6'} = ''; +$selected{'COMPORT'}{'ttyACM7'} = ''; +$selected{'COMPORT'}{'ttyACM8'} = ''; +$selected{'COMPORT'}{'ttyACM9'} = ''; $selected{'COMPORT'}{'ttyUSB0'} = ''; $selected{'COMPORT'}{'ttyUSB1'} = ''; $selected{'COMPORT'}{'ttyUSB2'} = ''; $selected{'COMPORT'}{'ttyUSB3'} = ''; +$selected{'COMPORT'}{'ttyUSB4'} = ''; +$selected{'COMPORT'}{'ttyUSB5'} = ''; +$selected{'COMPORT'}{'ttyUSB6'} = ''; +$selected{'COMPORT'}{'ttyUSB7'} = ''; +$selected{'COMPORT'}{'ttyUSB8'} = ''; +$selected{'COMPORT'}{'ttyUSB9'} = ''; $selected{'COMPORT'}{'rfcomm0'} = ''; $selected{'COMPORT'}{'rfcomm1'} = ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'MONPORT'}{''} = ''; +$selected{'MONPORT'}{'ttyACM0'} = ''; +$selected{'MONPORT'}{'ttyACM1'} = ''; +$selected{'MONPORT'}{'ttyACM2'} = ''; +$selected{'MONPORT'}{'ttyACM3'} = ''; +$selected{'MONPORT'}{'ttyACM4'} = ''; +$selected{'MONPORT'}{'ttyACM5'} = ''; +$selected{'MONPORT'}{'ttyACM6'} = ''; +$selected{'MONPORT'}{'ttyACM7'} = ''; +$selected{'MONPORT'}{'ttyACM8'} = ''; +$selected{'MONPORT'}{'ttyACM9'} = ''; $selected{'MONPORT'}{'ttyUSB0'} = ''; $selected{'MONPORT'}{'ttyUSB1'} = ''; $selected{'MONPORT'}{'ttyUSB2'} = ''; $selected{'MONPORT'}{'ttyUSB3'} = ''; +$selected{'MONPORT'}{'ttyUSB4'} = ''; +$selected{'MONPORT'}{'ttyUSB5'} = ''; +$selected{'MONPORT'}{'ttyUSB6'} = ''; +$selected{'MONPORT'}{'ttyUSB7'} = ''; +$selected{'MONPORT'}{'ttyUSB8'} = ''; +$selected{'MONPORT'}{'ttyUSB9'} = ''; +$selected{'MONPORT'}{'rfcomm0'} = ''; +$selected{'MONPORT'}{'rfcomm1'} = ''; $selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -582,16 +612,28 @@ END <option value='ttyUSB1' $selected{'COMPORT'}{'ttyUSB1'}>ttyUSB1</option> <option value='ttyUSB2' $selected{'COMPORT'}{'ttyUSB2'}>ttyUSB2</option> <option value='ttyUSB3' $selected{'COMPORT'}{'ttyUSB3'}>ttyUSB3</option> + <option value='ttyUSB4' $selected{'COMPORT'}{'ttyUSB4'}>ttyUSB4</option> + <option value='ttyUSB5' $selected{'COMPORT'}{'ttyUSB5'}>ttyUSB5</option> + <option value='ttyUSB6' $selected{'COMPORT'}{'ttyUSB6'}>ttyUSB6</option> + <option value='ttyUSB7' $selected{'COMPORT'}{'ttyUSB7'}>ttyUSB7</option> + <option value='ttyUSB8' $selected{'COMPORT'}{'ttyUSB8'}>ttyUSB8</option> + <option value='ttyUSB9' $selected{'COMPORT'}{'ttyUSB9'}>ttyUSB9</option> <option value='rfcomm0' $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option> <option value='rfcomm1' $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option> END ; if ($pppsettings{'TYPE'} ne 'serial' ) { print <<END - <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>$Lang::tr{'usb modem on acm0'}</option> - <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>$Lang::tr{'usb modem on acm1'}</option> - <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option> - <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option> + <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option> + <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option> + <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option> + <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option> + <option value='ttyACM4' $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option> + <option value='ttyACM5' $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option> + <option value='ttyACM6' $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option> + <option value='ttyACM7' $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option> + <option value='ttyACM8' $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option> + <option value='ttyACM9' $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option> END ; } @@ -608,6 +650,24 @@ END <option value="ttyUSB1" $selected{'MONPORT'}{'ttyUSB1'}>ttyUSB1</option> <option value="ttyUSB2" $selected{'MONPORT'}{'ttyUSB2'}>ttyUSB2</option> <option value="ttyUSB3" $selected{'MONPORT'}{'ttyUSB3'}>ttyUSB3</option> + <option value="ttyUSB4" $selected{'MONPORT'}{'ttyUSB4'}>ttyUSB4</option> + <option value="ttyUSB5" $selected{'MONPORT'}{'ttyUSB5'}>ttyUSB5</option> + <option value="ttyUSB6" $selected{'MONPORT'}{'ttyUSB6'}>ttyUSB6</option> + <option value="ttyUSB7" $selected{'MONPORT'}{'ttyUSB7'}>ttyUSB7</option> + <option value="ttyUSB8" $selected{'MONPORT'}{'ttyUSB8'}>ttyUSB8</option> + <option value="ttyUSB9" $selected{'MONPORT'}{'ttyUSB9'}>ttyUSB9</option> + <option value="rfcomm0" $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option> + <option value="rfcomm1" $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option> + <option value="ttyACM0" $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option> + <option value="ttyACM1" $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option> + <option value="ttyACM2" $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option> + <option value="ttyACM3" $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option> + <option value="ttyACM4" $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option> + <option value="ttyACM5" $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option> + <option value="ttyACM6" $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option> + <option value="ttyACM7" $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option> + <option value="ttyACM8" $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option> + <option value="ttyACM9" $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option> </select> </td> </tr> diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 70e5726..58a51d0 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -88,10 +88,7 @@ sub display_vnstat if ( $testdata =~ 'enough') { print"No data for $device !<br>"; } else { - # Falls back to textoutput if there was no % value because vnstati hang in this case - if (!($testdata =~ 'nan%')) { - system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); - } + system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); # Hour graph system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); # Day graph @@ -102,15 +99,9 @@ sub display_vnstat system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png"); # Generate HTML-Table with the graphs - print "<table>"; - if ($testdata =~ 'nan%') { - print "<tr><td><b><pre>"; - system("/usr/bin/vnstat -i $device"); - print "</pre></b></td></tr>"; - } else { - print"<tr><td><img src=\"/graphs/vnstat-s-$device.png\"></td></tr>"; - } print <<END +<table> +<tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5df9ba8..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', @@ -1492,6 +1493,7 @@ 'modify' => 'Ändern', 'modulation' => 'Modulation', 'monday' => 'Montag', +'monitor interface' => 'Monitor-Schnittstelle', 'month' => 'Monat', 'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', @@ -1665,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', @@ -1934,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', @@ -2077,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:', @@ -2484,10 +2487,6 @@ 'urlfilter weekly' => 'wöchentlich', 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients', 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz', -'usb modem on acm0' => 'USB Modem an ACM0', -'usb modem on acm1' => 'USB Modem an ACM1', -'usb modem on acm2' => 'USB Modem an ACM2', -'usb modem on acm3' => 'USB Modem an ACM3', 'use' => 'Einsatz', 'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:', 'use dov' => 'DOV (Data Over Voice) benutzen:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e0686f3..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,6 +1523,7 @@ 'modify' => 'Modify', 'modulation' => 'Modulation', 'monday' => 'Monday', +'monitor interface' => 'Monitor Interface', 'month' => 'Month', 'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', @@ -1968,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', @@ -1976,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?', @@ -2087,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.', @@ -2524,10 +2528,6 @@ 'urlfilter weekly' => 'weekly', 'urlfilter whitelist always allowed' => 'Allow custom whitelist for banned clients', 'urlfilter wrong filetype' => 'File has not the extension .tar.gz', -'usb modem on acm0' => 'USB Modem on ACM0', -'usb modem on acm1' => 'USB Modem on ACM1', -'usb modem on acm2' => 'USB Modem on ACM2', -'usb modem on acm3' => 'USB Modem on ACM3', 'use' => 'Use', 'use a pre-shared key' => 'Use a pre-shared key:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ae5bf14..2be3d36 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -2051,10 +2051,6 @@ 'urlfilter weekly' => 'semanalmente', 'urlfilter whitelist always allowed' => 'Permitir lista blanca personalizada para clientes censurados', 'urlfilter wrong filetype' => 'El archivo no tiene la extension .tar.gz', -'usb modem on acm0' => 'Modem USB en ACM0', -'usb modem on acm1' => 'Modem USB en ACM1', -'usb modem on acm2' => 'Modem USB en ACM2', -'usb modem on acm3' => 'Modem USB en ACM3', 'use' => 'Usar', 'use a pre-shared key' => 'Usar llave pre-compartida', 'use dov' => 'Usar datos sobre voz (DOV)', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 84e15a8..f4e9518 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2065,10 +2065,6 @@ 'urlfilter weekly' => 'hebdomadairement', 'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis', 'urlfilter wrong filetype' => 'Le fichier n\'a pas l\'extension .tar.gz', -'usb modem on acm0' => 'Modem USB sur ACM0', -'usb modem on acm1' => 'Modem USB sur ACM1', -'usb modem on acm2' => 'Modem USB sur ACM2', -'usb modem on acm3' => 'Modem USB sur ACM3', 'use' => 'Utiliser', 'use a pre-shared key' => 'Utiliser une clé pré-partagée :', 'use dov' => 'Utilisez DOV (Data Over Voice):', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 767f93b..b9e4c6f 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -2481,10 +2481,6 @@ 'urlfilter weekly' => 'wekelijks', 'urlfilter whitelist always allowed' => 'Toestaan gebruik van eigen witte lijst voor verboden clients', 'urlfilter wrong filetype' => 'Bestand heeft niet de extensie .tar.gz', -'usb modem on acm0' => 'USB Modem op ACM0', -'usb modem on acm1' => 'USB Modem op ACM1', -'usb modem on acm2' => 'USB Modem op ACM2', -'usb modem on acm3' => 'USB Modem op ACM3', 'use' => 'Gebruik', 'use a pre-shared key' => 'Gebruik een pre-shared sleutel:', 'use dov' => 'Gebruik data over voice (DOV):', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 103e526..a79eed0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -2074,10 +2074,6 @@ 'urlfilter weekly' => 'co tydzień', 'urlfilter whitelist always allowed' => 'Zezwolenie na białą listę dla zablokowanych klientów', 'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz', -'usb modem on acm0' => 'Modem USB na ACM0', -'usb modem on acm1' => 'Modem USB na ACM1', -'usb modem on acm2' => 'Modem USB na ACM2', -'usb modem on acm3' => 'Modem USB na ACM3', 'use' => 'Użyj', 'use a pre-shared key' => 'Użyj klucza współdzielonego:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2b680b0..e3aaab4 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -2069,10 +2069,6 @@ 'urlfilter weekly' => 'Еженедельно', 'urlfilter whitelist always allowed' => 'Разрешить пользовательский белый список для забаненых клиентов', 'urlfilter wrong filetype' => 'File has not the extension .tar.gz', -'usb modem on acm0' => 'USB Модем на ACM0', -'usb modem on acm1' => 'USB Модем на ACM1', -'usb modem on acm2' => 'USB Модем на ACM2', -'usb modem on acm3' => 'USB Модем на ACM3', 'use' => 'Use', 'use a pre-shared key' => 'Use a pre-shared key:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9eb5a43..619f3f2 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -2484,10 +2484,6 @@ 'urlfilter weekly' => 'Haftalık', 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini', 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok', -'usb modem on acm0' => 'ACM0 üzerindeki USB Modem', -'usb modem on acm1' => 'ACM1 üzerindeki USB Modem', -'usb modem on acm2' => 'ACM2 üzerindeki USB Modem', -'usb modem on acm3' => 'ACM3 üzerindeki USB Modem', 'use' => 'Kullan', 'use a pre-shared key' => 'Ön paylaşımlı anahtar kullan:', 'use dov' => 'Ses üzerinden veri kullan (DOV):', 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) diff --git a/lfs/linux b/lfs/linux index a86dab6..45e9ce6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.41 +VER = 3.10.43 RPI_PATCHES = linux-3.10.38-grsec-1b49b45 -GRS_PATCHES = grsecurity-2.9.1-3.10.41-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.43-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 = 46 +PAK_VER = 49 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 = 08631db3e6b4328b0315f59ef3fa7b0a +$(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = de48891a35952a3c6de5beea694f7557 +$(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b install : $(TARGET) @@ -160,6 +160,9 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch + # Moschip 7830 link detection + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch + ifeq "$(KCFG)" "-kirkwood" # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood diff --git a/lfs/openssl b/lfs/openssl index f842bb9..12cea68 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.1g +VER = 1.0.1h THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = de62b43dfcd858e66a74bee1c834e959 +$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf install : $(TARGET) diff --git a/make.sh b/make.sh index c170076..1c10f32 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="78" # Core Level (Filename) -PAKFIRE_CORE="78" # Core Level (PAKFIRE) +CORE="79" # Core Level (Filename) +PAKFIRE_CORE="79" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds index d75a2e9..faa7650 100644 --- a/src/initscripts/init.d/leds +++ b/src/initscripts/init.d/leds @@ -17,9 +17,11 @@ fi # Load ethernet settings eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) -if [ "${RED_DEV}" == "" ]; then - RED_DEV=ppp0 -fi +case "${RED_TYPE}" in + PPPOE) + RED_DEV="ppp0" + ;; +esac # setup_netdev_trigger LED DEVICE MODE setup_netdev_trigger () diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index b6d0100..6cf8771 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -64,7 +64,7 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /bin/udevadm trigger + /bin/udevadm trigger --action=add # Now wait for udevd to process the uevents we triggered /bin/udevadm settle diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index db7a6cc..309e006 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -542,7 +542,7 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal"); - replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 "); + replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,115200n8 panic=10 "); /*inittab*/ replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); diff --git a/src/install+setup/setup/misc.c b/src/install+setup/setup/misc.c index ae4f780..58e9bb2 100644 --- a/src/install+setup/setup/misc.c +++ b/src/install+setup/setup/misc.c @@ -27,7 +27,7 @@ int writehostsfiles(void) FILE *file, *hosts; struct keyvalue *kv; char hostname[STRING_SIZE]; - char domainname[STRING_SIZE] = ""; + char domainname[STRING_SIZE] = "localdomain"; char commandstring[STRING_SIZE]; char buffer[STRING_SIZE]; diff --git a/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch new file mode 100644 index 0000000..2114ae8 --- /dev/null +++ b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch @@ -0,0 +1,71 @@ +From 4e9792dc8ab29175295c79c35f9f6fbd2d453b35 Mon Sep 17 00:00:00 2001 +From: Octavian Purdila <octavian.purdila(a)intel.com> +Date: Mon, 23 Dec 2013 19:06:31 +0200 +Subject: [PATCH] usbnet: mcs7830: rework link state detection + +Even with the quirks in commit dabdaf0c (mcs7830: Fix link state +detection) there are still spurious link-down events for some chips +where the false link-down events count go over a few hundreds. + +This patch takes a more conservative approach and only looks at +link-down events where the link-down state is not combined with other +states (e.g. half/full speed, pending frames in SRAM or TX status +information valid). In all other cases we assume the link is up. + +Tested on MCS7830CV-DA (USB ID 9710:7830). + +Cc: Ondrej Zary <linux(a)rainbow-software.org> +Cc: Michael Leun <lkml20120218(a)newton.leun.net> +Cc: Ming Lei <ming.lei(a)canonical.com> +Signed-off-by: Octavian Purdila <octavian.purdila(a)intel.com> +Signed-off-by: David S. Miller <davem(a)davemloft.net> +--- + drivers/net/usb/mcs7830.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 9237c45..8dd48b5 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -117,7 +117,6 @@ enum { + struct mcs7830_data { + u8 multi_filter[8]; + u8 config; +- u8 link_counter; + }; + + static const char driver_name[] = "MOSCHIP usb-ethernet driver"; +@@ -562,26 +561,16 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb) + { + u8 *buf = urb->transfer_buffer; + bool link, link_changed; +- struct mcs7830_data *data = mcs7830_get_data(dev); + + if (urb->actual_length < 16) + return; + +- link = !(buf[1] & 0x20); ++ link = !(buf[1] == 0x20); + link_changed = netif_carrier_ok(dev->net) != link; + if (link_changed) { +- data->link_counter++; +- /* +- track link state 20 times to guard against erroneous +- link state changes reported sometimes by the chip +- */ +- if (data->link_counter > 20) { +- data->link_counter = 0; +- usbnet_link_change(dev, link, 0); +- netdev_dbg(dev->net, "Link Status is: %d\n", link); +- } +- } else +- data->link_counter = 0; ++ usbnet_link_change(dev, link, 0); ++ netdev_dbg(dev->net, "Link Status is: %d\n", link); ++ } + } + + static const struct driver_info moschip_info = { +-- +2.0.0 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.15-core79, created. da6424d983c51391774541c2717278421a1cc659
by git＠ipfire.org 14 Jun '14

14 Jun '14

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 tag, v2.15-core79 has been created at da6424d983c51391774541c2717278421a1cc659 (commit) - Log ----------------------------------------------------------------- commit da6424d983c51391774541c2717278421a1cc659 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 13 21:02:45 2014 +0200 kernel: add mcs7830 link detection patch. fixes #10551 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2014