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 dc0e82e56342e8bb6609e5f3aa8eedbf79119793 (commit) via cef2c534b8ac70be6211c942f291d4dde93eef1d (commit) from e353470a8c8d64543960bdf4d20eb86725c939d5 (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 dc0e82e56342e8bb6609e5f3aa8eedbf79119793 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 17 14:50:40 2015 +0200
Move older core updates to archive
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cef2c534b8ac70be6211c942f291d4dde93eef1d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 17 14:48:57 2015 +0200
Start Core Update 92
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/{91 => 92}/exclude | 0 config/rootfiles/core/92/filelists/files | 9 +++++++++ config/rootfiles/core/{91 => 92}/meta | 0 config/rootfiles/core/{91 => 92}/update.sh | 8 ++------ config/rootfiles/{core/89 => oldcore/88}/exclude | 0 config/rootfiles/{core => oldcore}/88/filelists/files | 0 config/rootfiles/{core/90 => oldcore/88}/filelists/fireinfo | 0 config/rootfiles/{core/91 => oldcore/88}/filelists/openssh | 0 config/rootfiles/{core/91 => oldcore/88}/filelists/openssl | 0 .../rootfiles/{core/89 => oldcore/88}/filelists/openssl-compat | 0 config/rootfiles/{core/90 => oldcore/88}/meta | 0 config/rootfiles/{core => oldcore}/88/update.sh | 0 config/rootfiles/{core/88 => oldcore/89}/exclude | 0 config/rootfiles/{core => oldcore}/89/filelists/collectd | 0 config/rootfiles/{core => oldcore}/89/filelists/daq | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/ddns | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/89/filelists/ethtool | 0 config/rootfiles/{core => oldcore}/89/filelists/fcron | 0 config/rootfiles/{core => oldcore}/89/filelists/file | 0 config/rootfiles/{core => oldcore}/89/filelists/files | 0 config/rootfiles/{core => oldcore}/89/filelists/fuse | 0 config/rootfiles/{core => oldcore}/89/filelists/gnupg | 0 config/rootfiles/{core => oldcore}/89/filelists/grep | 0 config/rootfiles/{core => oldcore}/89/filelists/hdparm | 0 config/rootfiles/{core => oldcore}/89/filelists/libart | 0 config/rootfiles/{core => oldcore}/89/filelists/libcap | 0 config/rootfiles/{core => oldcore}/89/filelists/libffi | 0 config/rootfiles/{core => oldcore}/89/filelists/libpcap | 0 config/rootfiles/{core => oldcore}/89/filelists/ntfs-3g | 0 config/rootfiles/{core => oldcore}/89/filelists/openssh | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/openssl | 0 .../rootfiles/{core/88 => oldcore/89}/filelists/openssl-compat | 0 config/rootfiles/{core/91 => oldcore/89}/filelists/pcre | 0 config/rootfiles/{core => oldcore}/89/filelists/screen | 0 config/rootfiles/{core => oldcore}/89/filelists/setup | 0 config/rootfiles/{core => oldcore}/89/filelists/smartmontools | 0 config/rootfiles/{core => oldcore}/89/filelists/snort | 0 config/rootfiles/{core => oldcore}/89/filelists/sqlite | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/squid | 0 config/rootfiles/{core/91 => oldcore/89}/filelists/strongswan | 0 config/rootfiles/{core => oldcore}/89/filelists/tar | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/tzdata | 0 config/rootfiles/{core => oldcore}/89/filelists/wget | 0 config/rootfiles/{core => oldcore}/89/filelists/zlib | 0 config/rootfiles/{core => oldcore}/89/meta | 0 config/rootfiles/{core => oldcore}/89/update.sh | 0 config/rootfiles/{core => oldcore}/90/exclude | 0 config/rootfiles/{core => oldcore}/90/filelists/Locale-Country | 0 config/rootfiles/{core => oldcore}/90/filelists/apache2 | 0 config/rootfiles/{core => oldcore}/90/filelists/armv5tel/glibc | 0 .../{core => oldcore}/90/filelists/armv5tel/linux-kirkwood | 0 .../{core => oldcore}/90/filelists/armv5tel/linux-multi | 0 .../rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-rpi | 0 config/rootfiles/{core => oldcore}/90/filelists/curl | 0 config/rootfiles/{core => oldcore}/90/filelists/cyrus-sasl | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/ddns | 0 config/rootfiles/{core => oldcore}/90/filelists/dhcp | 0 config/rootfiles/{core => oldcore}/90/filelists/dhcpcd | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/90/filelists/dracut | 0 config/rootfiles/{core => oldcore}/90/filelists/expat | 0 config/rootfiles/{core => oldcore}/90/filelists/files | 0 config/rootfiles/{core/88 => oldcore/90}/filelists/fireinfo | 0 config/rootfiles/{core => oldcore}/90/filelists/flag-icons | 0 config/rootfiles/{core => oldcore}/90/filelists/groff | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/acpid | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/glibc | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/linux | 0 .../rootfiles/{core => oldcore}/90/filelists/i586/linux-initrd | 0 .../{core/91 => oldcore/90}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{core => oldcore}/90/filelists/iptables | 0 config/rootfiles/{core => oldcore}/90/filelists/iputils | 0 config/rootfiles/{core => oldcore}/90/filelists/libjpeg | 0 config/rootfiles/{core => oldcore}/90/filelists/logrotate | 0 config/rootfiles/{core => oldcore}/90/filelists/logwatch | 0 config/rootfiles/{core => oldcore}/90/filelists/openldap | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/openssl | 0 .../rootfiles/{core => oldcore}/90/filelists/openssl-0.9.8-files | 0 config/rootfiles/{core => oldcore}/90/filelists/perl-Text-CSV_XS | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/squid | 0 config/rootfiles/{core => oldcore}/90/filelists/strongswan | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/tzdata | 0 config/rootfiles/{core => oldcore}/90/filelists/udev | 0 config/rootfiles/{core => oldcore}/90/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/90/filelists/xtables-addons | 0 config/rootfiles/{core => oldcore}/90/filelists/xz | 0 config/rootfiles/{core/88 => oldcore/90}/meta | 0 config/rootfiles/{core => oldcore}/90/update.sh | 0 config/rootfiles/oldcore/{85 => 91}/exclude | 0 config/rootfiles/{core => oldcore}/91/filelists/files | 0 .../{core/90 => oldcore/91}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/91/filelists/i586/strongswan-padlock | 0 config/rootfiles/{core => oldcore}/91/filelists/libnet | 0 config/rootfiles/{core => oldcore}/91/filelists/libtool | 0 config/rootfiles/{core => oldcore}/91/filelists/libxml2 | 0 config/rootfiles/{core => oldcore}/91/filelists/libxslt | 0 config/rootfiles/{core => oldcore}/91/filelists/newt | 0 config/rootfiles/{core/88 => oldcore/91}/filelists/openssh | 0 config/rootfiles/{core/88 => oldcore/91}/filelists/openssl | 0 config/rootfiles/{core/89 => oldcore/91}/filelists/pcre | 0 config/rootfiles/{core => oldcore}/91/filelists/slang | 0 config/rootfiles/{core/89 => oldcore/91}/filelists/strongswan | 0 config/rootfiles/oldcore/{87 => 91}/meta | 0 config/rootfiles/{core => oldcore}/91/update.sh | 0 make.sh | 2 +- 106 files changed, 12 insertions(+), 7 deletions(-) rename config/rootfiles/core/{91 => 92}/exclude (100%) create mode 100644 config/rootfiles/core/92/filelists/files rename config/rootfiles/core/{91 => 92}/meta (100%) copy config/rootfiles/core/{91 => 92}/update.sh (92%) rename config/rootfiles/{core/89 => oldcore/88}/exclude (100%) rename config/rootfiles/{core => oldcore}/88/filelists/files (100%) rename config/rootfiles/{core/90 => oldcore/88}/filelists/fireinfo (100%) rename config/rootfiles/{core/91 => oldcore/88}/filelists/openssh (100%) rename config/rootfiles/{core/91 => oldcore/88}/filelists/openssl (100%) rename config/rootfiles/{core/89 => oldcore/88}/filelists/openssl-compat (100%) rename config/rootfiles/{core/90 => oldcore/88}/meta (100%) rename config/rootfiles/{core => oldcore}/88/update.sh (100%) rename config/rootfiles/{core/88 => oldcore/89}/exclude (100%) rename config/rootfiles/{core => oldcore}/89/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/89/filelists/daq (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/ddns (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/89/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/89/filelists/fcron (100%) rename config/rootfiles/{core => oldcore}/89/filelists/file (100%) rename config/rootfiles/{core => oldcore}/89/filelists/files (100%) rename config/rootfiles/{core => oldcore}/89/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/89/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/89/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/89/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libart (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libpcap (100%) rename config/rootfiles/{core => oldcore}/89/filelists/ntfs-3g (100%) rename config/rootfiles/{core => oldcore}/89/filelists/openssh (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/openssl (100%) rename config/rootfiles/{core/88 => oldcore/89}/filelists/openssl-compat (100%) rename config/rootfiles/{core/91 => oldcore/89}/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/89/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/89/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/89/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/89/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/89/filelists/sqlite (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/squid (100%) rename config/rootfiles/{core/91 => oldcore/89}/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/89/filelists/tar (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/89/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/89/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/89/meta (100%) rename config/rootfiles/{core => oldcore}/89/update.sh (100%) rename config/rootfiles/{core => oldcore}/90/exclude (100%) rename config/rootfiles/{core => oldcore}/90/filelists/Locale-Country (100%) rename config/rootfiles/{core => oldcore}/90/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/90/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/90/filelists/cyrus-sasl (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dhcpcd (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dracut (100%) rename config/rootfiles/{core => oldcore}/90/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/90/filelists/files (100%) rename config/rootfiles/{core/88 => oldcore/90}/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/90/filelists/flag-icons (100%) rename config/rootfiles/{core => oldcore}/90/filelists/groff (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core/91 => oldcore/90}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/90/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/90/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/90/filelists/libjpeg (100%) rename config/rootfiles/{core => oldcore}/90/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/90/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/90/filelists/openldap (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/90/filelists/openssl-0.9.8-files (100%) rename config/rootfiles/{core => oldcore}/90/filelists/perl-Text-CSV_XS (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/90/filelists/strongswan (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/90/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/90/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/90/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/90/filelists/xz (100%) rename config/rootfiles/{core/88 => oldcore/90}/meta (100%) rename config/rootfiles/{core => oldcore}/90/update.sh (100%) copy config/rootfiles/oldcore/{85 => 91}/exclude (100%) rename config/rootfiles/{core => oldcore}/91/filelists/files (100%) rename config/rootfiles/{core/90 => oldcore/91}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/91/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libnet (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libtool (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libxml2 (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libxslt (100%) rename config/rootfiles/{core => oldcore}/91/filelists/newt (100%) rename config/rootfiles/{core/88 => oldcore/91}/filelists/openssh (100%) rename config/rootfiles/{core/88 => oldcore/91}/filelists/openssl (100%) rename config/rootfiles/{core/89 => oldcore/91}/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/91/filelists/slang (100%) rename config/rootfiles/{core/89 => oldcore/91}/filelists/strongswan (100%) copy config/rootfiles/oldcore/{87 => 91}/meta (100%) rename config/rootfiles/{core => oldcore}/91/update.sh (100%)
Difference in files: diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/88/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/88/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/88/filelists/files b/config/rootfiles/core/88/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/88/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/88/filelists/fireinfo b/config/rootfiles/core/88/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/88/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/88/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/core/88/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/88/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/88/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/88/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/88/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh deleted file mode 100644 index 6ef1f48..0000000 --- a/config/rootfiles/core/88/update.sh +++ /dev/null @@ -1,57 +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 - -# Remove old core updates from pakfire cache to save space... -core=88 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# Remove old files - -# 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/core/89/exclude b/config/rootfiles/core/89/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/89/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/89/filelists/collectd b/config/rootfiles/core/89/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/89/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/daq b/config/rootfiles/core/89/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/89/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ddns b/config/rootfiles/core/89/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/89/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/dnsmasq b/config/rootfiles/core/89/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/89/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ethtool b/config/rootfiles/core/89/filelists/ethtool deleted file mode 120000 index 494a53e..0000000 --- a/config/rootfiles/core/89/filelists/ethtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/fcron b/config/rootfiles/core/89/filelists/fcron deleted file mode 120000 index 4a454ea..0000000 --- a/config/rootfiles/core/89/filelists/fcron +++ /dev/null @@ -1 +0,0 @@ -../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/file b/config/rootfiles/core/89/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/89/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files deleted file mode 100644 index 70c5f3d..0000000 --- a/config/rootfiles/core/89/filelists/files +++ /dev/null @@ -1,22 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/collectd.vpn -etc/rc.d/init.d/dnsmasq -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/netovpnrw.cgi -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/bin/collectdctrl -usr/local/bin/openvpnctrl -usr/sbin/ovpn-collectd-convert -usr/sbin/setup -var/ipfire/backup/bin/backup.pl -var/ipfire/graphs.pl -var/ipfire/langs -var/ipfire/lang.pl -var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/core/89/filelists/fuse deleted file mode 120000 index 570edaa..0000000 --- a/config/rootfiles/core/89/filelists/fuse +++ /dev/null @@ -1 +0,0 @@ -../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/gnupg b/config/rootfiles/core/89/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/89/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/grep b/config/rootfiles/core/89/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/89/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/hdparm b/config/rootfiles/core/89/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/89/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libart b/config/rootfiles/core/89/filelists/libart deleted file mode 120000 index bb1e078..0000000 --- a/config/rootfiles/core/89/filelists/libart +++ /dev/null @@ -1 +0,0 @@ -../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libcap b/config/rootfiles/core/89/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/89/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libffi b/config/rootfiles/core/89/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/89/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libpcap b/config/rootfiles/core/89/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/89/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/core/89/filelists/ntfs-3g deleted file mode 120000 index d93adc2..0000000 --- a/config/rootfiles/core/89/filelists/ntfs-3g +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/core/89/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/89/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl b/config/rootfiles/core/89/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/89/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl-compat b/config/rootfiles/core/89/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/89/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/pcre b/config/rootfiles/core/89/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/89/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/screen b/config/rootfiles/core/89/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/89/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/setup b/config/rootfiles/core/89/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/89/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/smartmontools b/config/rootfiles/core/89/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/89/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/snort b/config/rootfiles/core/89/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/89/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/sqlite b/config/rootfiles/core/89/filelists/sqlite deleted file mode 120000 index 4ea5697..0000000 --- a/config/rootfiles/core/89/filelists/sqlite +++ /dev/null @@ -1 +0,0 @@ -../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/squid b/config/rootfiles/core/89/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/89/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/strongswan b/config/rootfiles/core/89/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/89/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tar b/config/rootfiles/core/89/filelists/tar deleted file mode 120000 index 3e585d2..0000000 --- a/config/rootfiles/core/89/filelists/tar +++ /dev/null @@ -1 +0,0 @@ -../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tzdata b/config/rootfiles/core/89/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/89/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/wget b/config/rootfiles/core/89/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/89/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/zlib b/config/rootfiles/core/89/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/89/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/89/meta b/config/rootfiles/core/89/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/89/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh deleted file mode 100644 index 13c645a..0000000 --- a/config/rootfiles/core/89/update.sh +++ /dev/null @@ -1,111 +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 - -# Remove old core updates from pakfire cache to save space... -core=89 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/ipsec stop - -# Remove old files -rm -f /usr/local/sbin/setup - -# Extract files -extract_files - -# Update /etc/sysconfig/createfiles -cat <<EOF >> /etc/sysconfig/createfiles -/var/run/ovpnserver.log file 644 nobody nobody -/var/run/openvpn dir 644 nobody nobody -EOF - -# Update /etc/collectd.conf -if ! grep -q "collectd.vpn" /etc/collectd.conf; then - echo "include "/etc/collectd.vpn"" >> /etc/collectd.conf -fi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Prevent uninstall sqlite (now common package). -rm -f \ - /opt/pakfire/db/*/meta-sqlite \ - /opt/pakfire/db/rootfiles/sqlite - -mkdir -p /var/run/openvpn -touch /var/run/ovpnserver.log -chown nobody.nobody \ - /var/run/openvpn \ - /var/run/ovpnserver.log - -# Update OpenVPN/collectd configuration -for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do - name="${i##*/}" - name="${name%*.conf}" - - if ! grep -qE "^status-version" ${i}; then - echo "# Logfile" >> ${i} - echo "status-version 1" >> ${i} - fi - - if ! grep -qE "^status " ${i}; then - echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} - fi -done - -/usr/sbin/ovpn-collectd-convert -chown nobody.nobody /var/ipfire/ovpn/collectd.vpn - -# Fix permissions -chown nobody.nobody /var/ipfire/dns - -# Fix #10625 -mkdir -p /etc/logrotate.d - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude deleted file mode 100644 index 73b7b73..0000000 --- a/config/rootfiles/core/90/exclude +++ /dev/null @@ -1,27 +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/rc.d/rcsysinit.d/S19checkfstab -etc/rc.d/rcsysinit.d/S70console -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/modules -etc/sysconfig/rc.local -srv/web/ipfire/html/proxy.pac -var/ipfire/firewall/geoipblock -var/ipfire/fwhosts/custmgeoipgrp -var/ipfire/ovpn/ccd.conf -var/ipfire/ovpn/ccdroute -var/ipfire/ovpn/ccdroute2 -var/ipfire/time -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/90/filelists/Locale-Country b/config/rootfiles/core/90/filelists/Locale-Country deleted file mode 120000 index 025c278..0000000 --- a/config/rootfiles/core/90/filelists/Locale-Country +++ /dev/null @@ -1 +0,0 @@ -../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/apache2 b/config/rootfiles/core/90/filelists/apache2 deleted file mode 120000 index eef95ef..0000000 --- a/config/rootfiles/core/90/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/glibc b/config/rootfiles/core/90/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/90/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/90/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/90/filelists/armv5tel/linux-multi b/config/rootfiles/core/90/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/90/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/90/filelists/armv5tel/linux-rpi b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/90/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/90/filelists/curl b/config/rootfiles/core/90/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/90/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/cyrus-sasl b/config/rootfiles/core/90/filelists/cyrus-sasl deleted file mode 120000 index bb51b4c..0000000 --- a/config/rootfiles/core/90/filelists/cyrus-sasl +++ /dev/null @@ -1 +0,0 @@ -../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/ddns b/config/rootfiles/core/90/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/90/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcp b/config/rootfiles/core/90/filelists/dhcp deleted file mode 120000 index 32d8da4..0000000 --- a/config/rootfiles/core/90/filelists/dhcp +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcpcd b/config/rootfiles/core/90/filelists/dhcpcd deleted file mode 120000 index 1e799da..0000000 --- a/config/rootfiles/core/90/filelists/dhcpcd +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dnsmasq b/config/rootfiles/core/90/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/90/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dracut b/config/rootfiles/core/90/filelists/dracut deleted file mode 120000 index 1608699..0000000 --- a/config/rootfiles/core/90/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/expat b/config/rootfiles/core/90/filelists/expat deleted file mode 120000 index e1923cf..0000000 --- a/config/rootfiles/core/90/filelists/expat +++ /dev/null @@ -1 +0,0 @@ -../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files deleted file mode 100644 index ee596a0..0000000 --- a/config/rootfiles/core/90/filelists/files +++ /dev/null @@ -1,38 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -etc/rc.d/init.d/network-trigger -etc/rc.d/init.d/networking/functions.network -etc/rc.d/init.d/networking/red.up/99-geoip-database -etc/rc.d/rcsysinit.d/S90network-trigger -opt/pakfire/pakfire -opt/pakfire/lib/functions.pl -srv/web/ipfire/cgi-bin/country.cgi -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/geoip-block.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/themes/darkdos/include/style.css -srv/web/ipfire/html/themes/ipfire-legacy/include/style.css -srv/web/ipfire/html/themes/ipfire/include/css/style.css -srv/web/ipfire/html/themes/maniac/include/style.css -usr/lib/firewall/firewall-lib.pl -usr/lib/firewall/rules.pl -usr/local/bin/backupiso -usr/local/bin/ddnsctrl -usr/local/bin/ipsecctrl -usr/local/bin/xt_geoip_build -usr/local/bin/xt_geoip_update -var/ipfire/general-functions.pl -var/ipfire/geoip-functions.pl -var/ipfire/header.pl -var/ipfire/backup/include -var/ipfire/langs -var/ipfire/menu.d/50-firewall.menu diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/core/90/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/90/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons deleted file mode 120000 index 8776b6b..0000000 --- a/config/rootfiles/core/90/filelists/flag-icons +++ /dev/null @@ -1 +0,0 @@ -../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/groff b/config/rootfiles/core/90/filelists/groff deleted file mode 120000 index 232291e..0000000 --- a/config/rootfiles/core/90/filelists/groff +++ /dev/null @@ -1 +0,0 @@ -../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/acpid b/config/rootfiles/core/90/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/90/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/glibc b/config/rootfiles/core/90/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/90/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux b/config/rootfiles/core/90/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/90/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux-initrd b/config/rootfiles/core/90/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6..0000000 --- a/config/rootfiles/core/90/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/openssl-sse2 b/config/rootfiles/core/90/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/90/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iptables b/config/rootfiles/core/90/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/90/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iputils b/config/rootfiles/core/90/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/90/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/libjpeg b/config/rootfiles/core/90/filelists/libjpeg deleted file mode 120000 index 3b1a782..0000000 --- a/config/rootfiles/core/90/filelists/libjpeg +++ /dev/null @@ -1 +0,0 @@ -../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logrotate b/config/rootfiles/core/90/filelists/logrotate deleted file mode 120000 index bc192c0..0000000 --- a/config/rootfiles/core/90/filelists/logrotate +++ /dev/null @@ -1 +0,0 @@ -../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logwatch b/config/rootfiles/core/90/filelists/logwatch deleted file mode 120000 index f14eabd..0000000 --- a/config/rootfiles/core/90/filelists/logwatch +++ /dev/null @@ -1 +0,0 @@ -../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap deleted file mode 120000 index 80c324f..0000000 --- a/config/rootfiles/core/90/filelists/openldap +++ /dev/null @@ -1 +0,0 @@ -../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl b/config/rootfiles/core/90/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/90/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/core/90/filelists/openssl-0.9.8-files deleted file mode 100644 index e80a57d..0000000 --- a/config/rootfiles/core/90/filelists/openssl-0.9.8-files +++ /dev/null @@ -1,19 +0,0 @@ -lib/security/pam_mysql.so -usr/lib/gnupg/gpgkeys_ldap -usr/lib/gnupg/gpgkeys_hkp -usr/lib/gnupg/gpgkeys_curl -usr/lib/apache/libphp5.so -usr/lib/squid/digest_ldap_auth -usr/lib/squid/basic_ldap_auth -usr/lib/squid/ext_kerberos_ldap_group_acl -usr/lib/squid/ext_edirectory_userip_acl -usr/lib/squid/ext_ldap_group_acl -usr/lib/python2.7/lib-dynload/_ssl.so -usr/lib/python2.7/lib-dynload/_hashlib.so -usr/lib/collectd/write_http.so -usr/lib/collectd/ascent.so -usr/lib/collectd/curl_xml.so -usr/lib/collectd/apache.so -usr/lib/collectd/bind.so -usr/lib/collectd/curl.so -usr/bin/php diff --git a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS b/config/rootfiles/core/90/filelists/perl-Text-CSV_XS deleted file mode 120000 index ec1202f..0000000 --- a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS +++ /dev/null @@ -1 +0,0 @@ -../../../common/perl-Text-CSV_XS \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/squid b/config/rootfiles/core/90/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/90/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/strongswan b/config/rootfiles/core/90/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/90/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/tzdata b/config/rootfiles/core/90/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/90/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/udev b/config/rootfiles/core/90/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/90/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/wpa_supplicant b/config/rootfiles/core/90/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/90/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/xtables-addons b/config/rootfiles/core/90/filelists/xtables-addons deleted file mode 120000 index 2e24c42..0000000 --- a/config/rootfiles/core/90/filelists/xtables-addons +++ /dev/null @@ -1 +0,0 @@ -../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/xz b/config/rootfiles/core/90/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/90/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/90/meta b/config/rootfiles/core/90/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/90/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh deleted file mode 100644 index 34dacf1..0000000 --- a/config/rootfiles/core/90/update.sh +++ /dev/null @@ -1,297 +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 find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -# -# Remove old core updates from pakfire cache to save space... -core=90 -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* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - ;; -esac - -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Drop old flag icons, before extracting the new ones. -rm /srv/web/ipfire/html/images/flags/* - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# -# restart init because glibc was updated. -telinit u - -# Remove old openssl libraries -rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Create GeoIP related files if they do not exist yet. -if [ ! -e "/var/ipfire/firewall/geoipblock" ]; then - touch /var/ipfire/firewall/geoipblock - chown nobody:nobody /var/ipfire/firewall/geoipblock - - # Insert default value into file. - echo "GEOIPBLOCK_ENABLED=off" >> /var/ipfire/firewall/geoipblock -fi -if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then - touch /var/ipfire/fwhosts/customgeoipgrp - chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp -fi - -#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) -if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then - sed -i "s//var/log/ovpnserver.log 30//var/run/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf -fi - -# Download/Update GeoIP databases. -/usr/local/bin/xt_geoip_update - -# Update crontab -grep -q /usr/local/bin/xt_geoip_update /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update GeoIP database once a month. -%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 -EOF - -fcrontab -z &>/dev/null - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Remove old udev configuration -rm -vf /etc/udev/rules.d/30-persistent-network.rules - -# Remove pids from dhcp client because it hang at normal shutdown -# so let the sysvinit kill it -rm -f /run/dhcpcd-*.pid - -# -# 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 - -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig > /boot/grub/grub.cfg -fi - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/installed/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae -# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null - fi -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/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -echo -echo Please wait until pakfire has ended... -echo - -# Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/core/91/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/91/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/91/filelists/files b/config/rootfiles/core/91/filelists/files deleted file mode 100644 index 7cc5aa2..0000000 --- a/config/rootfiles/core/91/filelists/files +++ /dev/null @@ -1,7 +0,0 @@ -etc/system-release -etc/issue -opt/pakfire/lib/functions.pl -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/dhcp.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -var/ipfire/langs diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/91/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/91/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/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet deleted file mode 120000 index 26e5f79..0000000 --- a/config/rootfiles/core/91/filelists/libnet +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool deleted file mode 120000 index 54f5666..0000000 --- a/config/rootfiles/core/91/filelists/libtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2 deleted file mode 120000 index 242e69f..0000000 --- a/config/rootfiles/core/91/filelists/libxml2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt deleted file mode 120000 index bf9d766..0000000 --- a/config/rootfiles/core/91/filelists/libxslt +++ /dev/null @@ -1 +0,0 @@ -../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/core/91/filelists/newt deleted file mode 120000 index fb3eb20..0000000 --- a/config/rootfiles/core/91/filelists/newt +++ /dev/null @@ -1 +0,0 @@ -../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/91/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/91/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/91/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang deleted file mode 120000 index 228e45e..0000000 --- a/config/rootfiles/core/91/filelists/slang +++ /dev/null @@ -1 +0,0 @@ -../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/91/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/91/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh deleted file mode 100644 index 1e55e8b..0000000 --- a/config/rootfiles/core/91/update.sh +++ /dev/null @@ -1,65 +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) 2015 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=91 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/ipsec stop - -# Extract files -extract_files - -# Create some missing graphs folders (core90) -mkdir -p /srv/web/ipfire/html/{accounting,graphs} -chmod 777 /srv/web/ipfire/html/{accounting,graphs} - -# Update Language cache -/usr/local/bin/update-lang-cache - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -sync - -# Start services -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/92/exclude b/config/rootfiles/core/92/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/92/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/92/filelists/files b/config/rootfiles/core/92/filelists/files new file mode 100644 index 0000000..fe764db --- /dev/null +++ b/config/rootfiles/core/92/filelists/files @@ -0,0 +1,9 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +var/ipfire/network-functions.pl +var/ipfire/langs +var/ipfire/urlfilter/bin/autoupdate.pl diff --git a/config/rootfiles/core/92/meta b/config/rootfiles/core/92/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/92/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh new file mode 100644 index 0000000..0314d80 --- /dev/null +++ b/config/rootfiles/core/92/update.sh @@ -0,0 +1,61 @@ +#!/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) 2015 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=92 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +sync + +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/88/exclude b/config/rootfiles/oldcore/88/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/88/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/88/filelists/files b/config/rootfiles/oldcore/88/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/88/filelists/fireinfo b/config/rootfiles/oldcore/88/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssh b/config/rootfiles/oldcore/88/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssl b/config/rootfiles/oldcore/88/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssl-compat b/config/rootfiles/oldcore/88/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/meta b/config/rootfiles/oldcore/88/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/88/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/88/update.sh b/config/rootfiles/oldcore/88/update.sh new file mode 100644 index 0000000..6ef1f48 --- /dev/null +++ b/config/rootfiles/oldcore/88/update.sh @@ -0,0 +1,57 @@ +#!/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=88 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# 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/89/exclude b/config/rootfiles/oldcore/89/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/89/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/89/filelists/collectd b/config/rootfiles/oldcore/89/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/daq b/config/rootfiles/oldcore/89/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ddns b/config/rootfiles/oldcore/89/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/dnsmasq b/config/rootfiles/oldcore/89/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ethtool b/config/rootfiles/oldcore/89/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/fcron b/config/rootfiles/oldcore/89/filelists/fcron new file mode 120000 index 0000000..4a454ea --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/fcron @@ -0,0 +1 @@ +../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/file b/config/rootfiles/oldcore/89/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/files b/config/rootfiles/oldcore/89/filelists/files new file mode 100644 index 0000000..70c5f3d --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/files @@ -0,0 +1,22 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/collectdctrl +usr/local/bin/openvpnctrl +usr/sbin/ovpn-collectd-convert +usr/sbin/setup +var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/oldcore/89/filelists/fuse b/config/rootfiles/oldcore/89/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/gnupg b/config/rootfiles/oldcore/89/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/grep b/config/rootfiles/oldcore/89/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/hdparm b/config/rootfiles/oldcore/89/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libart b/config/rootfiles/oldcore/89/filelists/libart new file mode 120000 index 0000000..bb1e078 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libart @@ -0,0 +1 @@ +../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libcap b/config/rootfiles/oldcore/89/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libffi b/config/rootfiles/oldcore/89/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libpcap b/config/rootfiles/oldcore/89/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ntfs-3g b/config/rootfiles/oldcore/89/filelists/ntfs-3g new file mode 120000 index 0000000..d93adc2 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssh b/config/rootfiles/oldcore/89/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssl b/config/rootfiles/oldcore/89/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssl-compat b/config/rootfiles/oldcore/89/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/pcre b/config/rootfiles/oldcore/89/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/screen b/config/rootfiles/oldcore/89/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/setup b/config/rootfiles/oldcore/89/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/smartmontools b/config/rootfiles/oldcore/89/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/snort b/config/rootfiles/oldcore/89/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/sqlite b/config/rootfiles/oldcore/89/filelists/sqlite new file mode 120000 index 0000000..4ea5697 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/squid b/config/rootfiles/oldcore/89/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/strongswan b/config/rootfiles/oldcore/89/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/tar b/config/rootfiles/oldcore/89/filelists/tar new file mode 120000 index 0000000..3e585d2 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/tzdata b/config/rootfiles/oldcore/89/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/wget b/config/rootfiles/oldcore/89/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/zlib b/config/rootfiles/oldcore/89/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/meta b/config/rootfiles/oldcore/89/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/89/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/89/update.sh b/config/rootfiles/oldcore/89/update.sh new file mode 100644 index 0000000..13c645a --- /dev/null +++ b/config/rootfiles/oldcore/89/update.sh @@ -0,0 +1,111 @@ +#!/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=89 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Remove old files +rm -f /usr/local/sbin/setup + +# Extract files +extract_files + +# Update /etc/sysconfig/createfiles +cat <<EOF >> /etc/sysconfig/createfiles +/var/run/ovpnserver.log file 644 nobody nobody +/var/run/openvpn dir 644 nobody nobody +EOF + +# Update /etc/collectd.conf +if ! grep -q "collectd.vpn" /etc/collectd.conf; then + echo "include "/etc/collectd.vpn"" >> /etc/collectd.conf +fi + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Start services +/etc/init.d/dnsmasq restart +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Prevent uninstall sqlite (now common package). +rm -f \ + /opt/pakfire/db/*/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + +mkdir -p /var/run/openvpn +touch /var/run/ovpnserver.log +chown nobody.nobody \ + /var/run/openvpn \ + /var/run/ovpnserver.log + +# Update OpenVPN/collectd configuration +for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do + name="${i##*/}" + name="${name%*.conf}" + + if ! grep -qE "^status-version" ${i}; then + echo "# Logfile" >> ${i} + echo "status-version 1" >> ${i} + fi + + if ! grep -qE "^status " ${i}; then + echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} + fi +done + +/usr/sbin/ovpn-collectd-convert +chown nobody.nobody /var/ipfire/ovpn/collectd.vpn + +# Fix permissions +chown nobody.nobody /var/ipfire/dns + +# Fix #10625 +mkdir -p /etc/logrotate.d + +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/90/exclude b/config/rootfiles/oldcore/90/exclude new file mode 100644 index 0000000..73b7b73 --- /dev/null +++ b/config/rootfiles/oldcore/90/exclude @@ -0,0 +1,27 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +srv/web/ipfire/html/proxy.pac +var/ipfire/firewall/geoipblock +var/ipfire/fwhosts/custmgeoipgrp +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/ipfire/time +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/90/filelists/Locale-Country b/config/rootfiles/oldcore/90/filelists/Locale-Country new file mode 120000 index 0000000..025c278 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/Locale-Country @@ -0,0 +1 @@ +../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/apache2 b/config/rootfiles/oldcore/90/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/glibc b/config/rootfiles/oldcore/90/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/curl b/config/rootfiles/oldcore/90/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/cyrus-sasl b/config/rootfiles/oldcore/90/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/ddns b/config/rootfiles/oldcore/90/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dhcp b/config/rootfiles/oldcore/90/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dhcpcd b/config/rootfiles/oldcore/90/filelists/dhcpcd new file mode 120000 index 0000000..1e799da --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dnsmasq b/config/rootfiles/oldcore/90/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dracut b/config/rootfiles/oldcore/90/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/expat b/config/rootfiles/oldcore/90/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/files b/config/rootfiles/oldcore/90/filelists/files new file mode 100644 index 0000000..ee596a0 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/files @@ -0,0 +1,38 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/network-trigger +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/networking/red.up/99-geoip-database +etc/rc.d/rcsysinit.d/S90network-trigger +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/geoip-block.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/maniac/include/style.css +usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/rules.pl +usr/local/bin/backupiso +usr/local/bin/ddnsctrl +usr/local/bin/ipsecctrl +usr/local/bin/xt_geoip_build +usr/local/bin/xt_geoip_update +var/ipfire/general-functions.pl +var/ipfire/geoip-functions.pl +var/ipfire/header.pl +var/ipfire/backup/include +var/ipfire/langs +var/ipfire/menu.d/50-firewall.menu diff --git a/config/rootfiles/oldcore/90/filelists/fireinfo b/config/rootfiles/oldcore/90/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/flag-icons b/config/rootfiles/oldcore/90/filelists/flag-icons new file mode 120000 index 0000000..8776b6b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/flag-icons @@ -0,0 +1 @@ +../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/groff b/config/rootfiles/oldcore/90/filelists/groff new file mode 120000 index 0000000..232291e --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/groff @@ -0,0 +1 @@ +../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/acpid b/config/rootfiles/oldcore/90/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/glibc b/config/rootfiles/oldcore/90/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/linux b/config/rootfiles/oldcore/90/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/linux-initrd b/config/rootfiles/oldcore/90/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/iptables b/config/rootfiles/oldcore/90/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/iputils b/config/rootfiles/oldcore/90/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/libjpeg b/config/rootfiles/oldcore/90/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/logrotate b/config/rootfiles/oldcore/90/filelists/logrotate new file mode 120000 index 0000000..bc192c0 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/logwatch b/config/rootfiles/oldcore/90/filelists/logwatch new file mode 120000 index 0000000..f14eabd --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openldap b/config/rootfiles/oldcore/90/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openssl b/config/rootfiles/oldcore/90/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files b/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files new file mode 100644 index 0000000..e80a57d --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files @@ -0,0 +1,19 @@ +lib/security/pam_mysql.so +usr/lib/gnupg/gpgkeys_ldap +usr/lib/gnupg/gpgkeys_hkp +usr/lib/gnupg/gpgkeys_curl +usr/lib/apache/libphp5.so +usr/lib/squid/digest_ldap_auth +usr/lib/squid/basic_ldap_auth +usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/ext_edirectory_userip_acl +usr/lib/squid/ext_ldap_group_acl +usr/lib/python2.7/lib-dynload/_ssl.so +usr/lib/python2.7/lib-dynload/_hashlib.so +usr/lib/collectd/write_http.so +usr/lib/collectd/ascent.so +usr/lib/collectd/curl_xml.so +usr/lib/collectd/apache.so +usr/lib/collectd/bind.so +usr/lib/collectd/curl.so +usr/bin/php diff --git a/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS b/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS new file mode 120000 index 0000000..ec1202f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS @@ -0,0 +1 @@ +../../../common/perl-Text-CSV_XS \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/squid b/config/rootfiles/oldcore/90/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/strongswan b/config/rootfiles/oldcore/90/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/tzdata b/config/rootfiles/oldcore/90/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/udev b/config/rootfiles/oldcore/90/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/wpa_supplicant b/config/rootfiles/oldcore/90/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/xtables-addons b/config/rootfiles/oldcore/90/filelists/xtables-addons new file mode 120000 index 0000000..2e24c42 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/xz b/config/rootfiles/oldcore/90/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/meta b/config/rootfiles/oldcore/90/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/90/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/90/update.sh b/config/rootfiles/oldcore/90/update.sh new file mode 100644 index 0000000..34dacf1 --- /dev/null +++ b/config/rootfiles/oldcore/90/update.sh @@ -0,0 +1,297 @@ +#!/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 find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# +# Remove old core updates from pakfire cache to save space... +core=90 +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* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Drop old flag icons, before extracting the new ones. +rm /srv/web/ipfire/html/images/flags/* + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# +# restart init because glibc was updated. +telinit u + +# Remove old openssl libraries +rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Create GeoIP related files if they do not exist yet. +if [ ! -e "/var/ipfire/firewall/geoipblock" ]; then + touch /var/ipfire/firewall/geoipblock + chown nobody:nobody /var/ipfire/firewall/geoipblock + + # Insert default value into file. + echo "GEOIPBLOCK_ENABLED=off" >> /var/ipfire/firewall/geoipblock +fi +if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then + touch /var/ipfire/fwhosts/customgeoipgrp + chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp +fi + +#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) +if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then + sed -i "s//var/log/ovpnserver.log 30//var/run/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf +fi + +# Download/Update GeoIP databases. +/usr/local/bin/xt_geoip_update + +# Update crontab +grep -q /usr/local/bin/xt_geoip_update /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update GeoIP database once a month. +%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 +EOF + +fcrontab -z &>/dev/null + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + +# +# 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 + +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/installed/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae +# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null + fi +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/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +echo +echo Please wait until pakfire has ended... +echo + +# Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/oldcore/91/exclude b/config/rootfiles/oldcore/91/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/91/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/91/filelists/files b/config/rootfiles/oldcore/91/filelists/files new file mode 100644 index 0000000..7cc5aa2 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +var/ipfire/langs diff --git a/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libnet b/config/rootfiles/oldcore/91/filelists/libnet new file mode 120000 index 0000000..26e5f79 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libtool b/config/rootfiles/oldcore/91/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libxml2 b/config/rootfiles/oldcore/91/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libxslt b/config/rootfiles/oldcore/91/filelists/libxslt new file mode 120000 index 0000000..bf9d766 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/newt b/config/rootfiles/oldcore/91/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/openssh b/config/rootfiles/oldcore/91/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/openssl b/config/rootfiles/oldcore/91/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/pcre b/config/rootfiles/oldcore/91/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/slang b/config/rootfiles/oldcore/91/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/strongswan b/config/rootfiles/oldcore/91/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/meta b/config/rootfiles/oldcore/91/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/91/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/91/update.sh b/config/rootfiles/oldcore/91/update.sh new file mode 100644 index 0000000..1e55e8b --- /dev/null +++ b/config/rootfiles/oldcore/91/update.sh @@ -0,0 +1,65 @@ +#!/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) 2015 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=91 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Create some missing graphs folders (core90) +mkdir -p /srv/web/ipfire/html/{accounting,graphs} +chmod 777 /srv/web/ipfire/html/{accounting,graphs} + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +sync + +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 29245bc..bcbeffb 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="91" # Core Level (Filename) +CORE="92" # Core Level (Filename) PAKFIRE_CORE="91" # 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