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