IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7867 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c3a86f4d20c066b3843a57542e3782ccef18e757
by git＠ipfire.org 18 Apr '14

18 Apr '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8d2fe8cedd68bfdf648df1baf8b654a846f8c022
by git＠ipfire.org 18 Apr '14

18 Apr '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 8d2fe8cedd68bfdf648df1baf8b654a846f8c022 (commit) via 8490e4961886c6fc44bbfcbaa5073484f235208e (commit) from 39e96de566bc4f3a48de9b683de7ffac850bc0a3 (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 8d2fe8cedd68bfdf648df1baf8b654a846f8c022 Merge: 8490e49 39e96de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 18 22:24:24 2014 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit 8490e4961886c6fc44bbfcbaa5073484f235208e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 17 12:31:27 2014 +0200 firewall: Explicitely allow DHCP messages. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/dhcp | 25 +++++++++++++++++++------ src/initscripts/init.d/firewall | 31 ++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 11 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/dhcp index abc6b5c..bc0abce 100644 --- a/src/initscripts/init.d/dhcp +++ b/src/initscripts/init.d/dhcp @@ -9,19 +9,30 @@ . $rc_functions eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +function flush_chains() { + iptables -F DHCPGREENINPUT + iptables -F DHCPGREENOUTPUT + iptables -F DHCPBLUEINPUT + iptables -F DHCPBLUEOUTPUT +} + case "$1" in start) - iptables -F DHCPBLUEINPUT + flush_chains + if [ -e /var/ipfire/dhcp/enable_green ]; then devices="${GREEN_DEV}" + + iptables -A DHCPGREENINPUT -i "${GREEN_DEV}" -j DHCPINPUT + iptables -A DHCPGREENOUTPUT -o "${GREEN_DEV}" -j DHCPOUTPUT fi if [ -e /var/ipfire/dhcp/enable_blue ]; then devices+=" ${BLUE_DEV}" - - iptables -A DHCPBLUEINPUT -p tcp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1 - iptables -A DHCPBLUEINPUT -p udp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1 - fi - + + iptables -A DHCPBLUEINPUT -i "${BLUE_DEV}" -j DHCPINPUT + iptables -A DHCPBLUEOUTPUT -o "${BLUE_DEV}" -j DHCPOUTPUT + fi + boot_mesg "Starting DHCP Server..." loadproc /usr/sbin/dhcpd -q ${devices} @@ -29,6 +40,8 @@ case "$1" in ;; stop) + flush_chains + boot_mesg "Stopping DHCP Server..." killproc -p /var/run/dhcpd.pid /usr/sbin/dhcpd if [ "$(ps -A | grep " dhcpd")" != "" ] ; then diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index f0d9c49..8371781 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -143,6 +143,31 @@ iptables_init() { iptables -A ${i} -j CONNTRACK done + # Allow DHCP + iptables -N DHCPINPUT + iptables -A DHCPINPUT -p udp --sport 68 --dport 67 -j ACCEPT + iptables -A DHCPINPUT -p tcp --sport 68 --dport 67 -j ACCEPT + + iptables -N DHCPOUTPUT + iptables -A DHCPOUTPUT -p udp --sport 67 --dport 68 -j ACCEPT + iptables -A DHCPOUTPUT -p tcp --sport 67 --dport 68 -j ACCEPT + + # Allow DHCP on GREEN + iptables -N DHCPGREENINPUT + iptables -N DHCPGREENOUTPUT + if [ -n "${GREEN_DEV}" ]; then + iptables -A INPUT -i "${GREEN_DEV}" -j DHCPGREENINPUT + iptables -A OUTPUT -o "${GREEN_DEV}" -j DHCPGREENOUTPUT + fi + + # allow DHCP on BLUE to be turned on/off + iptables -N DHCPBLUEINPUT + iptables -N DHCPBLUEOUTPUT + if [ -n "${BLUE_DEV}" ]; then + iptables -A INPUT -i "${BLUE_DEV}" -j DHCPBLUEINPUT + iptables -A OUTPUT -o "${BLUE_DEV}" -j DHCPBLUEOUTPUT + fi + # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything iptables -N IPSECINPUT iptables -N IPSECFORWARD @@ -155,11 +180,7 @@ iptables_init() { # localhost and ethernet. iptables -A INPUT -i $GREEN_DEV -m conntrack --ctstate NEW -j ACCEPT ! -p icmp - - # allow DHCP on BLUE to be turned on/off - iptables -N DHCPBLUEINPUT - iptables -A INPUT -j DHCPBLUEINPUT - + # WIRELESS chains iptables -N WIRELESSINPUT iptables -A INPUT -m conntrack --ctstate NEW -j WIRELESSINPUT hooks/post-receive -- IPFire 2.x development tree

1 0

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

17 Apr '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 39e96de566bc4f3a48de9b683de7ffac850bc0a3 (commit) via 96c1f6dea4cad9bb858724eeeea9199f16e0cf4a (commit) via bc595f0985245d0186c8850e07b9a0629ae7a768 (commit) from 4fbf276cae08c1e0b7cba0aba43c37c8e2151909 (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 39e96de566bc4f3a48de9b683de7ffac850bc0a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 17 12:44:18 2014 +0200 Fix spelling of "IPsec". commit 96c1f6dea4cad9bb858724eeeea9199f16e0cf4a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 17 12:40:04 2014 +0200 Update translations. commit bc595f0985245d0186c8850e07b9a0629ae7a768 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Apr 17 11:14:25 2014 +0200 Firewall: Bug10513 ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 8 ++++++++ doc/language_issues.en | 8 ++++++++ doc/language_missings | 32 ++++++++++++++++++++++++++++++++ html/cgi-bin/fwhosts.cgi | 10 +++------- langs/de/cgi-bin/de.pl | 12 ++++++++++-- langs/en/cgi-bin/en.pl | 12 ++++++++++-- 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 | 6 +++--- 12 files changed, 84 insertions(+), 24 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 486ecba..25612b5 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -226,6 +226,14 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost Custom Host +WARNING: translation string unused: fwhost Custom Network +WARNING: translation string unused: fwhost IpSec Host +WARNING: translation string unused: fwhost IpSec Network +WARNING: translation string unused: fwhost OpenVPN N-2-N +WARNING: translation string unused: fwhost OpenVPN static host +WARNING: translation string unused: fwhost OpenVPN static network +WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark diff --git a/doc/language_issues.en b/doc/language_issues.en index e968b59..e6af830 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -248,6 +248,14 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost Custom Host +WARNING: translation string unused: fwhost Custom Network +WARNING: translation string unused: fwhost IpSec Host +WARNING: translation string unused: fwhost IpSec Network +WARNING: translation string unused: fwhost OpenVPN N-2-N +WARNING: translation string unused: fwhost OpenVPN static host +WARNING: translation string unused: fwhost OpenVPN static network +WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark diff --git a/doc/language_missings b/doc/language_missings index 3f1f997..742f1f7 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -226,6 +226,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -267,7 +269,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -275,6 +279,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -283,6 +290,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -694,6 +702,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -735,7 +745,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -743,6 +755,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -751,6 +766,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -1146,6 +1162,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -1187,7 +1205,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -1195,6 +1215,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -1203,6 +1226,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -1587,6 +1611,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -1628,7 +1654,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -1636,6 +1664,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -1644,6 +1675,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index e8ddf46..c5e1c28 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -909,9 +909,6 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost') } &General::writehasharray("$configgrp", \%customgrp); &General::firewall_config_changed(); - if ($fwhostsettings{'grpcnt'} > 0){ - &General::firewall_config_changed(); - } if ($fwhostsettings{'update'} eq 'on'){ $fwhostsettings{'remark'}= $grpremark; $fwhostsettings{'grp_name'}=$grpname; @@ -1843,11 +1840,11 @@ sub viewtablegrp print "$customgrp{$key}[2]</td>"; } if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){ - print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>"; + print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>"; }else{ my ($colip,$colsub) = split("/",$ip); $ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub); - print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>"; + print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>"; } if ($delflag > 0 && $ip ne ''){ print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />"; @@ -1858,8 +1855,7 @@ sub viewtablegrp } } } - print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='grpcnt' value='$customgrp{$key}[4]'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>"; - + print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>"; $helper=$customgrp{$key}[0]; $number++; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 74bd6e8..7c17621 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -18,8 +18,8 @@ 'ConnSched dial' => 'Verbinden', 'ConnSched down' => 'Runter', 'ConnSched hangup' => 'Trennen', -'ConnSched ipsecstart' => 'IPSec (neu)starten', -'ConnSched ipsecstop' => 'IPSec stop', +'ConnSched ipsecstart' => 'IPsec (neu)starten', +'ConnSched ipsecstop' => 'IPsec stop', 'ConnSched reboot' => 'Neustarten', 'ConnSched reconnect' => 'Neu verbinden', 'ConnSched scheduled actions' => 'Geplante Aktionen', @@ -1030,6 +1030,14 @@ 'fwdfw wd_tue' => 'Di', 'fwdfw wd_wed' => 'Mi', 'fwdfw xt access' => 'Input', +'fwhost Custom Host' => 'Host', +'fwhost Custom Network' => 'Netzwerk', +'fwhost IpSec Host' => 'IPsec-Host', +'fwhost IpSec Network' => 'IPsec-Netzwerk', +'fwhost OpenVPN N-2-N' => 'OpenVPN Netz-zu-Netz', +'fwhost OpenVPN static host' => 'OpenVPN statischer Host', +'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk', +'fwhost Standard Network' => 'Standard-Netzwerk', 'fwhost addgrp' => 'Neue Gruppe hinzufügen', 'fwhost addgrpname' => 'Gruppenname:', 'fwhost addhost' => 'Neuen Host hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f8cdf76..a8e55f5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -18,8 +18,8 @@ 'ConnSched dial' => 'Connect', 'ConnSched down' => 'Down', 'ConnSched hangup' => 'Disconnect', -'ConnSched ipsecstart' => 'IPSec (re)start', -'ConnSched ipsecstop' => 'IPSec stop', +'ConnSched ipsecstart' => 'IPsec (re)start', +'ConnSched ipsecstop' => 'IPsec stop', 'ConnSched reboot' => 'Reboot', 'ConnSched reconnect' => 'Reconnect', 'ConnSched scheduled actions' => 'Scheduled actions', @@ -1056,6 +1056,14 @@ 'fwdfw wd_tue' => 'Tue', 'fwdfw wd_wed' => 'Wed', 'fwdfw xt access' => 'Input', +'fwhost Custom Host' => 'Host', +'fwhost Custom Network' => 'Network', +'fwhost IpSec Host' => 'IPsec host', +'fwhost IpSec Network' => 'IPsec network', +'fwhost OpenVPN N-2-N' => 'OpenVPN Net-to-Net', +'fwhost OpenVPN static host' => 'OpenVPN static host', +'fwhost OpenVPN static network' => 'OpenVPN static network', +'fwhost Standard Network' => 'Standard network', 'fwhost addgrp' => 'Add new network/host group', 'fwhost addgrpname' => 'Group name:', 'fwhost addhost' => 'Add new host', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index edb8be0..19057c7 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -15,8 +15,8 @@ 'ConnSched change profile title' => 'Cambiar a perfil:', 'ConnSched days' => 'Días:', 'ConnSched down' => 'Abajo', -'ConnSched ipsecstart' => '(Re)iniciarIPSec', -'ConnSched ipsecstop' => 'Detener IPSec', +'ConnSched ipsecstart' => '(Re)iniciarIPsec', +'ConnSched ipsecstop' => 'Detener IPsec', 'ConnSched reconnect' => 'Reconectar', 'ConnSched scheduled actions' => 'Acciones planificadas', 'ConnSched scheduler' => 'Planificador', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 9f2e785..f80f112 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Changer de profil :', 'ConnSched days' => 'Jours :', 'ConnSched down' => 'Arrêt', -'ConnSched ipsecstart' => 'IPSec (re)démarrage', -'ConnSched ipsecstop' => 'IPSec arrêt', +'ConnSched ipsecstart' => 'IPsec (re)démarrage', +'ConnSched ipsecstop' => 'IPsec arrêt', 'ConnSched reconnect' => 'Reconnecter', 'ConnSched scheduled actions' => 'Actions planifiées', 'ConnSched scheduler' => 'Planificateur', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 43d76eb..4bcb550 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Gebruik profiel:', 'ConnSched days' => 'Dagen:', 'ConnSched down' => 'Omlaag', -'ConnSched ipsecstart' => 'IPSec (her)starten', -'ConnSched ipsecstop' => 'IPSec stoppen', +'ConnSched ipsecstart' => 'IPsec (her)starten', +'ConnSched ipsecstop' => 'IPsec stoppen', 'ConnSched reconnect' => 'Opnieuw verbinden', 'ConnSched scheduled actions' => 'Ingeplande acties', 'ConnSched scheduler' => 'Scheduler', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 80da6d6..d6b9ab0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Zmień na profil:', 'ConnSched days' => 'Dni:', 'ConnSched down' => 'Niżej', -'ConnSched ipsecstart' => '(Re)start IPSec', -'ConnSched ipsecstop' => 'Zatrzymanie IPSec', +'ConnSched ipsecstart' => '(Re)start IPsec', +'ConnSched ipsecstop' => 'Zatrzymanie IPsec', 'ConnSched reconnect' => 'Ponowne połączenie', 'ConnSched scheduled actions' => 'Zaplanowane zadania', 'ConnSched scheduler' => 'Harmonogram', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c1729b8..9ea9d62 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -15,8 +15,8 @@ 'ConnSched change profile title' => 'Сменить профиль:', 'ConnSched days' => 'Дни:', 'ConnSched down' => 'Down', -'ConnSched ipsecstart' => 'IPSec (пере)запустить', -'ConnSched ipsecstop' => 'IPSec остановить', +'ConnSched ipsecstart' => 'IPsec (пере)запустить', +'ConnSched ipsecstop' => 'IPsec остановить', 'ConnSched reconnect' => 'Переподключить', 'ConnSched scheduled actions' => 'Действия по расписанию', 'ConnSched scheduler' => 'Расписание', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 4453575..146619a 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Profili değitirin:', 'ConnSched days' => 'Günler:', 'ConnSched down' => 'Aşağı', -'ConnSched ipsecstart' => 'IPSec yeniden başlat', -'ConnSched ipsecstop' => 'IPSec durudur', +'ConnSched ipsecstart' => 'IPsec yeniden başlat', +'ConnSched ipsecstop' => 'IPsec durudur', 'ConnSched reconnect' => 'Yeniden bağlan', 'ConnSched scheduled actions' => 'Planlanmış eylemler', 'ConnSched scheduler' => 'Zamanlayıcı', @@ -502,7 +502,7 @@ 'ccd err iroute' => 'Ağ adresi için geçersiz yol.', 'ccd err irouteexist' => 'Bu yol zaten kullanılıyor.', 'ccd err isipsecnet' => 'Verilen ağ adresi zaten bir IPsec ağ tarafından kullanılıyor.', -'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPSec rw ağı tarafından kullanılıyor.', +'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPsec rw ağı tarafından kullanılıyor.', 'ccd err isovpnn2n' => 'Bu alt ağ adresi zaten OpenVPN ağdan ağa bağlantısı için kullanılıyor.', 'ccd err isovpnnet' => 'Bu adres zaten OpenVPN Sunucusu için kullanılan alt ağ adresidir.', 'ccd err issubnet' => 'Bu adres zaten kullanımda olan bir alt ağ adresidir.', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4fbf276cae08c1e0b7cba0aba43c37c8e2151909
by git＠ipfire.org 16 Apr '14

16 Apr '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2751238e6fc5ab0bfa01923cda24f7adc41b747f
by git＠ipfire.org 15 Apr '14

15 Apr '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b18b011b840ced8db756d75b7bd0e40c940e11b6
by git＠ipfire.org 15 Apr '14

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

[git.ipfire.org] IPFire 2.x development tree branch, core76, updated. f1f1114a8bd7a24a6d62c9ff47b75be29aef4dcd
by git＠ipfire.org 15 Apr '14

15 Apr '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, core76 has been updated discards 59fa037ff1f82e2f0a9bfd47f4c8fecb368f361c (commit) via f1f1114a8bd7a24a6d62c9ff47b75be29aef4dcd (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (59fa037ff1f82e2f0a9bfd47f4c8fecb368f361c) \ N -- N -- N (f1f1114a8bd7a24a6d62c9ff47b75be29aef4dcd) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 f1f1114a8bd7a24a6d62c9ff47b75be29aef4dcd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 15 21:25:24 2014 +0200 Build Core Update 76. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{75 => 76}/exclude | 0 config/rootfiles/{oldcore/55 => core/76}/filelists/files | 0 config/rootfiles/core/{75 => 76}/meta | 0 config/rootfiles/core/{75 => 76}/update.sh | 15 +++++---------- 4 files changed, 5 insertions(+), 10 deletions(-) copy config/rootfiles/core/{75 => 76}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/76}/filelists/files (100%) copy config/rootfiles/core/{75 => 76}/meta (100%) copy config/rootfiles/core/{75 => 76}/update.sh (87%) Difference in files: diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/76/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/76/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/76/meta b/config/rootfiles/core/76/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/76/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh new file mode 100644 index 0000000..c05b652 --- /dev/null +++ b/config/rootfiles/core/76/update.sh @@ -0,0 +1,58 @@ +#!/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) 2013 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=76 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Start services +if grep -q "ENABLED=on" /var/ipfire/vpn/settings 2>/dev/null; then + /etc/init.d/ipsec start +fi + +# Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core76, created. 59fa037ff1f82e2f0a9bfd47f4c8fecb368f361c
by git＠ipfire.org 15 Apr '14

15 Apr '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, core76 has been created at 59fa037ff1f82e2f0a9bfd47f4c8fecb368f361c (commit) - Log ----------------------------------------------------------------- commit 59fa037ff1f82e2f0a9bfd47f4c8fecb368f361c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 15 21:25:24 2014 +0200 Build Core Update 76. commit 0eb55942f3a31310cb2985b625fcc5960b39aac9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 15 21:20:46 2014 +0200 strongswan: Fix CVE-2014-2338. http://www.strongswan.org/blog/2014/04/14/strongswan-authentication-bypass-… ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. fab1f85783abd330657d6c0d331848e50347ca4c
by git＠ipfire.org 15 Apr '14

15 Apr '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. eae92b2bafe3a94a3c6c616f8ff02c6fa013e97a
by git＠ipfire.org 14 Apr '14

14 Apr '14

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM