IPFire-SCM

ipfire-scm@lists.ipfire.org

7876 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 87fb870b5edc65d6323f1ef2eb4dba8e6ef8045d
by git＠ipfire.org 04 Nov '15

04 Nov '15

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 87fb870b5edc65d6323f1ef2eb4dba8e6ef8045d (commit) via b6f571fa88735dcde1dfa8b4c584220fb14bf143 (commit) via 6411f1baa6e3d1a89df72327b7c8b5cb2fa8202a (commit) via b22d8aaf4ad26840cc6907580e6bd0cfea73b160 (commit) via 71af643cda77f02a006613f3fcc1a223a88f01a6 (commit) via 3045d6abde3e8eff0d1dac4fe8afe397f65f66cd (commit) via 93a08fe26132b91bc3d47d83e13bf79a3b4c5c77 (commit) from 123205fdbf2624a78449044c11cff5e77dd3f8e3 (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 87fb870b5edc65d6323f1ef2eb4dba8e6ef8045d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 4 21:18:13 2015 +0000 core95: Ship updated packages Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6f571fa88735dcde1dfa8b4c584220fb14bf143 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Nov 1 15:30:01 2015 +0100 snort: Update to 2.9.7.6 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6411f1baa6e3d1a89df72327b7c8b5cb2fa8202a Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Tue Jul 7 13:13:36 2015 +0200 lzo: Update to version 2.09 Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b22d8aaf4ad26840cc6907580e6bd0cfea73b160 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:47:22 2015 +0000 openvpn: Embed the certificate and key file into configuration This will allow to import just the configuration file into iOS and establish the VPN connection. Also works with many other OpenVPN clients. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71af643cda77f02a006613f3fcc1a223a88f01a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:47:21 2015 +0000 openvpn: Add option to download a client package with PEM files This patch adds the option to download a client package that comes with a regular PEM and key file instead of a PKCS12 file which is easier to use with clients that don't support PKCS12 (like iOS) opposed to converting the file manually. This requires that the connection is created without using a password for the certificate. Then the certificate is already stored in an insecure way. This patch also adds this to the Core Update 95 updater. Fixes: #10966 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> CC: Alexander Marx <alexander.marx(a)ipfire.org> commit 3045d6abde3e8eff0d1dac4fe8afe397f65f66cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 16:00:28 2015 +0000 openvpn: Apply static routes when N2N connection comes up Fixes: #10968 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 93a08fe26132b91bc3d47d83e13bf79a3b4c5c77 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Nov 3 18:51:32 2015 +0100 dma: Update to 0.10 Sorry, I borked the PATCH from yesterday...second try: dma: Update to 0.10 Changes: dns.c, do not treat unreachable DNS server as permanent error See: https://github.com/corecode/dma/commit/1a1306df018bd62cf1c5feb2e6e664f656bc… Deleted unnecessary blank lines in 'mail.cgi' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/lzo | 17 ++-- .../{oldcore/94 => core/95}/filelists/dma | 0 config/rootfiles/core/95/filelists/files | 2 + .../{oldcore/81 => core/95}/filelists/lzo | 0 .../{oldcore/89 => core/95}/filelists/snort | 0 html/cgi-bin/ids.cgi | 6 +- html/cgi-bin/mail.cgi | 15 --- html/cgi-bin/ovpnmain.cgi | 110 ++++++++++++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/dma | 6 +- lfs/lzo | 15 ++- lfs/snort | 8 +- 13 files changed, 138 insertions(+), 43 deletions(-) copy config/rootfiles/{oldcore/94 => core/95}/filelists/dma (100%) copy config/rootfiles/{oldcore/81 => core/95}/filelists/lzo (100%) copy config/rootfiles/{oldcore/89 => core/95}/filelists/snort (100%) Difference in files: diff --git a/config/rootfiles/common/lzo b/config/rootfiles/common/lzo index 6d746bd..4ebc05c 100644 --- a/config/rootfiles/common/lzo +++ b/config/rootfiles/common/lzo @@ -12,16 +12,15 @@ #usr/include/lzo/lzoconf.h #usr/include/lzo/lzodefs.h #usr/include/lzo/lzoutil.h -#usr/lib/liblzo2.a #usr/lib/liblzo2.la usr/lib/liblzo2.so usr/lib/liblzo2.so.2 usr/lib/liblzo2.so.2.0.0 -#usr/share/doc/lzo -#usr/share/doc/lzo/AUTHORS -#usr/share/doc/lzo/COPYING -#usr/share/doc/lzo/LZO.FAQ -#usr/share/doc/lzo/LZO.TXT -#usr/share/doc/lzo/LZOAPI.TXT -#usr/share/doc/lzo/NEWS -#usr/share/doc/lzo/THANKS +#usr/share/doc/lzo-2.09 +#usr/share/doc/lzo-2.09/AUTHORS +#usr/share/doc/lzo-2.09/COPYING +#usr/share/doc/lzo-2.09/LZO.FAQ +#usr/share/doc/lzo-2.09/LZO.TXT +#usr/share/doc/lzo-2.09/LZOAPI.TXT +#usr/share/doc/lzo-2.09/NEWS +#usr/share/doc/lzo-2.09/THANKS diff --git a/config/rootfiles/core/95/filelists/dma b/config/rootfiles/core/95/filelists/dma new file mode 120000 index 0000000..60f4682 --- /dev/null +++ b/config/rootfiles/core/95/filelists/dma @@ -0,0 +1 @@ +../../../common/dma \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index d9aeaa7..ab8f1a8 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -9,7 +9,9 @@ srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/rootfiles/core/95/filelists/lzo b/config/rootfiles/core/95/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/core/95/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/snort b/config/rootfiles/core/95/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/95/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 5ada911..f17b16a 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 # @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snort…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snort…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'community') { $url=" https://www.snort.org/rules/community"; } else { diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index be663a6..a72f923 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -328,18 +328,3 @@ sub error { &Header::closebox(); } } - - - - - - - - - - - - - - - diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 9e252a9..2eff2e0 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -926,6 +926,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; print SERVERCONF "# Client Gateway Network\n"; print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n"; + print SERVERCONF "up /etc/init.d/static-routes start\n"; print SERVERCONF "# tun Device\n"; print SERVERCONF "dev tun\n"; print SERVERCONF "#Logfile for statistics\n"; @@ -2265,9 +2266,41 @@ else print CLIENTCONF "remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; } + my $file_crt = new File::Temp( UNLINK => 1 ); + my $file_key = new File::Temp( UNLINK => 1 ); + my $include_certs = 0; + if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { - print CLIENTCONF "pkcs12 $confighash{$cgiparams{'KEY'}}[1].p12\r\n"; - $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; + if ($cgiparams{'MODE'} eq 'insecure') { + $include_certs = 1; + + # Add the CA + print CLIENTCONF ";ca cacert.pem\r\n"; + $zip->addFile("${General::swroot}/ovpn/ca/cacert.pem", "cacert.pem") or die "Can't add file cacert.pem\n"; + + # Extract the certificate + system('/usr/bin/openssl', 'pkcs12', '-in', "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", + '-clcerts', '-nokeys', '-nodes', '-out', "$file_crt" , '-passin', 'pass:'); + if ($?) { + die "openssl error: $?"; + } + + $zip->addFile("$file_crt", "$confighash{$cgiparams{'KEY'}}[1].pem") or die; + print CLIENTCONF ";cert $confighash{$cgiparams{'KEY'}}[1].pem\r\n"; + + # Extract the key + system('/usr/bin/openssl', 'pkcs12', '-in', "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", + '-nocerts', '-nodes', '-out', "$file_key", '-passin', 'pass:'); + if ($?) { + die "openssl error: $?"; + } + + $zip->addFile("$file_key", "$confighash{$cgiparams{'KEY'}}[1].key") or die; + print CLIENTCONF ";key $confighash{$cgiparams{'KEY'}}[1].key\r\n"; + } else { + print CLIENTCONF "pkcs12 $confighash{$cgiparams{'KEY'}}[1].p12\r\n"; + $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; + } } else { print CLIENTCONF "ca cacert.pem\r\n"; print CLIENTCONF "cert $confighash{$cgiparams{'KEY'}}[1]cert.pem\r\n"; @@ -2282,6 +2315,9 @@ else print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; } if ($vpnsettings{'TLSAUTH'} eq 'on') { + if ($cgiparams{'MODE'} eq 'insecure') { + print CLIENTCONF ";"; + } print CLIENTCONF "tls-auth ta.key\r\n"; $zip->addFile( "${General::swroot}/ovpn/certs/ta.key", "ta.key") or die "Can't add file ta.key\n"; } @@ -2306,6 +2342,53 @@ else print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n"; } } + + if ($include_certs) { + print CLIENTCONF "\r\n"; + + # CA + open(FILE, "<${General::swroot}/ovpn/ca/cacert.pem"); + print CLIENTCONF "<ca>\r\n"; + while (<FILE>) { + chomp($_); + print CLIENTCONF "$_\r\n"; + } + print CLIENTCONF "</ca>\r\n\r\n"; + close(FILE); + + # Cert + open(FILE, "<$file_crt"); + print CLIENTCONF "<cert>\r\n"; + while (<FILE>) { + chomp($_); + print CLIENTCONF "$_\r\n"; + } + print CLIENTCONF "</cert>\r\n\r\n"; + close(FILE); + + # Key + open(FILE, "<$file_key"); + print CLIENTCONF "<key>\r\n"; + while (<FILE>) { + chomp($_); + print CLIENTCONF "$_\r\n"; + } + print CLIENTCONF "</key>\r\n\r\n"; + close(FILE); + + # TLS auth + if ($vpnsettings{'TLSAUTH'} eq 'on') { + open(FILE, "<${General::swroot}/ovpn/certs/ta.key"); + print CLIENTCONF "<tls-auth>\r\n"; + while (<FILE>) { + chomp($_); + print CLIENTCONF "$_\r\n"; + } + print CLIENTCONF "</tls-auth>\r\n\r\n"; + close(FILE); + } + } + # Print client.conf.local if entries exist to client.ovpn if (!-z $local_clientconf && $vpnsettings{'ADDITIONAL_CONFIGS'} eq 'on') { open (LCC, "$local_clientconf"); @@ -4251,6 +4334,10 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; + if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { + $confighash{$key}[41] = "no-pass"; + } + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($cgiparams{'CHECK1'} ){ @@ -5127,7 +5214,7 @@ END <th width='15%' class='boldbase' align='center'>$Lang::tr{'type'}</th> <th width='20%' class='boldbase' align='center'>$Lang::tr{'remark'}</th> <th width='10%' class='boldbase' align='center'>$Lang::tr{'status'}</th> - <th width='5%' class='boldbase' colspan='6' align='center'>$Lang::tr{'action'}</th> + <th width='5%' class='boldbase' colspan='7' align='center'>$Lang::tr{'action'}</th> </tr> END } @@ -5141,7 +5228,7 @@ END <th width='15%' class='boldbase' align='center'>$Lang::tr{'type'}</th> <th width='20%' class='boldbase' align='center'>$Lang::tr{'remark'}</th> <th width='10%' class='boldbase' align='center'>$Lang::tr{'status'}</th> - <th width='5%' class='boldbase' colspan='6' align='center'>$Lang::tr{'action'}</th> + <th width='5%' class='boldbase' colspan='7' align='center'>$Lang::tr{'action'}</th> </tr> END } @@ -5240,6 +5327,21 @@ END </td></form> END ; + + if ($confighash{$key}[41] eq "no-pass") { + print <<END; + <form method='post' name='frm${key}g'><td align='center' $col> + <input type='image' name='$Lang::tr{'dl client arch insecure'}' src='/images/openvpn.png' + alt='$Lang::tr{'dl client arch insecure'}' title='$Lang::tr{'dl client arch insecure'}' border='0' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> + <input type='hidden' name='MODE' value='insecure' /> + <input type='hidden' name='KEY' value='$key' /> + </td></form> +END + } else { + print "<td $col> </td>"; + } + if ($confighash{$key}[4] eq 'cert') { print <<END; <form method='post' name='frm${key}b'><td align='center' $col> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index da9b885..2bca854 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -731,6 +731,7 @@ 'display traffic at home' => 'Berechneten Traffic auf der Startseite anzeigen', 'display webinterface effects' => 'Überblendeffekte einschalten', 'dl client arch' => 'Client Paket herunterladen (zip)', +'dl client arch insecure' => 'Ungesichertes Client-Paket herunterladen (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'Einstellungen des DMZ-Schlupfloches', 'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 56238ed..4c52392 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -756,6 +756,7 @@ 'display traffic at home' => 'Display calculated traffic on startpage', 'display webinterface effects' => 'Activate effects', 'dl client arch' => 'Download Client Package (zip)', +'dl client arch insecure' => 'Download insecure Client Package (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'DMZ pinhole configuration', 'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole', diff --git a/lfs/dma b/lfs/dma index 977efc8..cf264ea 100644 --- a/lfs/dma +++ b/lfs/dma @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 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 # @@ -24,7 +24,7 @@ include Config -VER = 0.9.1 +VER = 0.10 THISAPP = dma-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 56afaf438ba34d4ff9c8879dc29a16b1 +$(DL_FILE)_MD5 = 91f521b0749e16f5d78e139e717245ea install : $(TARGET) diff --git a/lfs/lzo b/lfs/lzo index 19ad090..2afc89f 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.06 +VER = 2.09 THISAPP = lzo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8 +$(DL_FILE)_MD5 = c7ffc9a103afe2d1bba0b015e7aa887f install : $(TARGET) @@ -70,9 +70,14 @@ $(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/lzo-2.06-CVE-2014-4607.patch - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ + --disable-static \ + --docdir=/usr/share/doc/lzo-2.09 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/snort b/lfs/snort index 373e53c..148f539 100644 --- a/lfs/snort +++ b/lfs/snort @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.9.7.0 +VER = 2.9.7.6 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -36,11 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c2a45bc56441ee9456478f219dd8d1e2 +$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1c6d545816cd0ad5117bde16b8d78b4368c072d4
by git＠ipfire.org 04 Nov '15

04 Nov '15

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 3.x development tree". The branch, master has been updated via 1c6d545816cd0ad5117bde16b8d78b4368c072d4 (commit) from 9896be8714769816c50305711bd64a9e13bfb92b (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 1c6d545816cd0ad5117bde16b8d78b4368c072d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 3 23:39:27 2015 +0000 pdns: Update to version 3.4.7 Ths patch also enables the testsuite. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: pdns/pdns.nm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) Difference in files: diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 3c25e9d..21e9984 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -4,8 +4,8 @@ ############################################################################### name = pdns -version = 3.3.1 -release = 2 +version = 3.4.7 +release = 1 groups = Networking/DNS url = http://powerdns.com/ @@ -20,6 +20,7 @@ description end source_dl = http://downloads.powerdns.com/releases/ +sources = %{thisapp}.tar.bz2 build requires @@ -38,18 +39,22 @@ build configure_options += \ --sysconfdir=%{sysconfdir}/pdns \ - --libdir=%{libdir}/powerdns \ --with-system-polarssl \ --with-modules="" \ --with-dynmodules="pipe geo gsqlite3" \ --with-lua \ --enable-tools \ - --disable-static + --disable-static \ + --enable-unit-tests prepare_cmds %{create_user} end + test + make -C pdns check + end + install_cmds # Create directories for pdns sqlite db. mkdir -p %{BUILDROOT}%{datadir}/pdns/ @@ -78,7 +83,7 @@ build chrpath --delete %{BUILDROOT}/usr/bin/pdns_control chrpath --delete %{BUILDROOT}/usr/bin/zone2sql chrpath --delete %{BUILDROOT}/usr/sbin/pdns_server - chrpath --delete %{BUILDROOT}%{libdir}/powerdns/*.so + chrpath --delete %{BUILDROOT}%{libdir}/pdns/*.so chrpath --delete %{BUILDROOT}/usr/bin/dnsreplay chrpath --delete %{BUILDROOT}/usr/bin/pdnssec end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 123205fdbf2624a78449044c11cff5e77dd3f8e3
by git＠ipfire.org 01 Nov '15

01 Nov '15

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 123205fdbf2624a78449044c11cff5e77dd3f8e3 (commit) from 60fcb2410e4db68625ef080bdf3d99d79e7b5abb (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 123205fdbf2624a78449044c11cff5e77dd3f8e3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Nov 1 21:49:22 2015 +0100 core95: add upadated backup exclude list. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/95/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index e81de5a..d9aeaa7 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -16,4 +16,5 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl usr/lib/firewall/ipsec-block usr/local/bin/ipsecctrl +var/ipfire/backup/exclude var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60fcb2410e4db68625ef080bdf3d99d79e7b5abb
by git＠ipfire.org 01 Nov '15

01 Nov '15

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 60fcb2410e4db68625ef080bdf3d99d79e7b5abb (commit) from 843ca290e1be08ddf614cb087b7ddc24d1dada1c (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 60fcb2410e4db68625ef080bdf3d99d79e7b5abb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Nov 1 11:20:56 2015 +0100 firewall: fix disable MASQERADE in green only mode. using MASQERADE_GREEN="off" will not work because "NETWORK_GREEN" is not correctly defined in green only mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/firewall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 2d462d7..6622071 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -352,8 +352,8 @@ iptables_red_up() { # Outgoing masquerading (don't masqerade IPSEC (mark 50)) iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN - if [ "$IFACE" = "$GREEN_DEV" ]; then - MASQUERADE_GREEN="off" + if [ "${IFACE}" = "${GREEN_DEV}" ]; then + iptables -t nat -A REDNAT -i "${GREEN_DEV}" -o "${IFACE}" -j RETURN fi local NO_MASQ_NETWORKS hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9896be8714769816c50305711bd64a9e13bfb92b
by git＠ipfire.org 31 Oct '15

31 Oct '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 843ca290e1be08ddf614cb087b7ddc24d1dada1c
by git＠ipfire.org 31 Oct '15

31 Oct '15

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 843ca290e1be08ddf614cb087b7ddc24d1dada1c (commit) via 673351d8a2b3b2c2ac3cc1367fc623c83fef67bc (commit) from 6feea5f77819febc1b7f75420b00881655039dbe (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 843ca290e1be08ddf614cb087b7ddc24d1dada1c Merge: 673351d 6feea5f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 31 21:44:51 2015 +0000 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 673351d8a2b3b2c2ac3cc1367fc623c83fef67bc Author: Lars Schuhmacher <larsen007(a)web.de> Date: Fri Oct 30 23:59:08 2015 +0100 Fix unnecessary space character in "E-Mail Absender" Fix unnecessary space character in "E-Mail Absender". Replaces the space character with a dash as is correct and already used in the other words in that part. Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: langs/de/cgi-bin/de.pl | 2 +- src/squid-accounting/acct.de.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index cf04d3d..da9b885 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -849,7 +849,7 @@ 'email mailpass' => 'Passwort', 'email mailport' => 'Mailserver-Port', 'email mailrcpt' => 'E-Mail-Empfänger', -'email mailsender' => 'E-Mail Absender', +'email mailsender' => 'E-Mail-Absender', 'email mailuser' => 'Benutzername', 'email server can not be empty' => 'Email-Server darf nicht leer sein', 'email settings' => 'Mailversand', diff --git a/src/squid-accounting/acct.de.pl b/src/squid-accounting/acct.de.pl index 0291a9d..c139d03 100644 --- a/src/squid-accounting/acct.de.pl +++ b/src/squid-accounting/acct.de.pl @@ -77,7 +77,7 @@ 'acct mailuser' => 'Benutzername', 'acct mailpass' => 'Passwort', 'acct mailrcpt' => 'E-Mail-Empfänger', -'acct mailsender' => 'E-Mail Absender', +'acct mailsender' => 'E-Mail-Absender', 'acct mailtxt' => 'Text der Rechnungsmails', 'acct mb' => 'MB', 'acct members' => 'Mitglieder', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6feea5f77819febc1b7f75420b00881655039dbe
by git＠ipfire.org 31 Oct '15

31 Oct '15

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 6feea5f77819febc1b7f75420b00881655039dbe (commit) from 12b5c00d3e598d71682813c9421bbc84c510f042 (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 6feea5f77819febc1b7f75420b00881655039dbe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 31 21:40:47 2015 +0000 credits.cgi: Update credits Promotes Alexander Marx to the group of Core Developers. Also lots of reformatting of old HTML code. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/95/filelists/files | 1 + html/cgi-bin/credits.cgi | 101 +++++++++++++++++++++---------- 2 files changed, 69 insertions(+), 33 deletions(-) Difference in files: diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index 57f48e8..e81de5a 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -6,6 +6,7 @@ etc/rc.d/init.d/networking/red.up/99-geoip-database lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 19fae9b..f370e80 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -58,40 +58,75 @@ print <<END </center> -Development: - -Arne Fitzenreiter -(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\(a)ipfire.org</a>) - Maintainer IPFire 2.x -Michael Tremer -(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\(a)ipfire.org</a>) - Project Leader -Christian Schmidt -(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\(a)ipfire.org</a>) - Vice Project Leader -Stefan Schantl -(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\(a)ipfire.org</a>) -Alexander Marx -(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\(a)ipfire.org</a>) -Heiner Schmeling -(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\(a)ipfire.org</a>) -Ronald Wiesinger -(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\(a)ipfire.org</a>) -Silvio Rechenbach -(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\(a)ipfire.org</a>) -Dirk Wagner -(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\(a)ipfire.org</a>) -Erik Kapfer -(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\(a)ipfire.org</a>) -Alfred Haas -(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\(a)ipfire.org</a>) - -Inactive: - -Peter Pfeiffer -(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\(a)ipfire.org</a>) -Peter Schälchli -(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\(a)ipfire.org</a>) -Jan Paul Tücking -(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>) + + Core Developers: + +<ul style="list-style: none"> + <li> + Michael Tremer + (<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\(a)ipfire.org</a>) + </li> + <li> + Arne Fitzenreiter + (<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\(a)ipfire.org</a>) + </li> + <li> + Stefan Schantl + (<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\(a)ipfire.org</a>) + </li> + <li> + Alexander Marx + (<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\(a)ipfire.org</a>) + </li> +</ul> + + + Community Developers: + + +<ul style="list-style: none"> + <li> + Christian Schmidt + (<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\(a)ipfire.org</a>) + </li> + <li> + Jan Paul Tücking + (<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>) + </li> + <li> + Heiner Schmeling + (<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\(a)ipfire.org</a>) + </li> + <li> + Ronald Wiesinger + (<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\(a)ipfire.org</a>) + </li> + <li> + Silvio Rechenbach + (<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\(a)ipfire.org</a>) + </li> + <li> + Dirk Wagner + (<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\(a)ipfire.org</a>) + </li> + <li> + Erik Kapfer + (<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\(a)ipfire.org</a>) + </li> + <li> + Alfred Haas + (<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\(a)ipfire.org</a>) + </li> + <li> + Peter Pfeiffer + (<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\(a)ipfire.org</a>) + </li> + <li> + Peter Schälchli + (<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\(a)ipfire.org</a>) + </li> +</ul> END ; &Header::closebox(); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 12b5c00d3e598d71682813c9421bbc84c510f042
by git＠ipfire.org 31 Oct '15

31 Oct '15

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 12b5c00d3e598d71682813c9421bbc84c510f042 (commit) from ec72ebbfdadf0a6c906a734d480c726735e6fbfe (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 12b5c00d3e598d71682813c9421bbc84c510f042 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 31 17:29:14 2015 +0100 core95: add kernel to updater. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../95}/filelists/armv5tel/linux-kirkwood | 0 .../90 => core/95}/filelists/armv5tel/linux-multi | 0 .../90 => core/95}/filelists/armv5tel/linux-rpi | 0 .../{oldcore/90 => core/95}/filelists/i586/linux | 0 .../90 => core/95}/filelists/i586/linux-initrd | 0 config/rootfiles/core/95/filelists/x86_64/linux | 1 + .../core/95/filelists/x86_64/linux-initrd | 1 + config/rootfiles/core/95/update.sh | 203 ++++++++++++++++++++- 8 files changed, 199 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/90 => core/95}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/90 => core/95}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/90 => core/95}/filelists/armv5tel/linux-rpi (100%) copy config/rootfiles/{oldcore/90 => core/95}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/90 => core/95}/filelists/i586/linux-initrd (100%) create mode 120000 config/rootfiles/core/95/filelists/x86_64/linux create mode 120000 config/rootfiles/core/95/filelists/x86_64/linux-initrd Difference in files: diff --git a/config/rootfiles/core/95/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/95/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/95/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/armv5tel/linux-multi b/config/rootfiles/core/95/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/95/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/armv5tel/linux-rpi b/config/rootfiles/core/95/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/95/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/i586/linux b/config/rootfiles/core/95/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/95/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/i586/linux-initrd b/config/rootfiles/core/95/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/core/95/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/x86_64/linux b/config/rootfiles/core/95/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/core/95/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/x86_64/linux-initrd b/config/rootfiles/core/95/filelists/x86_64/linux-initrd new file mode 120000 index 0000000..1b9fff7 --- /dev/null +++ b/config/rootfiles/core/95/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/update.sh index a34a3fe..538a074 100644 --- a/config/rootfiles/core/95/update.sh +++ b/config/rootfiles/core/95/update.sh @@ -24,6 +24,38 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# # Remove old core updates from pakfire cache to save space... core=95 for (( i=1; i<=$core; i++ )) @@ -31,28 +63,183 @@ 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* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# 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, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + # Remove files rm -f /etc/rc.d/init.d/network-vlans rm -f /etc/rc.d/rcsysinit.d/S91network-vlans -# Stop services +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop /etc/init.d/ipsec stop +/etc/init.d/ntp stop +/etc/init.d/apache stop + +# +#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/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + 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 -# Extract files -extract_files +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi # Update Language cache /usr/local/bin/update-lang-cache +# # Start services +# +/etc/init.d/apache start +/etc/init.d/ntp 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 -# This update need a reboot... -#touch /var/run/need_reboot +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi -# Finish +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/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 + fi + fi + ;; +esac +# +# 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/uboot config"' >> /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 # Update grub config to display new core version @@ -61,5 +248,9 @@ if [ -e /boot/grub/grub.cfg ]; then fi sync +echo +echo Please wait until pakfire has ended... +echo + # Don't report the exitcode last command exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec72ebbfdadf0a6c906a734d480c726735e6fbfe
by git＠ipfire.org 31 Oct '15

31 Oct '15

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 ec72ebbfdadf0a6c906a734d480c726735e6fbfe (commit) via b209d63dc060de463ba513f69de65982384147af (commit) from 16cb6ae3d0c44199681bcc27284dde5184cbcc01 (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 ec72ebbfdadf0a6c906a734d480c726735e6fbfe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 31 17:07:01 2015 +0100 core95: add ntp, backup and geoip changes to updater. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b209d63dc060de463ba513f69de65982384147af Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 31 17:04:47 2015 +0100 backup: exclude lm_sensors config. this config is hardware dependend and will autodetected at boot. fixes #10865 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/exclude | 1 + config/rootfiles/core/95/filelists/files | 1 + config/rootfiles/{oldcore/28 => core/95}/filelists/ntp | 0 3 files changed, 2 insertions(+) copy config/rootfiles/{oldcore/28 => core/95}/filelists/ntp (100%) Difference in files: diff --git a/config/backup/exclude b/config/backup/exclude index 83db234..6f09a1f 100644 --- a/config/backup/exclude +++ b/config/backup/exclude @@ -1,4 +1,5 @@ *.tmp +/etc/sysconfig/lm_sensors /var/ipfire/ethernet/settings /var/ipfire/firewall/bin/* /var/ipfire/proxy/calamaris/bin/* diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index dfecbaf..57f48e8 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/firewall +etc/rc.d/init.d/networking/red.up/99-geoip-database lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi diff --git a/config/rootfiles/core/95/filelists/ntp b/config/rootfiles/core/95/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/core/95/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 16cb6ae3d0c44199681bcc27284dde5184cbcc01
by git＠ipfire.org 31 Oct '15

31 Oct '15

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 16cb6ae3d0c44199681bcc27284dde5184cbcc01 (commit) from c98981ae3d23db0270f43ed4647cfc10ad89b697 (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 16cb6ae3d0c44199681bcc27284dde5184cbcc01 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 31 16:55:17 2015 +0100 geo-ip: download initial database in background. on slow internet connections like gprs the first start hung many minutes. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/networking/red.up/99-geoip-database | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/networking/red.up/99-geoip-database b/src/initscripts/init.d/networking/red.up/99-geoip-database index 4bd3ee2..335006a 100644 --- a/src/initscripts/init.d/networking/red.up/99-geoip-database +++ b/src/initscripts/init.d/networking/red.up/99-geoip-database @@ -17,7 +17,7 @@ done # Download ruleset if none has been found. if ! ${found}; then - /usr/local/bin/xt_geoip_update >/dev/null 2>&1 + /usr/local/bin/xt_geoip_update >/dev/null 2>&1 & fi exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM