This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via d81d4fa89c2e2e83100d1553191b3a22416957e7 (commit) via fa3f587984feb5e9ff4e6d5ade55a51b40214b63 (commit) from 6da6905a95d224f80fe65a19ae00ab911381e04a (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 d81d4fa89c2e2e83100d1553191b3a22416957e7 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Fri Dec 21 13:13:15 2012 +0100
updater: touch ccd config files.
commit fa3f587984feb5e9ff4e6d5ade55a51b40214b63 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Fri Dec 21 13:10:49 2012 +0100
move core60-65 to oldcore.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/66/update.sh | 7 +++++++ config/rootfiles/{core => oldcore}/60/exclude | 0 config/rootfiles/{core => oldcore}/60/filelists/files | 0 config/rootfiles/{core => oldcore}/60/filelists/strongswan | 0 config/rootfiles/{core => oldcore}/60/meta | 0 config/rootfiles/{core => oldcore}/60/update.sh | 0 config/rootfiles/{core => oldcore}/61/exclude | 0 config/rootfiles/{core => oldcore}/61/filelists/GeoIP | 0 config/rootfiles/{core => oldcore}/61/filelists/Net-Telnet | 0 config/rootfiles/{core => oldcore}/61/filelists/files | 0 config/rootfiles/{core => oldcore}/61/filelists/fireinfo | 0 config/rootfiles/{core => oldcore}/61/filelists/logwatch | 0 config/rootfiles/{core => oldcore}/61/filelists/openvpn | 0 config/rootfiles/{core => oldcore}/61/filelists/pam | 0 config/rootfiles/{core => oldcore}/61/filelists/php | 0 config/rootfiles/{core => oldcore}/61/filelists/squid | 0 .../rootfiles/{core => oldcore}/61/filelists/usb_modeswitch_data | 0 config/rootfiles/{core => oldcore}/61/meta | 0 config/rootfiles/{core => oldcore}/61/update.sh | 0 config/rootfiles/{core => oldcore}/62/exclude | 0 config/rootfiles/{core => oldcore}/62/filelists/GeoIP | 0 config/rootfiles/{core => oldcore}/62/filelists/files | 0 config/rootfiles/{core => oldcore}/62/filelists/hwdata | 0 config/rootfiles/{core => oldcore}/62/filelists/php | 0 config/rootfiles/{core => oldcore}/62/filelists/usb_modeswitch | 0 .../rootfiles/{core => oldcore}/62/filelists/usb_modeswitch_data | 0 config/rootfiles/{core => oldcore}/62/meta | 0 config/rootfiles/{core => oldcore}/62/update.sh | 0 config/rootfiles/{core => oldcore}/63/exclude | 0 config/rootfiles/{core => oldcore}/63/filelists/GeoIP | 0 config/rootfiles/{core => oldcore}/63/filelists/apache2 | 0 config/rootfiles/{core => oldcore}/63/filelists/dhcp | 0 config/rootfiles/{core => oldcore}/63/filelists/files | 0 config/rootfiles/{core => oldcore}/63/filelists/fireinfo | 0 config/rootfiles/{core => oldcore}/63/filelists/inetutils | 0 config/rootfiles/{core => oldcore}/63/meta | 0 config/rootfiles/{core => oldcore}/63/update.sh | 0 config/rootfiles/{core => oldcore}/64/exclude | 0 config/rootfiles/{core => oldcore}/64/filelists/daq | 0 config/rootfiles/{core => oldcore}/64/filelists/files | 0 config/rootfiles/{core => oldcore}/64/filelists/snort | 0 config/rootfiles/{core => oldcore}/64/meta | 0 config/rootfiles/{core => oldcore}/64/update.sh | 0 config/rootfiles/{core => oldcore}/65/exclude | 0 config/rootfiles/{core => oldcore}/65/filelists/GeoIP | 0 config/rootfiles/{core => oldcore}/65/filelists/daq | 0 config/rootfiles/{core => oldcore}/65/filelists/files | 0 config/rootfiles/{core => oldcore}/65/meta | 0 config/rootfiles/{core => oldcore}/65/update.sh | 0 49 files changed, 7 insertions(+) rename config/rootfiles/{core => oldcore}/60/exclude (100%) rename config/rootfiles/{core => oldcore}/60/filelists/files (100%) rename config/rootfiles/{core => oldcore}/60/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/60/meta (100%) rename config/rootfiles/{core => oldcore}/60/update.sh (100%) rename config/rootfiles/{core => oldcore}/61/exclude (100%) rename config/rootfiles/{core => oldcore}/61/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/61/filelists/Net-Telnet (100%) rename config/rootfiles/{core => oldcore}/61/filelists/files (100%) rename config/rootfiles/{core => oldcore}/61/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/61/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/61/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/61/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/61/filelists/php (100%) rename config/rootfiles/{core => oldcore}/61/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/61/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core => oldcore}/61/meta (100%) rename config/rootfiles/{core => oldcore}/61/update.sh (100%) rename config/rootfiles/{core => oldcore}/62/exclude (100%) rename config/rootfiles/{core => oldcore}/62/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/62/filelists/files (100%) rename config/rootfiles/{core => oldcore}/62/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/62/filelists/php (100%) rename config/rootfiles/{core => oldcore}/62/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/62/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core => oldcore}/62/meta (100%) rename config/rootfiles/{core => oldcore}/62/update.sh (100%) rename config/rootfiles/{core => oldcore}/63/exclude (100%) rename config/rootfiles/{core => oldcore}/63/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/63/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/63/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/63/filelists/files (100%) rename config/rootfiles/{core => oldcore}/63/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/63/filelists/inetutils (100%) rename config/rootfiles/{core => oldcore}/63/meta (100%) rename config/rootfiles/{core => oldcore}/63/update.sh (100%) rename config/rootfiles/{core => oldcore}/64/exclude (100%) rename config/rootfiles/{core => oldcore}/64/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/64/filelists/files (100%) rename config/rootfiles/{core => oldcore}/64/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/64/meta (100%) rename config/rootfiles/{core => oldcore}/64/update.sh (100%) rename config/rootfiles/{core => oldcore}/65/exclude (100%) rename config/rootfiles/{core => oldcore}/65/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/65/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/65/filelists/files (100%) rename config/rootfiles/{core => oldcore}/65/meta (100%) rename config/rootfiles/{core => oldcore}/65/update.sh (100%)
Difference in files: diff --git a/config/rootfiles/core/60/exclude b/config/rootfiles/core/60/exclude deleted file mode 100644 index 7360266..0000000 --- a/config/rootfiles/core/60/exclude +++ /dev/null @@ -1,12 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/60/filelists/files b/config/rootfiles/core/60/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/60/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/60/filelists/strongswan b/config/rootfiles/core/60/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/60/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/60/meta b/config/rootfiles/core/60/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/60/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/60/update.sh b/config/rootfiles/core/60/update.sh deleted file mode 100644 index 5aaa23e..0000000 --- a/config/rootfiles/core/60/update.sh +++ /dev/null @@ -1,83 +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) 2012 IPFire-Team info@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=60 -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 "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# -#Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/61/exclude b/config/rootfiles/core/61/exclude deleted file mode 100644 index 7360266..0000000 --- a/config/rootfiles/core/61/exclude +++ /dev/null @@ -1,12 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/61/filelists/GeoIP b/config/rootfiles/core/61/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/61/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/61/filelists/Net-Telnet b/config/rootfiles/core/61/filelists/Net-Telnet deleted file mode 120000 index 66ca926..0000000 --- a/config/rootfiles/core/61/filelists/Net-Telnet +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files deleted file mode 100644 index 55fbcf1..0000000 --- a/config/rootfiles/core/61/filelists/files +++ /dev/null @@ -1,15 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/collectd -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/services.cgi -var/ipfire/general-functions.pl -var/ipfire/langs -var/ipfire/proxy/calamaris/bin/mkreport -usr/local/bin/getconntracktable -usr/sbin/redirect_wrapper diff --git a/config/rootfiles/core/61/filelists/fireinfo b/config/rootfiles/core/61/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/61/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/logwatch b/config/rootfiles/core/61/filelists/logwatch deleted file mode 120000 index f14eabd..0000000 --- a/config/rootfiles/core/61/filelists/logwatch +++ /dev/null @@ -1 +0,0 @@ -../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/openvpn b/config/rootfiles/core/61/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/61/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/pam b/config/rootfiles/core/61/filelists/pam deleted file mode 120000 index 660a1d8..0000000 --- a/config/rootfiles/core/61/filelists/pam +++ /dev/null @@ -1 +0,0 @@ -../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/php b/config/rootfiles/core/61/filelists/php deleted file mode 120000 index 1ae48d7..0000000 --- a/config/rootfiles/core/61/filelists/php +++ /dev/null @@ -1 +0,0 @@ -../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/squid b/config/rootfiles/core/61/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/61/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/usb_modeswitch_data b/config/rootfiles/core/61/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/61/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/61/meta b/config/rootfiles/core/61/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/61/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/update.sh deleted file mode 100644 index e6b504a..0000000 --- a/config/rootfiles/core/61/update.sh +++ /dev/null @@ -1,85 +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) 2012 IPFire-Team info@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=61 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services - -# -#Remove old usb_modeswitch_data -rm -rf /usr/share/usb_modeswitch - -# -#Extract files -extract_files - -# -#Start services -/etc/init.d/squid restart &>/dev/null - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/62/exclude b/config/rootfiles/core/62/exclude deleted file mode 100644 index 7360266..0000000 --- a/config/rootfiles/core/62/exclude +++ /dev/null @@ -1,12 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/62/filelists/GeoIP b/config/rootfiles/core/62/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/62/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/62/filelists/files b/config/rootfiles/core/62/filelists/files deleted file mode 100644 index 34f0d16..0000000 --- a/config/rootfiles/core/62/filelists/files +++ /dev/null @@ -1,8 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/network-vlans -etc/rc.d/rcsysinit.d/S91network-vlans -srv/web/ipfire/cgi-bin/connections.cgi -usr/lib/gconv -var/ipfire/ethernet/vlans -var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/62/filelists/hwdata b/config/rootfiles/core/62/filelists/hwdata deleted file mode 100644 index 5a9672f..0000000 --- a/config/rootfiles/core/62/filelists/hwdata +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/62/filelists/php b/config/rootfiles/core/62/filelists/php deleted file mode 120000 index 1ae48d7..0000000 --- a/config/rootfiles/core/62/filelists/php +++ /dev/null @@ -1 +0,0 @@ -../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch b/config/rootfiles/core/62/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/62/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch_data b/config/rootfiles/core/62/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/62/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/62/meta b/config/rootfiles/core/62/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/62/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/62/update.sh b/config/rootfiles/core/62/update.sh deleted file mode 100644 index 0c37b83..0000000 --- a/config/rootfiles/core/62/update.sh +++ /dev/null @@ -1,80 +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) 2012 IPFire-Team info@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=62 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services - -# -#Extract files -extract_files - -# -#Start services - -# -#Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude deleted file mode 100644 index b6a8d1d..0000000 --- a/config/rootfiles/core/63/exclude +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -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/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/63/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/63/filelists/apache2 b/config/rootfiles/core/63/filelists/apache2 deleted file mode 120000 index eef95ef..0000000 --- a/config/rootfiles/core/63/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp deleted file mode 120000 index 32d8da4..0000000 --- a/config/rootfiles/core/63/filelists/dhcp +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files deleted file mode 100644 index 1455a87..0000000 --- a/config/rootfiles/core/63/filelists/files +++ /dev/null @@ -1,5 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/network-vlans -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/63/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/core/63/filelists/inetutils deleted file mode 120000 index bcd329b..0000000 --- a/config/rootfiles/core/63/filelists/inetutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/63/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh deleted file mode 100644 index f0764ae..0000000 --- a/config/rootfiles/core/63/update.sh +++ /dev/null @@ -1,85 +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) 2012 IPFire-Team info@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=63 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Remove old symlink to DHCP server configuration file. -rm -f /etc/dhcpd.conf - -# -#Stop services -/etc/init.d/apache stop - -# -#Extract files -extract_files - -# -#Start services -/etc/init.d/apache start - -# -#Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/64/exclude b/config/rootfiles/core/64/exclude deleted file mode 100644 index b6a8d1d..0000000 --- a/config/rootfiles/core/64/exclude +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -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/64/filelists/daq b/config/rootfiles/core/64/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/64/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files deleted file mode 100644 index 072fc70..0000000 --- a/config/rootfiles/core/64/filelists/files +++ /dev/null @@ -1,7 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/ids.cgi -var/ipfire/outgoing/bin/outgoingfw.pl -var/ipfire/langs diff --git a/config/rootfiles/core/64/filelists/snort b/config/rootfiles/core/64/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/64/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/64/meta b/config/rootfiles/core/64/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/64/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/core/64/update.sh deleted file mode 100644 index c1e7545..0000000 --- a/config/rootfiles/core/64/update.sh +++ /dev/null @@ -1,82 +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) 2012 IPFire-Team info@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=64 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services -/etc/init.d/snort stop - -# -#Extract files -extract_files - -# -#Start services -/etc/init.d/snort start - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude deleted file mode 100644 index b6a8d1d..0000000 --- a/config/rootfiles/core/65/exclude +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -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/65/filelists/GeoIP b/config/rootfiles/core/65/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/65/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/65/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files deleted file mode 100644 index 13788f1..0000000 --- a/config/rootfiles/core/65/filelists/files +++ /dev/null @@ -1,12 +0,0 @@ -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/bin/launch-ether-wake -usr/sbin/ovpn-ccd-convert -var/ipfire/general-functions.pl -var/ipfire/langs -var/ipfire/backup/include diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/65/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh deleted file mode 100644 index 88f5b36..0000000 --- a/config/rootfiles/core/65/update.sh +++ /dev/null @@ -1,91 +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) 2012 IPFire-Team info@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=65 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services - -# -#Extract files -extract_files - -# -#Start services - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Convert OpenVPN RW connections. -/usr/sbin/ovpn-ccd-convert - -# Update crontab. -sed -i /var/spool/cron/root.orig \ - -e 's@^.*fcron.weekly.*$@&nice(10),bootrun 47 2 * * 1\ttest -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly@' -fcrontab -z &>/dev/null - -# Reload apache configuration. -/etc/init.d/apache reload &>/dev/null - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh index 19036b1..cf40844 100644 --- a/config/rootfiles/core/66/update.sh +++ b/config/rootfiles/core/66/update.sh @@ -219,6 +219,13 @@ telinit u # Convert OpenVPN RW connections. /usr/sbin/ovpn-ccd-convert
+touch /var/ipfire/ovpn/ccd.conf +touch /var/ipfire/ovpn/ccdroute +touch /var/ipfire/ovpn/ccdroute2 +chown nobody:nobody /var/ipfire/ovpn/ccd.conf +chown nobody:nobody /var/ipfire/ovpn/ccdroute +chown nobody:nobody /var/ipfire/ovpn/ccdroute2 + # Update crontab. sed -i /var/spool/cron/root.orig \ -e 's@^.*fcron.weekly.*$@&nice(10),bootrun 47 2 * * 1\ttest -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly@' diff --git a/config/rootfiles/oldcore/60/exclude b/config/rootfiles/oldcore/60/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/oldcore/60/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/oldcore/60/filelists/files b/config/rootfiles/oldcore/60/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/60/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/60/filelists/strongswan b/config/rootfiles/oldcore/60/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/60/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/60/meta b/config/rootfiles/oldcore/60/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/60/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/60/update.sh b/config/rootfiles/oldcore/60/update.sh new file mode 100644 index 0000000..5aaa23e --- /dev/null +++ b/config/rootfiles/oldcore/60/update.sh @@ -0,0 +1,83 @@ +#!/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) 2012 IPFire-Team info@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=60 +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 "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/61/exclude b/config/rootfiles/oldcore/61/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/oldcore/61/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/oldcore/61/filelists/GeoIP b/config/rootfiles/oldcore/61/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/61/filelists/Net-Telnet b/config/rootfiles/oldcore/61/filelists/Net-Telnet new file mode 120000 index 0000000..66ca926 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/Net-Telnet @@ -0,0 +1 @@ +../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/files b/config/rootfiles/oldcore/61/filelists/files new file mode 100644 index 0000000..55fbcf1 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/files @@ -0,0 +1,15 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/collectd +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/services.cgi +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/proxy/calamaris/bin/mkreport +usr/local/bin/getconntracktable +usr/sbin/redirect_wrapper diff --git a/config/rootfiles/oldcore/61/filelists/fireinfo b/config/rootfiles/oldcore/61/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/logwatch b/config/rootfiles/oldcore/61/filelists/logwatch new file mode 120000 index 0000000..f14eabd --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/openvpn b/config/rootfiles/oldcore/61/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/pam b/config/rootfiles/oldcore/61/filelists/pam new file mode 120000 index 0000000..660a1d8 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/php b/config/rootfiles/oldcore/61/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/squid b/config/rootfiles/oldcore/61/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/61/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/oldcore/61/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/oldcore/61/meta b/config/rootfiles/oldcore/61/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/61/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/61/update.sh b/config/rootfiles/oldcore/61/update.sh new file mode 100644 index 0000000..e6b504a --- /dev/null +++ b/config/rootfiles/oldcore/61/update.sh @@ -0,0 +1,85 @@ +#!/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) 2012 IPFire-Team info@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=61 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Remove old usb_modeswitch_data +rm -rf /usr/share/usb_modeswitch + +# +#Extract files +extract_files + +# +#Start services +/etc/init.d/squid restart &>/dev/null + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/62/exclude b/config/rootfiles/oldcore/62/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/oldcore/62/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/oldcore/62/filelists/GeoIP b/config/rootfiles/oldcore/62/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/62/filelists/files b/config/rootfiles/oldcore/62/filelists/files new file mode 100644 index 0000000..34f0d16 --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/files @@ -0,0 +1,8 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-vlans +etc/rc.d/rcsysinit.d/S91network-vlans +srv/web/ipfire/cgi-bin/connections.cgi +usr/lib/gconv +var/ipfire/ethernet/vlans +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/oldcore/62/filelists/hwdata b/config/rootfiles/oldcore/62/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/oldcore/62/filelists/php b/config/rootfiles/oldcore/62/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/oldcore/62/filelists/usb_modeswitch b/config/rootfiles/oldcore/62/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/62/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/62/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/oldcore/62/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/oldcore/62/meta b/config/rootfiles/oldcore/62/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/62/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/62/update.sh b/config/rootfiles/oldcore/62/update.sh new file mode 100644 index 0000000..0c37b83 --- /dev/null +++ b/config/rootfiles/oldcore/62/update.sh @@ -0,0 +1,80 @@ +#!/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) 2012 IPFire-Team info@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=62 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/63/exclude b/config/rootfiles/oldcore/63/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/oldcore/63/exclude @@ -0,0 +1,13 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +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/oldcore/63/filelists/GeoIP b/config/rootfiles/oldcore/63/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/63/filelists/apache2 b/config/rootfiles/oldcore/63/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/63/filelists/dhcp b/config/rootfiles/oldcore/63/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/oldcore/63/filelists/files b/config/rootfiles/oldcore/63/filelists/files new file mode 100644 index 0000000..1455a87 --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-vlans +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/oldcore/63/filelists/fireinfo b/config/rootfiles/oldcore/63/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/63/filelists/inetutils b/config/rootfiles/oldcore/63/filelists/inetutils new file mode 120000 index 0000000..bcd329b --- /dev/null +++ b/config/rootfiles/oldcore/63/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/63/meta b/config/rootfiles/oldcore/63/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/63/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/63/update.sh b/config/rootfiles/oldcore/63/update.sh new file mode 100644 index 0000000..f0764ae --- /dev/null +++ b/config/rootfiles/oldcore/63/update.sh @@ -0,0 +1,85 @@ +#!/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) 2012 IPFire-Team info@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=63 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove old symlink to DHCP server configuration file. +rm -f /etc/dhcpd.conf + +# +#Stop services +/etc/init.d/apache stop + +# +#Extract files +extract_files + +# +#Start services +/etc/init.d/apache start + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/64/exclude b/config/rootfiles/oldcore/64/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/oldcore/64/exclude @@ -0,0 +1,13 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +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/oldcore/64/filelists/daq b/config/rootfiles/oldcore/64/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/64/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/64/filelists/files b/config/rootfiles/oldcore/64/filelists/files new file mode 100644 index 0000000..072fc70 --- /dev/null +++ b/config/rootfiles/oldcore/64/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/langs diff --git a/config/rootfiles/oldcore/64/filelists/snort b/config/rootfiles/oldcore/64/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/64/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/64/meta b/config/rootfiles/oldcore/64/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/64/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/64/update.sh b/config/rootfiles/oldcore/64/update.sh new file mode 100644 index 0000000..c1e7545 --- /dev/null +++ b/config/rootfiles/oldcore/64/update.sh @@ -0,0 +1,82 @@ +#!/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) 2012 IPFire-Team info@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=64 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/snort stop + +# +#Extract files +extract_files + +# +#Start services +/etc/init.d/snort start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/65/exclude b/config/rootfiles/oldcore/65/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/oldcore/65/exclude @@ -0,0 +1,13 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +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/oldcore/65/filelists/GeoIP b/config/rootfiles/oldcore/65/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/65/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/65/filelists/daq b/config/rootfiles/oldcore/65/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/65/filelists/files b/config/rootfiles/oldcore/65/filelists/files new file mode 100644 index 0000000..13788f1 --- /dev/null +++ b/config/rootfiles/oldcore/65/filelists/files @@ -0,0 +1,12 @@ +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/launch-ether-wake +usr/sbin/ovpn-ccd-convert +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/backup/include diff --git a/config/rootfiles/oldcore/65/meta b/config/rootfiles/oldcore/65/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/65/update.sh b/config/rootfiles/oldcore/65/update.sh new file mode 100644 index 0000000..88f5b36 --- /dev/null +++ b/config/rootfiles/oldcore/65/update.sh @@ -0,0 +1,91 @@ +#!/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) 2012 IPFire-Team info@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=65 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +# Update crontab. +sed -i /var/spool/cron/root.orig \ + -e 's@^.*fcron.weekly.*$@&nice(10),bootrun 47 2 * * 1\ttest -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly@' +fcrontab -z &>/dev/null + +# Reload apache configuration. +/etc/init.d/apache reload &>/dev/null + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +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