From: Michael Tremer Date: Tue, 22 Apr 2025 14:09:03 +0000 (+0000) Subject: Start Core Update 195 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76da4bd66c8da9a203a21e607c88a0874e9c3a27;p=people%2Fms%2Fipfire-2.x.git Start Core Update 195 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/194/exclude b/config/rootfiles/core/195/exclude similarity index 100% rename from config/rootfiles/core/194/exclude rename to config/rootfiles/core/195/exclude diff --git a/config/rootfiles/core/194/filelists/core-files b/config/rootfiles/core/195/filelists/core-files similarity index 100% rename from config/rootfiles/core/194/filelists/core-files rename to config/rootfiles/core/195/filelists/core-files diff --git a/config/rootfiles/core/195/filelists/files b/config/rootfiles/core/195/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/195/update.sh b/config/rootfiles/core/195/update.sh new file mode 100644 index 000000000..ee9b53497 --- /dev/null +++ b/config/rootfiles/core/195/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=195 + +# 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/194/exclude b/config/rootfiles/oldcore/194/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/194/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/194/filelists/aarch64/linux b/config/rootfiles/oldcore/194/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/194/filelists/aarch64/linux rename to config/rootfiles/oldcore/194/filelists/aarch64/linux diff --git a/config/rootfiles/core/194/filelists/aarch64/util-linux b/config/rootfiles/oldcore/194/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/194/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/194/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/194/filelists/abseil-cpp b/config/rootfiles/oldcore/194/filelists/abseil-cpp similarity index 100% rename from config/rootfiles/core/194/filelists/abseil-cpp rename to config/rootfiles/oldcore/194/filelists/abseil-cpp diff --git a/config/rootfiles/core/194/filelists/apache2 b/config/rootfiles/oldcore/194/filelists/apache2 similarity index 100% rename from config/rootfiles/core/194/filelists/apache2 rename to config/rootfiles/oldcore/194/filelists/apache2 diff --git a/config/rootfiles/core/194/filelists/bind b/config/rootfiles/oldcore/194/filelists/bind similarity index 100% rename from config/rootfiles/core/194/filelists/bind rename to config/rootfiles/oldcore/194/filelists/bind diff --git a/config/rootfiles/core/194/filelists/ca-certificates b/config/rootfiles/oldcore/194/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/194/filelists/ca-certificates rename to config/rootfiles/oldcore/194/filelists/ca-certificates diff --git a/config/rootfiles/core/194/filelists/cairo b/config/rootfiles/oldcore/194/filelists/cairo similarity index 100% rename from config/rootfiles/core/194/filelists/cairo rename to config/rootfiles/oldcore/194/filelists/cairo diff --git a/config/rootfiles/core/194/filelists/collectd b/config/rootfiles/oldcore/194/filelists/collectd similarity index 100% rename from config/rootfiles/core/194/filelists/collectd rename to config/rootfiles/oldcore/194/filelists/collectd diff --git a/config/rootfiles/oldcore/194/filelists/core-files b/config/rootfiles/oldcore/194/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/194/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/194/filelists/coreutils b/config/rootfiles/oldcore/194/filelists/coreutils similarity index 100% rename from config/rootfiles/core/194/filelists/coreutils rename to config/rootfiles/oldcore/194/filelists/coreutils diff --git a/config/rootfiles/core/194/filelists/expat b/config/rootfiles/oldcore/194/filelists/expat similarity index 100% rename from config/rootfiles/core/194/filelists/expat rename to config/rootfiles/oldcore/194/filelists/expat diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/oldcore/194/filelists/files similarity index 100% rename from config/rootfiles/core/194/filelists/files rename to config/rootfiles/oldcore/194/filelists/files diff --git a/config/rootfiles/core/194/filelists/gdbm b/config/rootfiles/oldcore/194/filelists/gdbm similarity index 100% rename from config/rootfiles/core/194/filelists/gdbm rename to config/rootfiles/oldcore/194/filelists/gdbm diff --git a/config/rootfiles/core/194/filelists/gettext b/config/rootfiles/oldcore/194/filelists/gettext similarity index 100% rename from config/rootfiles/core/194/filelists/gettext rename to config/rootfiles/oldcore/194/filelists/gettext diff --git a/config/rootfiles/core/194/filelists/harfbuzz b/config/rootfiles/oldcore/194/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/194/filelists/harfbuzz rename to config/rootfiles/oldcore/194/filelists/harfbuzz diff --git a/config/rootfiles/core/194/filelists/hwdata b/config/rootfiles/oldcore/194/filelists/hwdata similarity index 100% rename from config/rootfiles/core/194/filelists/hwdata rename to config/rootfiles/oldcore/194/filelists/hwdata diff --git a/config/rootfiles/core/194/filelists/iana-etc b/config/rootfiles/oldcore/194/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/194/filelists/iana-etc rename to config/rootfiles/oldcore/194/filelists/iana-etc diff --git a/config/rootfiles/core/194/filelists/iproute2 b/config/rootfiles/oldcore/194/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/194/filelists/iproute2 rename to config/rootfiles/oldcore/194/filelists/iproute2 diff --git a/config/rootfiles/core/194/filelists/jansson b/config/rootfiles/oldcore/194/filelists/jansson similarity index 100% rename from config/rootfiles/core/194/filelists/jansson rename to config/rootfiles/oldcore/194/filelists/jansson diff --git a/config/rootfiles/core/194/filelists/kmod b/config/rootfiles/oldcore/194/filelists/kmod similarity index 100% rename from config/rootfiles/core/194/filelists/kmod rename to config/rootfiles/oldcore/194/filelists/kmod diff --git a/config/rootfiles/core/194/filelists/libarchive b/config/rootfiles/oldcore/194/filelists/libarchive similarity index 100% rename from config/rootfiles/core/194/filelists/libarchive rename to config/rootfiles/oldcore/194/filelists/libarchive diff --git a/config/rootfiles/core/194/filelists/libcap b/config/rootfiles/oldcore/194/filelists/libcap similarity index 100% rename from config/rootfiles/core/194/filelists/libcap rename to config/rootfiles/oldcore/194/filelists/libcap diff --git a/config/rootfiles/core/194/filelists/libedit b/config/rootfiles/oldcore/194/filelists/libedit similarity index 100% rename from config/rootfiles/core/194/filelists/libedit rename to config/rootfiles/oldcore/194/filelists/libedit diff --git a/config/rootfiles/core/194/filelists/libhtp b/config/rootfiles/oldcore/194/filelists/libhtp similarity index 100% rename from config/rootfiles/core/194/filelists/libhtp rename to config/rootfiles/oldcore/194/filelists/libhtp diff --git a/config/rootfiles/core/194/filelists/liburcu b/config/rootfiles/oldcore/194/filelists/liburcu similarity index 100% rename from config/rootfiles/core/194/filelists/liburcu rename to config/rootfiles/oldcore/194/filelists/liburcu diff --git a/config/rootfiles/core/194/filelists/libusb b/config/rootfiles/oldcore/194/filelists/libusb similarity index 100% rename from config/rootfiles/core/194/filelists/libusb rename to config/rootfiles/oldcore/194/filelists/libusb diff --git a/config/rootfiles/core/194/filelists/libxml2 b/config/rootfiles/oldcore/194/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/194/filelists/libxml2 rename to config/rootfiles/oldcore/194/filelists/libxml2 diff --git a/config/rootfiles/core/194/filelists/libxslt b/config/rootfiles/oldcore/194/filelists/libxslt similarity index 100% rename from config/rootfiles/core/194/filelists/libxslt rename to config/rootfiles/oldcore/194/filelists/libxslt diff --git a/config/rootfiles/core/194/filelists/lvm2 b/config/rootfiles/oldcore/194/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/194/filelists/lvm2 rename to config/rootfiles/oldcore/194/filelists/lvm2 diff --git a/config/rootfiles/core/194/filelists/mpfr b/config/rootfiles/oldcore/194/filelists/mpfr similarity index 100% rename from config/rootfiles/core/194/filelists/mpfr rename to config/rootfiles/oldcore/194/filelists/mpfr diff --git a/config/rootfiles/core/194/filelists/pango b/config/rootfiles/oldcore/194/filelists/pango similarity index 100% rename from config/rootfiles/core/194/filelists/pango rename to config/rootfiles/oldcore/194/filelists/pango diff --git a/config/rootfiles/core/194/filelists/procps b/config/rootfiles/oldcore/194/filelists/procps similarity index 100% rename from config/rootfiles/core/194/filelists/procps rename to config/rootfiles/oldcore/194/filelists/procps diff --git a/config/rootfiles/core/194/filelists/riscv64/linux b/config/rootfiles/oldcore/194/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/194/filelists/riscv64/linux rename to config/rootfiles/oldcore/194/filelists/riscv64/linux diff --git a/config/rootfiles/core/194/filelists/riscv64/util-linux b/config/rootfiles/oldcore/194/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/194/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/194/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/194/filelists/rrdtool b/config/rootfiles/oldcore/194/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/194/filelists/rrdtool rename to config/rootfiles/oldcore/194/filelists/rrdtool diff --git a/config/rootfiles/core/194/filelists/shadow b/config/rootfiles/oldcore/194/filelists/shadow similarity index 100% rename from config/rootfiles/core/194/filelists/shadow rename to config/rootfiles/oldcore/194/filelists/shadow diff --git a/config/rootfiles/core/194/filelists/strongswan b/config/rootfiles/oldcore/194/filelists/strongswan similarity index 100% rename from config/rootfiles/core/194/filelists/strongswan rename to config/rootfiles/oldcore/194/filelists/strongswan diff --git a/config/rootfiles/core/194/filelists/suricata b/config/rootfiles/oldcore/194/filelists/suricata similarity index 100% rename from config/rootfiles/core/194/filelists/suricata rename to config/rootfiles/oldcore/194/filelists/suricata diff --git a/config/rootfiles/core/194/filelists/tzdata b/config/rootfiles/oldcore/194/filelists/tzdata similarity index 100% rename from config/rootfiles/core/194/filelists/tzdata rename to config/rootfiles/oldcore/194/filelists/tzdata diff --git a/config/rootfiles/core/194/filelists/x86_64/linux b/config/rootfiles/oldcore/194/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/194/filelists/x86_64/linux rename to config/rootfiles/oldcore/194/filelists/x86_64/linux diff --git a/config/rootfiles/core/194/filelists/x86_64/util-linux b/config/rootfiles/oldcore/194/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/194/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/194/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/194/filelists/xz b/config/rootfiles/oldcore/194/filelists/xz similarity index 100% rename from config/rootfiles/core/194/filelists/xz rename to config/rootfiles/oldcore/194/filelists/xz diff --git a/config/rootfiles/core/194/update.sh b/config/rootfiles/oldcore/194/update.sh similarity index 100% rename from config/rootfiles/core/194/update.sh rename to config/rootfiles/oldcore/194/update.sh diff --git a/make.sh b/make.sh index 6e0605e14..8da90d61d 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="194" # Core Level (Filename) +CORE="195" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir