From: Michael Tremer Date: Thu, 18 Sep 2025 15:54:49 +0000 (+0000) Subject: Start Core Update 199 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ac20c9fb638a1fc4d21fab55d08e1cdce9e8adc;p=ipfire-2.x.git Start Core Update 199 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/198/exclude b/config/rootfiles/core/199/exclude similarity index 100% rename from config/rootfiles/core/198/exclude rename to config/rootfiles/core/199/exclude diff --git a/config/rootfiles/core/198/filelists/core-files b/config/rootfiles/core/199/filelists/core-files similarity index 100% rename from config/rootfiles/core/198/filelists/core-files rename to config/rootfiles/core/199/filelists/core-files diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh new file mode 100644 index 000000000..5f1ecaca1 --- /dev/null +++ b/config/rootfiles/core/199/update.sh @@ -0,0 +1,70 @@ +#!/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) 2025 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=199 + +# 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 + +# Remove files + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply SSH configuration +/usr/local/bin/sshctrl + +# Start services + +# 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 + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/198/exclude b/config/rootfiles/oldcore/198/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/198/exclude @@ -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/core/198/filelists/aarch64/binutils b/config/rootfiles/oldcore/198/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/198/filelists/aarch64/binutils rename to config/rootfiles/oldcore/198/filelists/aarch64/binutils diff --git a/config/rootfiles/core/198/filelists/aarch64/gcc b/config/rootfiles/oldcore/198/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/198/filelists/aarch64/gcc rename to config/rootfiles/oldcore/198/filelists/aarch64/gcc diff --git a/config/rootfiles/core/198/filelists/aarch64/glibc b/config/rootfiles/oldcore/198/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/198/filelists/aarch64/glibc rename to config/rootfiles/oldcore/198/filelists/aarch64/glibc diff --git a/config/rootfiles/core/198/filelists/aarch64/grub b/config/rootfiles/oldcore/198/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/198/filelists/aarch64/grub rename to config/rootfiles/oldcore/198/filelists/aarch64/grub diff --git a/config/rootfiles/core/198/filelists/aarch64/vectorscan b/config/rootfiles/oldcore/198/filelists/aarch64/vectorscan similarity index 100% rename from config/rootfiles/core/198/filelists/aarch64/vectorscan rename to config/rootfiles/oldcore/198/filelists/aarch64/vectorscan diff --git a/config/rootfiles/core/198/filelists/abseil-cpp b/config/rootfiles/oldcore/198/filelists/abseil-cpp similarity index 100% rename from config/rootfiles/core/198/filelists/abseil-cpp rename to config/rootfiles/oldcore/198/filelists/abseil-cpp diff --git a/config/rootfiles/core/198/filelists/bind b/config/rootfiles/oldcore/198/filelists/bind similarity index 100% rename from config/rootfiles/core/198/filelists/bind rename to config/rootfiles/oldcore/198/filelists/bind diff --git a/config/rootfiles/core/198/filelists/btrfs-progs b/config/rootfiles/oldcore/198/filelists/btrfs-progs similarity index 100% rename from config/rootfiles/core/198/filelists/btrfs-progs rename to config/rootfiles/oldcore/198/filelists/btrfs-progs diff --git a/config/rootfiles/core/198/filelists/cmake b/config/rootfiles/oldcore/198/filelists/cmake similarity index 100% rename from config/rootfiles/core/198/filelists/cmake rename to config/rootfiles/oldcore/198/filelists/cmake diff --git a/config/rootfiles/core/198/filelists/collectd b/config/rootfiles/oldcore/198/filelists/collectd similarity index 100% rename from config/rootfiles/core/198/filelists/collectd rename to config/rootfiles/oldcore/198/filelists/collectd diff --git a/config/rootfiles/oldcore/198/filelists/core-files b/config/rootfiles/oldcore/198/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/198/filelists/core-files @@ -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/config/rootfiles/core/198/filelists/curl b/config/rootfiles/oldcore/198/filelists/curl similarity index 100% rename from config/rootfiles/core/198/filelists/curl rename to config/rootfiles/oldcore/198/filelists/curl diff --git a/config/rootfiles/core/198/filelists/dtc b/config/rootfiles/oldcore/198/filelists/dtc similarity index 100% rename from config/rootfiles/core/198/filelists/dtc rename to config/rootfiles/oldcore/198/filelists/dtc diff --git a/config/rootfiles/core/198/filelists/ed b/config/rootfiles/oldcore/198/filelists/ed similarity index 100% rename from config/rootfiles/core/198/filelists/ed rename to config/rootfiles/oldcore/198/filelists/ed diff --git a/config/rootfiles/core/198/filelists/elinks b/config/rootfiles/oldcore/198/filelists/elinks similarity index 100% rename from config/rootfiles/core/198/filelists/elinks rename to config/rootfiles/oldcore/198/filelists/elinks diff --git a/config/rootfiles/core/198/filelists/ethtool b/config/rootfiles/oldcore/198/filelists/ethtool similarity index 100% rename from config/rootfiles/core/198/filelists/ethtool rename to config/rootfiles/oldcore/198/filelists/ethtool diff --git a/config/rootfiles/core/198/filelists/expat b/config/rootfiles/oldcore/198/filelists/expat similarity index 100% rename from config/rootfiles/core/198/filelists/expat rename to config/rootfiles/oldcore/198/filelists/expat diff --git a/config/rootfiles/core/198/filelists/fcron b/config/rootfiles/oldcore/198/filelists/fcron similarity index 100% rename from config/rootfiles/core/198/filelists/fcron rename to config/rootfiles/oldcore/198/filelists/fcron diff --git a/config/rootfiles/core/198/filelists/files b/config/rootfiles/oldcore/198/filelists/files similarity index 100% rename from config/rootfiles/core/198/filelists/files rename to config/rootfiles/oldcore/198/filelists/files diff --git a/config/rootfiles/core/198/filelists/fireinfo b/config/rootfiles/oldcore/198/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/198/filelists/fireinfo rename to config/rootfiles/oldcore/198/filelists/fireinfo diff --git a/config/rootfiles/core/198/filelists/freetype b/config/rootfiles/oldcore/198/filelists/freetype similarity index 100% rename from config/rootfiles/core/198/filelists/freetype rename to config/rootfiles/oldcore/198/filelists/freetype diff --git a/config/rootfiles/core/198/filelists/gdbm b/config/rootfiles/oldcore/198/filelists/gdbm similarity index 100% rename from config/rootfiles/core/198/filelists/gdbm rename to config/rootfiles/oldcore/198/filelists/gdbm diff --git a/config/rootfiles/core/198/filelists/gmp b/config/rootfiles/oldcore/198/filelists/gmp similarity index 100% rename from config/rootfiles/core/198/filelists/gmp rename to config/rootfiles/oldcore/198/filelists/gmp diff --git a/config/rootfiles/core/198/filelists/harfbuzz b/config/rootfiles/oldcore/198/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/198/filelists/harfbuzz rename to config/rootfiles/oldcore/198/filelists/harfbuzz diff --git a/config/rootfiles/core/198/filelists/hwdata b/config/rootfiles/oldcore/198/filelists/hwdata similarity index 100% rename from config/rootfiles/core/198/filelists/hwdata rename to config/rootfiles/oldcore/198/filelists/hwdata diff --git a/config/rootfiles/core/198/filelists/iproute2 b/config/rootfiles/oldcore/198/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/198/filelists/iproute2 rename to config/rootfiles/oldcore/198/filelists/iproute2 diff --git a/config/rootfiles/core/198/filelists/less b/config/rootfiles/oldcore/198/filelists/less similarity index 100% rename from config/rootfiles/core/198/filelists/less rename to config/rootfiles/oldcore/198/filelists/less diff --git a/config/rootfiles/core/198/filelists/libarchive b/config/rootfiles/oldcore/198/filelists/libarchive similarity index 100% rename from config/rootfiles/core/198/filelists/libarchive rename to config/rootfiles/oldcore/198/filelists/libarchive diff --git a/config/rootfiles/core/198/filelists/libconfig b/config/rootfiles/oldcore/198/filelists/libconfig similarity index 100% rename from config/rootfiles/core/198/filelists/libconfig rename to config/rootfiles/oldcore/198/filelists/libconfig diff --git a/config/rootfiles/core/198/filelists/libffi b/config/rootfiles/oldcore/198/filelists/libffi similarity index 100% rename from config/rootfiles/core/198/filelists/libffi rename to config/rootfiles/oldcore/198/filelists/libffi diff --git a/config/rootfiles/core/198/filelists/libgcrypt b/config/rootfiles/oldcore/198/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/198/filelists/libgcrypt rename to config/rootfiles/oldcore/198/filelists/libgcrypt diff --git a/config/rootfiles/core/198/filelists/libinih b/config/rootfiles/oldcore/198/filelists/libinih similarity index 100% rename from config/rootfiles/core/198/filelists/libinih rename to config/rootfiles/oldcore/198/filelists/libinih diff --git a/config/rootfiles/core/198/filelists/libmpc b/config/rootfiles/oldcore/198/filelists/libmpc similarity index 100% rename from config/rootfiles/core/198/filelists/libmpc rename to config/rootfiles/oldcore/198/filelists/libmpc diff --git a/config/rootfiles/core/198/filelists/libssh b/config/rootfiles/oldcore/198/filelists/libssh similarity index 100% rename from config/rootfiles/core/198/filelists/libssh rename to config/rootfiles/oldcore/198/filelists/libssh diff --git a/config/rootfiles/core/198/filelists/libtirpc b/config/rootfiles/oldcore/198/filelists/libtirpc similarity index 100% rename from config/rootfiles/core/198/filelists/libtirpc rename to config/rootfiles/oldcore/198/filelists/libtirpc diff --git a/config/rootfiles/core/198/filelists/libxml2 b/config/rootfiles/oldcore/198/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/198/filelists/libxml2 rename to config/rootfiles/oldcore/198/filelists/libxml2 diff --git a/config/rootfiles/core/198/filelists/lsof b/config/rootfiles/oldcore/198/filelists/lsof similarity index 100% rename from config/rootfiles/core/198/filelists/lsof rename to config/rootfiles/oldcore/198/filelists/lsof diff --git a/config/rootfiles/core/198/filelists/lvm2 b/config/rootfiles/oldcore/198/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/198/filelists/lvm2 rename to config/rootfiles/oldcore/198/filelists/lvm2 diff --git a/config/rootfiles/core/198/filelists/lzip b/config/rootfiles/oldcore/198/filelists/lzip similarity index 100% rename from config/rootfiles/core/198/filelists/lzip rename to config/rootfiles/oldcore/198/filelists/lzip diff --git a/config/rootfiles/core/198/filelists/meson b/config/rootfiles/oldcore/198/filelists/meson similarity index 100% rename from config/rootfiles/core/198/filelists/meson rename to config/rootfiles/oldcore/198/filelists/meson diff --git a/config/rootfiles/core/198/filelists/mpfr b/config/rootfiles/oldcore/198/filelists/mpfr similarity index 100% rename from config/rootfiles/core/198/filelists/mpfr rename to config/rootfiles/oldcore/198/filelists/mpfr diff --git a/config/rootfiles/core/198/filelists/nano b/config/rootfiles/oldcore/198/filelists/nano similarity index 100% rename from config/rootfiles/core/198/filelists/nano rename to config/rootfiles/oldcore/198/filelists/nano diff --git a/config/rootfiles/core/198/filelists/openssh b/config/rootfiles/oldcore/198/filelists/openssh similarity index 100% rename from config/rootfiles/core/198/filelists/openssh rename to config/rootfiles/oldcore/198/filelists/openssh diff --git a/config/rootfiles/core/198/filelists/openssl b/config/rootfiles/oldcore/198/filelists/openssl similarity index 100% rename from config/rootfiles/core/198/filelists/openssl rename to config/rootfiles/oldcore/198/filelists/openssl diff --git a/config/rootfiles/core/198/filelists/p11-kit b/config/rootfiles/oldcore/198/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/198/filelists/p11-kit rename to config/rootfiles/oldcore/198/filelists/p11-kit diff --git a/config/rootfiles/core/198/filelists/pcre2 b/config/rootfiles/oldcore/198/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/198/filelists/pcre2 rename to config/rootfiles/oldcore/198/filelists/pcre2 diff --git a/config/rootfiles/core/198/filelists/prompt b/config/rootfiles/oldcore/198/filelists/prompt similarity index 100% rename from config/rootfiles/core/198/filelists/prompt rename to config/rootfiles/oldcore/198/filelists/prompt diff --git a/config/rootfiles/core/198/filelists/python3-MarkupSafe b/config/rootfiles/oldcore/198/filelists/python3-MarkupSafe similarity index 100% rename from config/rootfiles/core/198/filelists/python3-MarkupSafe rename to config/rootfiles/oldcore/198/filelists/python3-MarkupSafe diff --git a/config/rootfiles/core/198/filelists/python3-more_itertools b/config/rootfiles/oldcore/198/filelists/python3-more_itertools similarity index 100% rename from config/rootfiles/core/198/filelists/python3-more_itertools rename to config/rootfiles/oldcore/198/filelists/python3-more_itertools diff --git a/config/rootfiles/core/198/filelists/python3-pillow b/config/rootfiles/oldcore/198/filelists/python3-pillow similarity index 100% rename from config/rootfiles/core/198/filelists/python3-pillow rename to config/rootfiles/oldcore/198/filelists/python3-pillow diff --git a/config/rootfiles/core/198/filelists/python3-reportlab b/config/rootfiles/oldcore/198/filelists/python3-reportlab similarity index 100% rename from config/rootfiles/core/198/filelists/python3-reportlab rename to config/rootfiles/oldcore/198/filelists/python3-reportlab diff --git a/config/rootfiles/core/198/filelists/python3-setuptools b/config/rootfiles/oldcore/198/filelists/python3-setuptools similarity index 100% rename from config/rootfiles/core/198/filelists/python3-setuptools rename to config/rootfiles/oldcore/198/filelists/python3-setuptools diff --git a/config/rootfiles/core/198/filelists/python3-wheel b/config/rootfiles/oldcore/198/filelists/python3-wheel similarity index 100% rename from config/rootfiles/core/198/filelists/python3-wheel rename to config/rootfiles/oldcore/198/filelists/python3-wheel diff --git a/config/rootfiles/core/198/filelists/riscv64/binutils b/config/rootfiles/oldcore/198/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/198/filelists/riscv64/binutils rename to config/rootfiles/oldcore/198/filelists/riscv64/binutils diff --git a/config/rootfiles/core/198/filelists/riscv64/gcc b/config/rootfiles/oldcore/198/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/198/filelists/riscv64/gcc rename to config/rootfiles/oldcore/198/filelists/riscv64/gcc diff --git a/config/rootfiles/core/198/filelists/riscv64/glibc b/config/rootfiles/oldcore/198/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/198/filelists/riscv64/glibc rename to config/rootfiles/oldcore/198/filelists/riscv64/glibc diff --git a/config/rootfiles/core/198/filelists/riscv64/grub b/config/rootfiles/oldcore/198/filelists/riscv64/grub similarity index 100% rename from config/rootfiles/core/198/filelists/riscv64/grub rename to config/rootfiles/oldcore/198/filelists/riscv64/grub diff --git a/config/rootfiles/core/198/filelists/ruby b/config/rootfiles/oldcore/198/filelists/ruby similarity index 100% rename from config/rootfiles/core/198/filelists/ruby rename to config/rootfiles/oldcore/198/filelists/ruby diff --git a/config/rootfiles/core/198/filelists/sqlite b/config/rootfiles/oldcore/198/filelists/sqlite similarity index 100% rename from config/rootfiles/core/198/filelists/sqlite rename to config/rootfiles/oldcore/198/filelists/sqlite diff --git a/config/rootfiles/core/198/filelists/sudo b/config/rootfiles/oldcore/198/filelists/sudo similarity index 100% rename from config/rootfiles/core/198/filelists/sudo rename to config/rootfiles/oldcore/198/filelists/sudo diff --git a/config/rootfiles/core/198/filelists/suricata b/config/rootfiles/oldcore/198/filelists/suricata similarity index 100% rename from config/rootfiles/core/198/filelists/suricata rename to config/rootfiles/oldcore/198/filelists/suricata diff --git a/config/rootfiles/core/198/filelists/suricata-reporter b/config/rootfiles/oldcore/198/filelists/suricata-reporter similarity index 100% rename from config/rootfiles/core/198/filelists/suricata-reporter rename to config/rootfiles/oldcore/198/filelists/suricata-reporter diff --git a/config/rootfiles/core/198/filelists/web-user-interface b/config/rootfiles/oldcore/198/filelists/web-user-interface similarity index 100% rename from config/rootfiles/core/198/filelists/web-user-interface rename to config/rootfiles/oldcore/198/filelists/web-user-interface diff --git a/config/rootfiles/core/198/filelists/whois b/config/rootfiles/oldcore/198/filelists/whois similarity index 100% rename from config/rootfiles/core/198/filelists/whois rename to config/rootfiles/oldcore/198/filelists/whois diff --git a/config/rootfiles/core/198/filelists/x86_64/binutils b/config/rootfiles/oldcore/198/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/binutils rename to config/rootfiles/oldcore/198/filelists/x86_64/binutils diff --git a/config/rootfiles/core/198/filelists/x86_64/gcc b/config/rootfiles/oldcore/198/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/gcc rename to config/rootfiles/oldcore/198/filelists/x86_64/gcc diff --git a/config/rootfiles/core/198/filelists/x86_64/glibc b/config/rootfiles/oldcore/198/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/glibc rename to config/rootfiles/oldcore/198/filelists/x86_64/glibc diff --git a/config/rootfiles/core/198/filelists/x86_64/grub b/config/rootfiles/oldcore/198/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/grub rename to config/rootfiles/oldcore/198/filelists/x86_64/grub diff --git a/config/rootfiles/core/198/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/198/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/198/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/198/filelists/x86_64/vectorscan b/config/rootfiles/oldcore/198/filelists/x86_64/vectorscan similarity index 100% rename from config/rootfiles/core/198/filelists/x86_64/vectorscan rename to config/rootfiles/oldcore/198/filelists/x86_64/vectorscan diff --git a/config/rootfiles/core/198/filelists/xfsprogs b/config/rootfiles/oldcore/198/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/198/filelists/xfsprogs rename to config/rootfiles/oldcore/198/filelists/xfsprogs diff --git a/config/rootfiles/core/198/filelists/zlib-ng b/config/rootfiles/oldcore/198/filelists/zlib-ng similarity index 100% rename from config/rootfiles/core/198/filelists/zlib-ng rename to config/rootfiles/oldcore/198/filelists/zlib-ng diff --git a/config/rootfiles/core/198/update.sh b/config/rootfiles/oldcore/198/update.sh similarity index 100% rename from config/rootfiles/core/198/update.sh rename to config/rootfiles/oldcore/198/update.sh diff --git a/make.sh b/make.sh index e841f5b4e..748242516 100755 --- 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="198" # Core Level (Filename) +CORE="199" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir