Merge remote-tracking branch 'pmueller/temp-c163-development' into next

config/rootfiles/oldcore/162/exclude

@@ -0,0 +1,36 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+boot/uboot.env
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+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
+usr/share/xt_geoip
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache

config/rootfiles/oldcore/162/filelists/aarch64/linux

@@ -0,0 +1 @@
+../../../../common/aarch64/linux

config/rootfiles/oldcore/162/filelists/aarch64/linux-initrd

@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd

config/rootfiles/oldcore/162/filelists/aarch64/rpi-firmware

@@ -0,0 +1 @@
+../../../../common/aarch64/rpi-firmware

config/rootfiles/oldcore/162/filelists/armv6l/linux

@@ -0,0 +1 @@
+../../../../common/armv6l/linux

config/rootfiles/oldcore/162/filelists/armv6l/linux-initrd

@@ -0,0 +1 @@
+../../../../common/armv6l/linux-initrd

config/rootfiles/oldcore/162/filelists/armv6l/rpi-firmware

@@ -0,0 +1 @@
+../../../../common/armv6l/rpi-firmware

config/rootfiles/oldcore/162/filelists/bind

@@ -0,0 +1 @@
+../../../common/bind

config/rootfiles/oldcore/162/filelists/core-files

@@ -0,0 +1,5 @@
+etc/issue
+etc/os-release
+etc/system-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

config/rootfiles/oldcore/162/filelists/coreutils

@@ -0,0 +1 @@
+../../../common/coreutils

config/rootfiles/oldcore/162/filelists/ddns

@@ -0,0 +1 @@
+../../../common/ddns

config/rootfiles/oldcore/162/filelists/dhcpcd

@@ -0,0 +1 @@
+../../../common/dhcpcd

config/rootfiles/oldcore/162/filelists/files

@@ -0,0 +1,18 @@
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/mountkernfs
+etc/rc.d/init.d/unbound
+etc/sysctl.conf
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+var/ipfire/general-functions.pl
+var/ipfire/header.pl
+var/ipfire/location-functions.pl
+var/ipfire/main/manualpages
+var/ipfire/qos/bin/makeqosscripts.pl

config/rootfiles/oldcore/162/filelists/gawk

@@ -0,0 +1 @@
+../../../common/gawk

config/rootfiles/oldcore/162/filelists/i586/linux

@@ -0,0 +1 @@
+../../../../common/i586/linux

config/rootfiles/oldcore/162/filelists/i586/linux-initrd

@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd

config/rootfiles/oldcore/162/filelists/i586/motd

@@ -0,0 +1 @@
+etc/motd

config/rootfiles/oldcore/162/filelists/jansson

@@ -0,0 +1 @@
+../../../common/jansson

config/rootfiles/oldcore/162/filelists/knot

@@ -0,0 +1 @@
+../../../common/knot

config/rootfiles/oldcore/162/filelists/libffi

@@ -0,0 +1 @@
+../../../common/libffi

config/rootfiles/oldcore/162/filelists/libhtp

@@ -0,0 +1 @@
+../../../common/libhtp

config/rootfiles/oldcore/162/filelists/libloc

@@ -0,0 +1 @@
+../../../common/libloc

config/rootfiles/oldcore/162/filelists/libuv

@@ -0,0 +1 @@
+../../../common/libuv

config/rootfiles/oldcore/162/filelists/libxcrypt

@@ -0,0 +1 @@
+../../../common/libxcrypt

config/rootfiles/oldcore/162/filelists/openssh

@@ -0,0 +1 @@
+../../../common/openssh

config/rootfiles/oldcore/162/filelists/openvpn

@@ -0,0 +1 @@
+../../../common/openvpn

config/rootfiles/oldcore/162/filelists/slang

@@ -0,0 +1 @@
+../../../common/slang

config/rootfiles/oldcore/162/filelists/sshfs

@@ -0,0 +1 @@
+../../../common/sshfs

config/rootfiles/oldcore/162/filelists/suricata

@@ -0,0 +1 @@
+../../../common/suricata

config/rootfiles/oldcore/162/filelists/unbound

@@ -0,0 +1 @@
+../../../common/unbound

config/rootfiles/oldcore/162/filelists/whois

@@ -0,0 +1 @@
+../../../common/whois

config/rootfiles/oldcore/162/filelists/x86_64/linux

@@ -0,0 +1 @@
+../../../../common/x86_64/linux

config/rootfiles/oldcore/162/filelists/x86_64/linux-initrd

@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd

config/rootfiles/oldcore/162/filelists/xtables-addons

@@ -0,0 +1 @@
+../../../common/xtables-addons

config/rootfiles/oldcore/162/update.sh

@@ -0,0 +1,160 @@
+#!/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) 2021 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=162
+
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# force fsck at next boot, this may fix free space on xfs
+	touch /forcefsck
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+	cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+	*-ipfire*)
+		# Ok.
+		;;
+	*)
+		exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+		;;
+esac
+if [ -e /boot/grub/grub.conf ]; then
+	exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1
+fi
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+	exit_with_error "ERROR cannot update because not enough free space on root." 2
+	exit 2
+fi
+
+# Remove the old kernel
+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-*
+rm -rf /boot/zImage-*
+rm -rf /boot/uInit-*
+rm -rf /boot/dtb-*
+rm -rf /lib/modules
+
+# Remove files
+rm -rf \
+	/etc/jwhois.conf \
+	/usr/bin/jwhois \
+	/usr/bin/whois
+
+# Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+
+# Extract files
+extract_files
+
+# Fix permissions just in case they broke again
+chmod -v 755 \
+	/usr \
+	/usr/bin \
+	/usr/lib \
+	/usr/sbin \
+	/var \
+	/var/ipfire
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Start services
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/sshd restart
+/etc/init.d/suricata restart
+/etc/init.d/unbound restart
+
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# 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
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Install updated grub
+/usr/bin/install-bootloader
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
+# Stop services