From: Michael Tremer Date: Thu, 3 Jul 2025 14:56:15 +0000 (+0000) Subject: Start Core Update 197 X-Git-Tag: v2.29-core197~25^2~264 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=117570ace6dfcb49a6ea4b9418567a0941e4e7ca;p=ipfire-2.x.git Start Core Update 197 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/196/exclude b/config/rootfiles/core/197/exclude similarity index 100% rename from config/rootfiles/core/196/exclude rename to config/rootfiles/core/197/exclude diff --git a/config/rootfiles/core/196/filelists/core-files b/config/rootfiles/core/197/filelists/core-files similarity index 100% rename from config/rootfiles/core/196/filelists/core-files rename to config/rootfiles/core/197/filelists/core-files diff --git a/config/rootfiles/core/197/filelists/files b/config/rootfiles/core/197/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh new file mode 100644 index 000000000..c4a11a276 --- /dev/null +++ b/config/rootfiles/core/197/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=197 + +# 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 + +# Increment ipsec serial file if x509 certificates present and no content in index.txt + +# Apply SSH configuration +/usr/local/bin/sshctrl + +# 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/196/exclude b/config/rootfiles/oldcore/196/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/196/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/196/filelists/aarch64/boost b/config/rootfiles/oldcore/196/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/196/filelists/aarch64/boost rename to config/rootfiles/oldcore/196/filelists/aarch64/boost diff --git a/config/rootfiles/core/196/filelists/aarch64/gcc b/config/rootfiles/oldcore/196/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/196/filelists/aarch64/gcc rename to config/rootfiles/oldcore/196/filelists/aarch64/gcc diff --git a/config/rootfiles/core/196/filelists/aarch64/linux b/config/rootfiles/oldcore/196/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/196/filelists/aarch64/linux rename to config/rootfiles/oldcore/196/filelists/aarch64/linux diff --git a/config/rootfiles/core/196/filelists/apr b/config/rootfiles/oldcore/196/filelists/apr similarity index 100% rename from config/rootfiles/core/196/filelists/apr rename to config/rootfiles/oldcore/196/filelists/apr diff --git a/config/rootfiles/core/196/filelists/bc b/config/rootfiles/oldcore/196/filelists/bc similarity index 100% rename from config/rootfiles/core/196/filelists/bc rename to config/rootfiles/oldcore/196/filelists/bc diff --git a/config/rootfiles/core/196/filelists/bind b/config/rootfiles/oldcore/196/filelists/bind similarity index 100% rename from config/rootfiles/core/196/filelists/bind rename to config/rootfiles/oldcore/196/filelists/bind diff --git a/config/rootfiles/core/196/filelists/cmake b/config/rootfiles/oldcore/196/filelists/cmake similarity index 100% rename from config/rootfiles/core/196/filelists/cmake rename to config/rootfiles/oldcore/196/filelists/cmake diff --git a/config/rootfiles/core/196/filelists/collectd b/config/rootfiles/oldcore/196/filelists/collectd similarity index 100% rename from config/rootfiles/core/196/filelists/collectd rename to config/rootfiles/oldcore/196/filelists/collectd diff --git a/config/rootfiles/oldcore/196/filelists/core-files b/config/rootfiles/oldcore/196/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/196/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/196/filelists/curl b/config/rootfiles/oldcore/196/filelists/curl similarity index 100% rename from config/rootfiles/core/196/filelists/curl rename to config/rootfiles/oldcore/196/filelists/curl diff --git a/config/rootfiles/core/196/filelists/dhcpcd b/config/rootfiles/oldcore/196/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/196/filelists/dhcpcd rename to config/rootfiles/oldcore/196/filelists/dhcpcd diff --git a/config/rootfiles/core/196/filelists/dracut b/config/rootfiles/oldcore/196/filelists/dracut similarity index 100% rename from config/rootfiles/core/196/filelists/dracut rename to config/rootfiles/oldcore/196/filelists/dracut diff --git a/config/rootfiles/core/196/filelists/elfutils b/config/rootfiles/oldcore/196/filelists/elfutils similarity index 100% rename from config/rootfiles/core/196/filelists/elfutils rename to config/rootfiles/oldcore/196/filelists/elfutils diff --git a/config/rootfiles/core/196/filelists/exfatprogs b/config/rootfiles/oldcore/196/filelists/exfatprogs similarity index 100% rename from config/rootfiles/core/196/filelists/exfatprogs rename to config/rootfiles/oldcore/196/filelists/exfatprogs diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/oldcore/196/filelists/files similarity index 100% rename from config/rootfiles/core/196/filelists/files rename to config/rootfiles/oldcore/196/filelists/files diff --git a/config/rootfiles/core/196/filelists/gperf b/config/rootfiles/oldcore/196/filelists/gperf similarity index 100% rename from config/rootfiles/core/196/filelists/gperf rename to config/rootfiles/oldcore/196/filelists/gperf diff --git a/config/rootfiles/core/196/filelists/harfbuzz b/config/rootfiles/oldcore/196/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/196/filelists/harfbuzz rename to config/rootfiles/oldcore/196/filelists/harfbuzz diff --git a/config/rootfiles/core/196/filelists/hwdata b/config/rootfiles/oldcore/196/filelists/hwdata similarity index 100% rename from config/rootfiles/core/196/filelists/hwdata rename to config/rootfiles/oldcore/196/filelists/hwdata diff --git a/config/rootfiles/core/196/filelists/iana-etc b/config/rootfiles/oldcore/196/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/196/filelists/iana-etc rename to config/rootfiles/oldcore/196/filelists/iana-etc diff --git a/config/rootfiles/core/196/filelists/iproute2 b/config/rootfiles/oldcore/196/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/196/filelists/iproute2 rename to config/rootfiles/oldcore/196/filelists/iproute2 diff --git a/config/rootfiles/core/196/filelists/iputils b/config/rootfiles/oldcore/196/filelists/iputils similarity index 100% rename from config/rootfiles/core/196/filelists/iputils rename to config/rootfiles/oldcore/196/filelists/iputils diff --git a/config/rootfiles/core/196/filelists/json-c b/config/rootfiles/oldcore/196/filelists/json-c similarity index 100% rename from config/rootfiles/core/196/filelists/json-c rename to config/rootfiles/oldcore/196/filelists/json-c diff --git a/config/rootfiles/core/196/filelists/kbd b/config/rootfiles/oldcore/196/filelists/kbd similarity index 100% rename from config/rootfiles/core/196/filelists/kbd rename to config/rootfiles/oldcore/196/filelists/kbd diff --git a/config/rootfiles/core/196/filelists/less b/config/rootfiles/oldcore/196/filelists/less similarity index 100% rename from config/rootfiles/core/196/filelists/less rename to config/rootfiles/oldcore/196/filelists/less diff --git a/config/rootfiles/core/196/filelists/libarchive b/config/rootfiles/oldcore/196/filelists/libarchive similarity index 100% rename from config/rootfiles/core/196/filelists/libarchive rename to config/rootfiles/oldcore/196/filelists/libarchive diff --git a/config/rootfiles/core/196/filelists/libconfig b/config/rootfiles/oldcore/196/filelists/libconfig similarity index 100% rename from config/rootfiles/core/196/filelists/libconfig rename to config/rootfiles/oldcore/196/filelists/libconfig diff --git a/config/rootfiles/core/196/filelists/libffi b/config/rootfiles/oldcore/196/filelists/libffi similarity index 100% rename from config/rootfiles/core/196/filelists/libffi rename to config/rootfiles/oldcore/196/filelists/libffi diff --git a/config/rootfiles/core/196/filelists/libgcrypt b/config/rootfiles/oldcore/196/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/196/filelists/libgcrypt rename to config/rootfiles/oldcore/196/filelists/libgcrypt diff --git a/config/rootfiles/core/196/filelists/libloc b/config/rootfiles/oldcore/196/filelists/libloc similarity index 100% rename from config/rootfiles/core/196/filelists/libloc rename to config/rootfiles/oldcore/196/filelists/libloc diff --git a/config/rootfiles/core/196/filelists/libpng b/config/rootfiles/oldcore/196/filelists/libpng similarity index 100% rename from config/rootfiles/core/196/filelists/libpng rename to config/rootfiles/oldcore/196/filelists/libpng diff --git a/config/rootfiles/core/196/filelists/libssh b/config/rootfiles/oldcore/196/filelists/libssh similarity index 100% rename from config/rootfiles/core/196/filelists/libssh rename to config/rootfiles/oldcore/196/filelists/libssh diff --git a/config/rootfiles/core/196/filelists/libusb b/config/rootfiles/oldcore/196/filelists/libusb similarity index 100% rename from config/rootfiles/core/196/filelists/libusb rename to config/rootfiles/oldcore/196/filelists/libusb diff --git a/config/rootfiles/core/196/filelists/libxml2 b/config/rootfiles/oldcore/196/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/196/filelists/libxml2 rename to config/rootfiles/oldcore/196/filelists/libxml2 diff --git a/config/rootfiles/core/196/filelists/lvm2 b/config/rootfiles/oldcore/196/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/196/filelists/lvm2 rename to config/rootfiles/oldcore/196/filelists/lvm2 diff --git a/config/rootfiles/core/196/filelists/m4 b/config/rootfiles/oldcore/196/filelists/m4 similarity index 100% rename from config/rootfiles/core/196/filelists/m4 rename to config/rootfiles/oldcore/196/filelists/m4 diff --git a/config/rootfiles/core/196/filelists/man b/config/rootfiles/oldcore/196/filelists/man similarity index 100% rename from config/rootfiles/core/196/filelists/man rename to config/rootfiles/oldcore/196/filelists/man diff --git a/config/rootfiles/core/196/filelists/man-pages b/config/rootfiles/oldcore/196/filelists/man-pages similarity index 100% rename from config/rootfiles/core/196/filelists/man-pages rename to config/rootfiles/oldcore/196/filelists/man-pages diff --git a/config/rootfiles/core/196/filelists/meson b/config/rootfiles/oldcore/196/filelists/meson similarity index 100% rename from config/rootfiles/core/196/filelists/meson rename to config/rootfiles/oldcore/196/filelists/meson diff --git a/config/rootfiles/core/196/filelists/openssl b/config/rootfiles/oldcore/196/filelists/openssl similarity index 100% rename from config/rootfiles/core/196/filelists/openssl rename to config/rootfiles/oldcore/196/filelists/openssl diff --git a/config/rootfiles/core/196/filelists/pakfire b/config/rootfiles/oldcore/196/filelists/pakfire similarity index 100% rename from config/rootfiles/core/196/filelists/pakfire rename to config/rootfiles/oldcore/196/filelists/pakfire diff --git a/config/rootfiles/core/196/filelists/pam b/config/rootfiles/oldcore/196/filelists/pam similarity index 100% rename from config/rootfiles/core/196/filelists/pam rename to config/rootfiles/oldcore/196/filelists/pam diff --git a/config/rootfiles/core/196/filelists/pixman b/config/rootfiles/oldcore/196/filelists/pixman similarity index 100% rename from config/rootfiles/core/196/filelists/pixman rename to config/rootfiles/oldcore/196/filelists/pixman diff --git a/config/rootfiles/core/196/filelists/riscv64/boost b/config/rootfiles/oldcore/196/filelists/riscv64/boost similarity index 100% rename from config/rootfiles/core/196/filelists/riscv64/boost rename to config/rootfiles/oldcore/196/filelists/riscv64/boost diff --git a/config/rootfiles/core/196/filelists/riscv64/gcc b/config/rootfiles/oldcore/196/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/196/filelists/riscv64/gcc rename to config/rootfiles/oldcore/196/filelists/riscv64/gcc diff --git a/config/rootfiles/core/196/filelists/riscv64/linux b/config/rootfiles/oldcore/196/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/196/filelists/riscv64/linux rename to config/rootfiles/oldcore/196/filelists/riscv64/linux diff --git a/config/rootfiles/core/196/filelists/ruby b/config/rootfiles/oldcore/196/filelists/ruby similarity index 100% rename from config/rootfiles/core/196/filelists/ruby rename to config/rootfiles/oldcore/196/filelists/ruby diff --git a/config/rootfiles/core/196/filelists/screen b/config/rootfiles/oldcore/196/filelists/screen similarity index 100% rename from config/rootfiles/core/196/filelists/screen rename to config/rootfiles/oldcore/196/filelists/screen diff --git a/config/rootfiles/core/196/filelists/smartmontools b/config/rootfiles/oldcore/196/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/196/filelists/smartmontools rename to config/rootfiles/oldcore/196/filelists/smartmontools diff --git a/config/rootfiles/core/196/filelists/sqlite b/config/rootfiles/oldcore/196/filelists/sqlite similarity index 100% rename from config/rootfiles/core/196/filelists/sqlite rename to config/rootfiles/oldcore/196/filelists/sqlite diff --git a/config/rootfiles/core/196/filelists/squid b/config/rootfiles/oldcore/196/filelists/squid similarity index 100% rename from config/rootfiles/core/196/filelists/squid rename to config/rootfiles/oldcore/196/filelists/squid diff --git a/config/rootfiles/core/196/filelists/sudo b/config/rootfiles/oldcore/196/filelists/sudo similarity index 100% rename from config/rootfiles/core/196/filelists/sudo rename to config/rootfiles/oldcore/196/filelists/sudo diff --git a/config/rootfiles/core/196/filelists/texinfo b/config/rootfiles/oldcore/196/filelists/texinfo similarity index 100% rename from config/rootfiles/core/196/filelists/texinfo rename to config/rootfiles/oldcore/196/filelists/texinfo diff --git a/config/rootfiles/core/196/filelists/vim b/config/rootfiles/oldcore/196/filelists/vim similarity index 100% rename from config/rootfiles/core/196/filelists/vim rename to config/rootfiles/oldcore/196/filelists/vim diff --git a/config/rootfiles/core/196/filelists/whois b/config/rootfiles/oldcore/196/filelists/whois similarity index 100% rename from config/rootfiles/core/196/filelists/whois rename to config/rootfiles/oldcore/196/filelists/whois diff --git a/config/rootfiles/core/196/filelists/wireguard-tools b/config/rootfiles/oldcore/196/filelists/wireguard-tools similarity index 100% rename from config/rootfiles/core/196/filelists/wireguard-tools rename to config/rootfiles/oldcore/196/filelists/wireguard-tools diff --git a/config/rootfiles/core/196/filelists/x86_64/boost b/config/rootfiles/oldcore/196/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/196/filelists/x86_64/boost rename to config/rootfiles/oldcore/196/filelists/x86_64/boost diff --git a/config/rootfiles/core/196/filelists/x86_64/gcc b/config/rootfiles/oldcore/196/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/196/filelists/x86_64/gcc rename to config/rootfiles/oldcore/196/filelists/x86_64/gcc diff --git a/config/rootfiles/core/196/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/196/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/196/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/196/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/196/filelists/x86_64/linux b/config/rootfiles/oldcore/196/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/196/filelists/x86_64/linux rename to config/rootfiles/oldcore/196/filelists/x86_64/linux diff --git a/config/rootfiles/core/196/filelists/xorriso b/config/rootfiles/oldcore/196/filelists/xorriso similarity index 100% rename from config/rootfiles/core/196/filelists/xorriso rename to config/rootfiles/oldcore/196/filelists/xorriso diff --git a/config/rootfiles/core/196/filelists/zlib-ng b/config/rootfiles/oldcore/196/filelists/zlib-ng similarity index 100% rename from config/rootfiles/core/196/filelists/zlib-ng rename to config/rootfiles/oldcore/196/filelists/zlib-ng diff --git a/config/rootfiles/core/196/update.sh b/config/rootfiles/oldcore/196/update.sh similarity index 100% rename from config/rootfiles/core/196/update.sh rename to config/rootfiles/oldcore/196/update.sh diff --git a/make.sh b/make.sh index 57a0ff2cf..e32779fbd 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="196" # Core Level (Filename) +CORE="197" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir