]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core186: start update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Mar 2024 05:39:34 +0000 (06:39 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Mar 2024 05:39:34 +0000 (06:39 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
55 files changed:
config/rootfiles/core/186/exclude [moved from config/rootfiles/core/185/exclude with 100% similarity]
config/rootfiles/core/186/filelists/aarch64/linux [new symlink]
config/rootfiles/core/186/filelists/core-files [moved from config/rootfiles/core/185/filelists/core-files with 100% similarity]
config/rootfiles/core/186/filelists/files [new file with mode: 0644]
config/rootfiles/core/186/filelists/riscv64/linux [new symlink]
config/rootfiles/core/186/filelists/x86_64/linux [new symlink]
config/rootfiles/core/186/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/185/exclude [new file with mode: 0644]
config/rootfiles/oldcore/185/filelists/aarch64/binutils [moved from config/rootfiles/core/185/filelists/aarch64/binutils with 100% similarity]
config/rootfiles/oldcore/185/filelists/aarch64/glibc [moved from config/rootfiles/core/185/filelists/aarch64/glibc with 100% similarity]
config/rootfiles/oldcore/185/filelists/aarch64/util-linux [moved from config/rootfiles/core/185/filelists/aarch64/util-linux with 100% similarity]
config/rootfiles/oldcore/185/filelists/arping [moved from config/rootfiles/core/185/filelists/arping with 100% similarity]
config/rootfiles/oldcore/185/filelists/bind [moved from config/rootfiles/core/185/filelists/bind with 100% similarity]
config/rootfiles/oldcore/185/filelists/ca-certificates [moved from config/rootfiles/core/185/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/185/filelists/core-files [new file with mode: 0644]
config/rootfiles/oldcore/185/filelists/elfutils [moved from config/rootfiles/core/185/filelists/elfutils with 100% similarity]
config/rootfiles/oldcore/185/filelists/ethtool [moved from config/rootfiles/core/185/filelists/ethtool with 100% similarity]
config/rootfiles/oldcore/185/filelists/expat [moved from config/rootfiles/core/185/filelists/expat with 100% similarity]
config/rootfiles/oldcore/185/filelists/files [moved from config/rootfiles/core/185/filelists/files with 100% similarity]
config/rootfiles/oldcore/185/filelists/iproute2 [moved from config/rootfiles/core/185/filelists/iproute2 with 100% similarity]
config/rootfiles/oldcore/185/filelists/iputils [moved from config/rootfiles/core/185/filelists/iputils with 100% similarity]
config/rootfiles/oldcore/185/filelists/knot [moved from config/rootfiles/core/185/filelists/knot with 100% similarity]
config/rootfiles/oldcore/185/filelists/libcap [moved from config/rootfiles/core/185/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/185/filelists/libffi [moved from config/rootfiles/core/185/filelists/libffi with 100% similarity]
config/rootfiles/oldcore/185/filelists/libgpg-error [moved from config/rootfiles/core/185/filelists/libgpg-error with 100% similarity]
config/rootfiles/oldcore/185/filelists/libhtp [moved from config/rootfiles/core/185/filelists/libhtp with 100% similarity]
config/rootfiles/oldcore/185/filelists/libpng [moved from config/rootfiles/core/185/filelists/libpng with 100% similarity]
config/rootfiles/oldcore/185/filelists/newt [moved from config/rootfiles/core/185/filelists/newt with 100% similarity]
config/rootfiles/oldcore/185/filelists/ntp [moved from config/rootfiles/core/185/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/185/filelists/openjpeg [moved from config/rootfiles/core/185/filelists/openjpeg with 100% similarity]
config/rootfiles/oldcore/185/filelists/openssh [moved from config/rootfiles/core/185/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/185/filelists/pango [moved from config/rootfiles/core/185/filelists/pango with 100% similarity]
config/rootfiles/oldcore/185/filelists/pciutils [moved from config/rootfiles/core/185/filelists/pciutils with 100% similarity]
config/rootfiles/oldcore/185/filelists/pixman [moved from config/rootfiles/core/185/filelists/pixman with 100% similarity]
config/rootfiles/oldcore/185/filelists/poppler [moved from config/rootfiles/core/185/filelists/poppler with 100% similarity]
config/rootfiles/oldcore/185/filelists/ppp [moved from config/rootfiles/core/185/filelists/ppp with 100% similarity]
config/rootfiles/oldcore/185/filelists/qpdf [moved from config/rootfiles/core/185/filelists/qpdf with 100% similarity]
config/rootfiles/oldcore/185/filelists/riscv64/binutils [moved from config/rootfiles/core/185/filelists/riscv64/binutils with 100% similarity]
config/rootfiles/oldcore/185/filelists/riscv64/glibc [moved from config/rootfiles/core/185/filelists/riscv64/glibc with 100% similarity]
config/rootfiles/oldcore/185/filelists/riscv64/util-linux [moved from config/rootfiles/core/185/filelists/riscv64/util-linux with 100% similarity]
config/rootfiles/oldcore/185/filelists/shadow [moved from config/rootfiles/core/185/filelists/shadow with 100% similarity]
config/rootfiles/oldcore/185/filelists/sqlite [moved from config/rootfiles/core/185/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/185/filelists/squid [moved from config/rootfiles/core/185/filelists/squid with 100% similarity]
config/rootfiles/oldcore/185/filelists/suricata [moved from config/rootfiles/core/185/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/185/filelists/tcl [moved from config/rootfiles/core/185/filelists/tcl with 100% similarity]
config/rootfiles/oldcore/185/filelists/unbound [moved from config/rootfiles/core/185/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/185/filelists/wget [moved from config/rootfiles/core/185/filelists/wget with 100% similarity]
config/rootfiles/oldcore/185/filelists/whois [moved from config/rootfiles/core/185/filelists/whois with 100% similarity]
config/rootfiles/oldcore/185/filelists/x86_64/binutils [moved from config/rootfiles/core/185/filelists/x86_64/binutils with 100% similarity]
config/rootfiles/oldcore/185/filelists/x86_64/glibc [moved from config/rootfiles/core/185/filelists/x86_64/glibc with 100% similarity]
config/rootfiles/oldcore/185/filelists/x86_64/intel-microcode [moved from config/rootfiles/core/185/filelists/x86_64/intel-microcode with 100% similarity]
config/rootfiles/oldcore/185/filelists/x86_64/util-linux [moved from config/rootfiles/core/185/filelists/x86_64/util-linux with 100% similarity]
config/rootfiles/oldcore/185/filelists/xz [moved from config/rootfiles/core/185/filelists/xz with 100% similarity]
config/rootfiles/oldcore/185/update.sh [moved from config/rootfiles/core/185/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/186/filelists/aarch64/linux b/config/rootfiles/core/186/filelists/aarch64/linux
new file mode 120000 (symlink)
index 0000000..3a2532b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files
new file mode 100644 (file)
index 0000000..00198bc
--- /dev/null
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/vulnerabilities.cgi
diff --git a/config/rootfiles/core/186/filelists/riscv64/linux b/config/rootfiles/core/186/filelists/riscv64/linux
new file mode 120000 (symlink)
index 0000000..c8e8350
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/riscv64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/186/filelists/x86_64/linux b/config/rootfiles/core/186/filelists/x86_64/linux
new file mode 120000 (symlink)
index 0000000..0615b5b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh
new file mode 100644 (file)
index 0000000..d79a351
--- /dev/null
@@ -0,0 +1,141 @@
+#!/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) 2024 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=186
+
+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
+
+# Stop services
+
+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 prior to the kernel update
+case $(uname -r) in
+    *-ipfire*)
+       # Ok.
+       ;;
+    *)
+       exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+       ;;
+esac
+
+# Check diskspace on root and size of boot
+ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 )
+if [ $ROOTSPACE -lt 200000 ]; then
+    exit_with_error "ERROR cannot update because not enough free space on root." 2
+fi
+BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 )
+if [ $BOOTSIZE -lt 100000 ]; then
+    exit_with_error "ERROR cannot update. BOOT partition is to small." 3
+fi
+
+# Remove the old kernel
+rm -rvf \
+       /boot/System.map-* \
+       /boot/config-* \
+       /boot/ipfirerd-* \
+       /boot/initramfs-* \
+       /boot/vmlinuz-* \
+       /boot/uImage-* \
+       /boot/zImage-* \
+       /boot/uInit-* \
+       /boot/dtb-* \
+       /lib/modules
+
+# Extract files
+extract_files
+
+# Remove files
+#rm -rvf \
+#      /XXX
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# Build initial ramdisks
+dracut --regenerate-all --force
+KVER="xxxKVERxxx"
+case "$(uname -m)" in
+       aarch64)
+               mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+               # dont remove initramfs because grub need this to boot.
+               ;;
+esac
+
+# Upadate Kernel version in 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
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       /usr/bin/install-bootloader
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/185/exclude b/config/rootfiles/oldcore/185/exclude
new file mode 100644 (file)
index 0000000..8ee1c3c
--- /dev/null
@@ -0,0 +1,35 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+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
+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/lib/location/ipset
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/185/filelists/core-files b/config/rootfiles/oldcore/185/filelists/core-files
new file mode 100644 (file)
index 0000000..0dec37e
--- /dev/null
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/make.sh b/make.sh
index 64dbef5c4bfc06846e391ce2141d25243bfa9ee6..1006383bf19cbfc8bb60b3202849fc0835169fd3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -23,7 +23,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.29"                                                 # Version number
-CORE="185"                                                     # Core Level (Filename)
+CORE="186"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop