From 36219d61b4633b5d573cf2b43de568165034e06b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 19 Mar 2025 10:49:41 +0000 Subject: [PATCH] Start Core Update 194 Signed-off-by: Michael Tremer --- config/rootfiles/core/{193 => 194}/exclude | 0 .../core/{193 => 194}/filelists/core-files | 0 config/rootfiles/core/194/filelists/files | 0 config/rootfiles/core/194/update.sh | 67 +++++++++++++++++++ config/rootfiles/oldcore/193/exclude | 35 ++++++++++ .../{core => oldcore}/193/filelists/apache2 | 0 .../{core => oldcore}/193/filelists/autoconf | 0 .../{core => oldcore}/193/filelists/bind | 0 .../193/filelists/btrfs-progs | 0 .../oldcore/193/filelists/core-files | 5 ++ .../{core => oldcore}/193/filelists/dhcpcd | 0 .../{core => oldcore}/193/filelists/diffutils | 0 .../{core => oldcore}/193/filelists/expat | 0 .../{core => oldcore}/193/filelists/files | 0 .../193/filelists/fontconfig | 0 .../{core => oldcore}/193/filelists/gdb | 0 .../{core => oldcore}/193/filelists/harfbuzz | 0 .../{core => oldcore}/193/filelists/jquery | 0 .../{core => oldcore}/193/filelists/kmod | 0 .../{core => oldcore}/193/filelists/libffi | 0 .../{core => oldcore}/193/filelists/libxcrypt | 0 .../{core => oldcore}/193/filelists/libyang | 0 .../193/filelists/linux-firmware | 0 .../{core => oldcore}/193/filelists/lvm2 | 0 .../{core => oldcore}/193/filelists/pango | 0 .../{core => oldcore}/193/filelists/pcre2 | 0 .../{core => oldcore}/193/filelists/sqlite | 0 .../{core => oldcore}/193/filelists/squid | 0 .../193/filelists/strongswan | 0 .../{core => oldcore}/193/filelists/tcl | 0 .../{core => oldcore}/193/filelists/tzdata | 0 .../{core => oldcore}/193/filelists/vim | 0 .../{core => oldcore}/193/filelists/vnstat | 0 .../{core => oldcore}/193/filelists/which | 0 .../193/filelists/wpa_supplicant | 0 .../193/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/193/filelists/xfsprogs | 0 .../{core => oldcore}/193/filelists/zstd | 0 .../rootfiles/{core => oldcore}/193/update.sh | 0 make.sh | 2 +- 40 files changed, 108 insertions(+), 1 deletion(-) rename config/rootfiles/core/{193 => 194}/exclude (100%) rename config/rootfiles/core/{193 => 194}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/194/filelists/files create mode 100644 config/rootfiles/core/194/update.sh create mode 100644 config/rootfiles/oldcore/193/exclude rename config/rootfiles/{core => oldcore}/193/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/193/filelists/autoconf (100%) rename config/rootfiles/{core => oldcore}/193/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/193/filelists/btrfs-progs (100%) create mode 100644 config/rootfiles/oldcore/193/filelists/core-files rename config/rootfiles/{core => oldcore}/193/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/193/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/193/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/193/filelists/files (100%) rename config/rootfiles/{core => oldcore}/193/filelists/fontconfig (100%) rename config/rootfiles/{core => oldcore}/193/filelists/gdb (100%) rename config/rootfiles/{core => oldcore}/193/filelists/harfbuzz (100%) rename config/rootfiles/{core => oldcore}/193/filelists/jquery (100%) rename config/rootfiles/{core => oldcore}/193/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/193/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/193/filelists/libxcrypt (100%) rename config/rootfiles/{core => oldcore}/193/filelists/libyang (100%) rename config/rootfiles/{core => oldcore}/193/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/193/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/193/filelists/pango (100%) rename config/rootfiles/{core => oldcore}/193/filelists/pcre2 (100%) rename config/rootfiles/{core => oldcore}/193/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/193/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/193/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/193/filelists/tcl (100%) rename config/rootfiles/{core => oldcore}/193/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/193/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/193/filelists/vnstat (100%) rename config/rootfiles/{core => oldcore}/193/filelists/which (100%) rename config/rootfiles/{core => oldcore}/193/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/193/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/193/filelists/xfsprogs (100%) rename config/rootfiles/{core => oldcore}/193/filelists/zstd (100%) rename config/rootfiles/{core => oldcore}/193/update.sh (100%) diff --git a/config/rootfiles/core/193/exclude b/config/rootfiles/core/194/exclude similarity index 100% rename from config/rootfiles/core/193/exclude rename to config/rootfiles/core/194/exclude diff --git a/config/rootfiles/core/193/filelists/core-files b/config/rootfiles/core/194/filelists/core-files similarity index 100% rename from config/rootfiles/core/193/filelists/core-files rename to config/rootfiles/core/194/filelists/core-files diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/core/194/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/194/update.sh b/config/rootfiles/core/194/update.sh new file mode 100644 index 0000000000..a0a43a6e1f --- /dev/null +++ b/config/rootfiles/core/194/update.sh @@ -0,0 +1,67 @@ +#!/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=194 + +# 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 + +# 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/193/exclude b/config/rootfiles/oldcore/193/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/193/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/193/filelists/apache2 b/config/rootfiles/oldcore/193/filelists/apache2 similarity index 100% rename from config/rootfiles/core/193/filelists/apache2 rename to config/rootfiles/oldcore/193/filelists/apache2 diff --git a/config/rootfiles/core/193/filelists/autoconf b/config/rootfiles/oldcore/193/filelists/autoconf similarity index 100% rename from config/rootfiles/core/193/filelists/autoconf rename to config/rootfiles/oldcore/193/filelists/autoconf diff --git a/config/rootfiles/core/193/filelists/bind b/config/rootfiles/oldcore/193/filelists/bind similarity index 100% rename from config/rootfiles/core/193/filelists/bind rename to config/rootfiles/oldcore/193/filelists/bind diff --git a/config/rootfiles/core/193/filelists/btrfs-progs b/config/rootfiles/oldcore/193/filelists/btrfs-progs similarity index 100% rename from config/rootfiles/core/193/filelists/btrfs-progs rename to config/rootfiles/oldcore/193/filelists/btrfs-progs diff --git a/config/rootfiles/oldcore/193/filelists/core-files b/config/rootfiles/oldcore/193/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/193/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/193/filelists/dhcpcd b/config/rootfiles/oldcore/193/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/193/filelists/dhcpcd rename to config/rootfiles/oldcore/193/filelists/dhcpcd diff --git a/config/rootfiles/core/193/filelists/diffutils b/config/rootfiles/oldcore/193/filelists/diffutils similarity index 100% rename from config/rootfiles/core/193/filelists/diffutils rename to config/rootfiles/oldcore/193/filelists/diffutils diff --git a/config/rootfiles/core/193/filelists/expat b/config/rootfiles/oldcore/193/filelists/expat similarity index 100% rename from config/rootfiles/core/193/filelists/expat rename to config/rootfiles/oldcore/193/filelists/expat diff --git a/config/rootfiles/core/193/filelists/files b/config/rootfiles/oldcore/193/filelists/files similarity index 100% rename from config/rootfiles/core/193/filelists/files rename to config/rootfiles/oldcore/193/filelists/files diff --git a/config/rootfiles/core/193/filelists/fontconfig b/config/rootfiles/oldcore/193/filelists/fontconfig similarity index 100% rename from config/rootfiles/core/193/filelists/fontconfig rename to config/rootfiles/oldcore/193/filelists/fontconfig diff --git a/config/rootfiles/core/193/filelists/gdb b/config/rootfiles/oldcore/193/filelists/gdb similarity index 100% rename from config/rootfiles/core/193/filelists/gdb rename to config/rootfiles/oldcore/193/filelists/gdb diff --git a/config/rootfiles/core/193/filelists/harfbuzz b/config/rootfiles/oldcore/193/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/193/filelists/harfbuzz rename to config/rootfiles/oldcore/193/filelists/harfbuzz diff --git a/config/rootfiles/core/193/filelists/jquery b/config/rootfiles/oldcore/193/filelists/jquery similarity index 100% rename from config/rootfiles/core/193/filelists/jquery rename to config/rootfiles/oldcore/193/filelists/jquery diff --git a/config/rootfiles/core/193/filelists/kmod b/config/rootfiles/oldcore/193/filelists/kmod similarity index 100% rename from config/rootfiles/core/193/filelists/kmod rename to config/rootfiles/oldcore/193/filelists/kmod diff --git a/config/rootfiles/core/193/filelists/libffi b/config/rootfiles/oldcore/193/filelists/libffi similarity index 100% rename from config/rootfiles/core/193/filelists/libffi rename to config/rootfiles/oldcore/193/filelists/libffi diff --git a/config/rootfiles/core/193/filelists/libxcrypt b/config/rootfiles/oldcore/193/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/193/filelists/libxcrypt rename to config/rootfiles/oldcore/193/filelists/libxcrypt diff --git a/config/rootfiles/core/193/filelists/libyang b/config/rootfiles/oldcore/193/filelists/libyang similarity index 100% rename from config/rootfiles/core/193/filelists/libyang rename to config/rootfiles/oldcore/193/filelists/libyang diff --git a/config/rootfiles/core/193/filelists/linux-firmware b/config/rootfiles/oldcore/193/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/193/filelists/linux-firmware rename to config/rootfiles/oldcore/193/filelists/linux-firmware diff --git a/config/rootfiles/core/193/filelists/lvm2 b/config/rootfiles/oldcore/193/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/193/filelists/lvm2 rename to config/rootfiles/oldcore/193/filelists/lvm2 diff --git a/config/rootfiles/core/193/filelists/pango b/config/rootfiles/oldcore/193/filelists/pango similarity index 100% rename from config/rootfiles/core/193/filelists/pango rename to config/rootfiles/oldcore/193/filelists/pango diff --git a/config/rootfiles/core/193/filelists/pcre2 b/config/rootfiles/oldcore/193/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/193/filelists/pcre2 rename to config/rootfiles/oldcore/193/filelists/pcre2 diff --git a/config/rootfiles/core/193/filelists/sqlite b/config/rootfiles/oldcore/193/filelists/sqlite similarity index 100% rename from config/rootfiles/core/193/filelists/sqlite rename to config/rootfiles/oldcore/193/filelists/sqlite diff --git a/config/rootfiles/core/193/filelists/squid b/config/rootfiles/oldcore/193/filelists/squid similarity index 100% rename from config/rootfiles/core/193/filelists/squid rename to config/rootfiles/oldcore/193/filelists/squid diff --git a/config/rootfiles/core/193/filelists/strongswan b/config/rootfiles/oldcore/193/filelists/strongswan similarity index 100% rename from config/rootfiles/core/193/filelists/strongswan rename to config/rootfiles/oldcore/193/filelists/strongswan diff --git a/config/rootfiles/core/193/filelists/tcl b/config/rootfiles/oldcore/193/filelists/tcl similarity index 100% rename from config/rootfiles/core/193/filelists/tcl rename to config/rootfiles/oldcore/193/filelists/tcl diff --git a/config/rootfiles/core/193/filelists/tzdata b/config/rootfiles/oldcore/193/filelists/tzdata similarity index 100% rename from config/rootfiles/core/193/filelists/tzdata rename to config/rootfiles/oldcore/193/filelists/tzdata diff --git a/config/rootfiles/core/193/filelists/vim b/config/rootfiles/oldcore/193/filelists/vim similarity index 100% rename from config/rootfiles/core/193/filelists/vim rename to config/rootfiles/oldcore/193/filelists/vim diff --git a/config/rootfiles/core/193/filelists/vnstat b/config/rootfiles/oldcore/193/filelists/vnstat similarity index 100% rename from config/rootfiles/core/193/filelists/vnstat rename to config/rootfiles/oldcore/193/filelists/vnstat diff --git a/config/rootfiles/core/193/filelists/which b/config/rootfiles/oldcore/193/filelists/which similarity index 100% rename from config/rootfiles/core/193/filelists/which rename to config/rootfiles/oldcore/193/filelists/which diff --git a/config/rootfiles/core/193/filelists/wpa_supplicant b/config/rootfiles/oldcore/193/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/193/filelists/wpa_supplicant rename to config/rootfiles/oldcore/193/filelists/wpa_supplicant diff --git a/config/rootfiles/core/193/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/193/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/193/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/193/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/193/filelists/xfsprogs b/config/rootfiles/oldcore/193/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/193/filelists/xfsprogs rename to config/rootfiles/oldcore/193/filelists/xfsprogs diff --git a/config/rootfiles/core/193/filelists/zstd b/config/rootfiles/oldcore/193/filelists/zstd similarity index 100% rename from config/rootfiles/core/193/filelists/zstd rename to config/rootfiles/oldcore/193/filelists/zstd diff --git a/config/rootfiles/core/193/update.sh b/config/rootfiles/oldcore/193/update.sh similarity index 100% rename from config/rootfiles/core/193/update.sh rename to config/rootfiles/oldcore/193/update.sh diff --git a/make.sh b/make.sh index 6258705fea..22148bd2b3 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="193" # Core Level (Filename) +CORE="194" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.5