IPFire-SCM June 2014

ipfire-scm@lists.ipfire.org

1 participants
72 discussions

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

11 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 1445c9e062c6a17a8be1f248e9098cf99d787bf2 (commit) from 1f8a6d96707125596c6ee98a3765f7857351f2c5 (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 1445c9e062c6a17a8be1f248e9098cf99d787bf2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 11 17:53:15 2014 +0200 install: fix baudrate for serial console. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: 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:"); hooks/post-receive -- IPFire 2.x development tree

1 0

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

08 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 1f8a6d96707125596c6ee98a3765f7857351f2c5 (commit) from 8dc9629e80007817e2f4295864f474a7f510c938 (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 1f8a6d96707125596c6ee98a3765f7857351f2c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 8 10:17:13 2014 +0200 kernel: update to 3.10.42. ----------------------------------------------------------------------- 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 a86dab6..74e9b95 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.41 +VER = 3.10.42 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.42-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 = 47 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 = ef927e91cf8b8c4ddf98847341ccf2c8 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = de48891a35952a3c6de5beea694f7557 +$(GRS_PATCHES)_MD5 = 6ada73f5b8a8180b4139c71dd5da9059 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

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

07 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 8dc9629e80007817e2f4295864f474a7f510c938 (commit) from 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 (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 8dc9629e80007817e2f4295864f474a7f510c938 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 8 00:56:09 2014 +0200 setup: fix initial hostname set. ----------------------------------------------------------------------- Summary of changes: src/install+setup/setup/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: 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]; hooks/post-receive -- IPFire 2.x development tree

1 0

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

07 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 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 (commit) from 5eee2654771c7dbe8571ea376017fed7042bae57 (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 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 7 13:55:34 2014 +0200 traffic.cgi: remove work around for a fixed vnstat(i) bug. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/79/filelists/files | 1 + html/cgi-bin/traffic.cgi | 17 ++++------------- 2 files changed, 5 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core/79/filelists/files index bda32bc..3195bf2 100644 --- a/config/rootfiles/core/79/filelists/files +++ b/config/rootfiles/core/79/filelists/files @@ -9,6 +9,7 @@ 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 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> hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 5eee2654771c7dbe8571ea376017fed7042bae57 (commit) from 6335e4a6054b2393c1e1d38a0c58ac8014948213 (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 5eee2654771c7dbe8571ea376017fed7042bae57 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 09:55:21 2014 +0200 openssl: security update to 1.0.1h. ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: 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) hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 6335e4a6054b2393c1e1d38a0c58ac8014948213 (commit) via d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit) from a65b9c3268ffacc27e703025ffd246e95f906a79 (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 6335e4a6054b2393c1e1d38a0c58ac8014948213 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 17:20:52 2014 +0200 langs: add monitor port text. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 4 ++- 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/pppsetup.cgi | 74 +++++++++++++++++++++++++++++++++++++++---- langs/de/cgi-bin/de.pl | 5 +-- langs/en/cgi-bin/en.pl | 5 +-- 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 --- 20 files changed, 117 insertions(+), 43 deletions(-) mode change 100755 => 100644 html/cgi-bin/modem-status.cgi 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/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/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/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5df9ba8..c604ef0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1492,6 +1492,7 @@ 'modify' => 'Ändern', 'modulation' => 'Modulation', 'monday' => 'Montag', +'monitor interface' => 'Monitor-Schnittstelle', 'month' => 'Monat', 'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', @@ -2484,10 +2485,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..f87607f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1522,6 +1522,7 @@ 'modify' => 'Modify', 'modulation' => 'Modulation', 'monday' => 'Monday', +'monitor interface' => 'Monitior interface', 'month' => 'Month', 'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', @@ -2524,10 +2525,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):', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.15-core78, created. 5f3f94821f287dac013274b4a2bc04cfb5ee74f0
by git＠ipfire.org 06 Jun '14

06 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-core78 has been created at 5f3f94821f287dac013274b4a2bc04cfb5ee74f0 (commit) - Log ----------------------------------------------------------------- commit 5f3f94821f287dac013274b4a2bc04cfb5ee74f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 09:55:51 2014 +0200 core78: create emergency update. all changes planned and build in testing will moved to core79. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core78, created. 5f3f94821f287dac013274b4a2bc04cfb5ee74f0
by git＠ipfire.org 06 Jun '14

06 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, core78 has been created at 5f3f94821f287dac013274b4a2bc04cfb5ee74f0 (commit) - Log ----------------------------------------------------------------- commit 5f3f94821f287dac013274b4a2bc04cfb5ee74f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 09:55:51 2014 +0200 core78: create emergency update. all changes planned and build in testing will moved to core79. commit 5481be33cecf20acc22e33779188d9b2da6cdd6f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 09:55:21 2014 +0200 openssl: security update to 1.0.1h. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit) from a65b9c3268ffacc27e703025ffd246e95f906a79 (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 d4af74b78ab66a59d42a9098c21e9b15229295b4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 10:45:59 2014 +0200 modem-status: add more ttyUSB and ttyACM ports. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 4 ++- html/cgi-bin/modem-status.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 74 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) mode change 100755 => 100644 html/cgi-bin/modem-status.cgi 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/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/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> hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 a65b9c3268ffacc27e703025ffd246e95f906a79 (commit) via f891fd74bdc6e12f0a69a554d4a00ad5c8687803 (commit) from 34a5f039399d782e090be2fa42604de9380ccaec (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 a65b9c3268ffacc27e703025ffd246e95f906a79 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 10:17:54 2014 +0200 core78 -> core79: to insert openssl security update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{78 => 79}/exclude | 0 config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-kirkwood | 0 config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-multi | 0 config/rootfiles/core/{78 => 79}/filelists/armv5tel/linux-rpi | 0 config/rootfiles/core/{78 => 79}/filelists/daq | 0 config/rootfiles/core/{78 => 79}/filelists/files | 2 +- config/rootfiles/core/{78 => 79}/filelists/hostname | 0 config/rootfiles/core/{78 => 79}/filelists/i586/grub | 0 config/rootfiles/core/{78 => 79}/filelists/i586/linux | 0 config/rootfiles/core/{78 => 79}/filelists/i586/syslinux | 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 config/rootfiles/core/{78 => 79}/filelists/perl-Device-Modem | 0 config/rootfiles/core/{78 => 79}/filelists/perl-Device-SerialPort | 0 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 +- make.sh | 4 ++-- 23 files changed, 4 insertions(+), 4 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 (96%) 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/core/{77 => 79}/filelists/openssh (100%) copy config/rootfiles/core/{77 => 79}/filelists/openssl (100%) rename config/rootfiles/core/{78 => 79}/filelists/openvpn (100%) rename config/rootfiles/core/{78 => 79}/filelists/perl-Device-Modem (100%) rename config/rootfiles/core/{78 => 79}/filelists/perl-Device-SerialPort (100%) 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%) Difference in files: 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 c0fa689..0000000 --- a/config/rootfiles/core/78/filelists/files +++ /dev/null @@ -1,23 +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/pppsetup.cgi -srv/web/ipfire/cgi-bin/proxy.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/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/perl-Device-Modem b/config/rootfiles/core/78/filelists/perl-Device-Modem deleted file mode 120000 index ea70f08..0000000 --- a/config/rootfiles/core/78/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/78/filelists/perl-Device-SerialPort b/config/rootfiles/core/78/filelists/perl-Device-SerialPort deleted file mode 120000 index 2eb1527..0000000 --- a/config/rootfiles/core/78/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/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..bda32bc --- /dev/null +++ b/config/rootfiles/core/79/filelists/files @@ -0,0 +1,23 @@ +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/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.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/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/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 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