From 3a55554352d988d94e7b618a12931643a7664b7c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 May 2025 14:30:06 +0000 Subject: [PATCH] Start Core Update 196 Signed-off-by: Michael Tremer --- config/rootfiles/core/{195 => 196}/exclude | 0 .../core/{195 => 196}/filelists/core-files | 0 .../core/{195 => 196}/filelists/files | 0 config/rootfiles/core/196/update.sh | 70 +++++++++++++++++++ config/rootfiles/oldcore/195/exclude | 35 ++++++++++ .../195/filelists/btrfs-progs | 0 .../oldcore/195/filelists/core-files | 5 ++ .../{core => oldcore}/195/filelists/coreutils | 0 .../{core => oldcore}/195/filelists/diffutils | 0 config/rootfiles/oldcore/195/filelists/files | 31 ++++++++ .../195/filelists/fontconfig | 0 .../{core => oldcore}/195/filelists/gawk | 0 .../{core => oldcore}/195/filelists/grep | 0 .../{core => oldcore}/195/filelists/gzip | 0 .../{core => oldcore}/195/filelists/harfbuzz | 0 .../{core => oldcore}/195/filelists/hwdata | 0 .../{core => oldcore}/195/filelists/libcap | 0 .../{core => oldcore}/195/filelists/libffi | 0 .../195/filelists/libgpg-error | 0 .../{core => oldcore}/195/filelists/openssh | 0 .../{core => oldcore}/195/filelists/openssl | 0 .../{core => oldcore}/195/filelists/patch | 0 .../{core => oldcore}/195/filelists/protobuf | 0 .../195/filelists/protobuf-c | 0 .../195/filelists/smartmontools | 0 .../{core => oldcore}/195/filelists/sqlite | 0 .../{core => oldcore}/195/filelists/unbound | 0 .../195/filelists/wireguard-tools | 0 .../{core => oldcore}/195/filelists/xfsprogs | 0 .../rootfiles/{core => oldcore}/195/update.sh | 0 make.sh | 2 +- 31 files changed, 142 insertions(+), 1 deletion(-) rename config/rootfiles/core/{195 => 196}/exclude (100%) rename config/rootfiles/core/{195 => 196}/filelists/core-files (100%) rename config/rootfiles/core/{195 => 196}/filelists/files (100%) create mode 100644 config/rootfiles/core/196/update.sh create mode 100644 config/rootfiles/oldcore/195/exclude rename config/rootfiles/{core => oldcore}/195/filelists/btrfs-progs (100%) create mode 100644 config/rootfiles/oldcore/195/filelists/core-files rename config/rootfiles/{core => oldcore}/195/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/195/filelists/diffutils (100%) create mode 100644 config/rootfiles/oldcore/195/filelists/files rename config/rootfiles/{core => oldcore}/195/filelists/fontconfig (100%) rename config/rootfiles/{core => oldcore}/195/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/195/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/195/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/195/filelists/harfbuzz (100%) rename config/rootfiles/{core => oldcore}/195/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/195/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/195/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/195/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/195/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/195/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/195/filelists/patch (100%) rename config/rootfiles/{core => oldcore}/195/filelists/protobuf (100%) rename config/rootfiles/{core => oldcore}/195/filelists/protobuf-c (100%) rename config/rootfiles/{core => oldcore}/195/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/195/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/195/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/195/filelists/wireguard-tools (100%) rename config/rootfiles/{core => oldcore}/195/filelists/xfsprogs (100%) rename config/rootfiles/{core => oldcore}/195/update.sh (100%) diff --git a/config/rootfiles/core/195/exclude b/config/rootfiles/core/196/exclude similarity index 100% rename from config/rootfiles/core/195/exclude rename to config/rootfiles/core/196/exclude diff --git a/config/rootfiles/core/195/filelists/core-files b/config/rootfiles/core/196/filelists/core-files similarity index 100% rename from config/rootfiles/core/195/filelists/core-files rename to config/rootfiles/core/196/filelists/core-files diff --git a/config/rootfiles/core/195/filelists/files b/config/rootfiles/core/196/filelists/files similarity index 100% rename from config/rootfiles/core/195/filelists/files rename to config/rootfiles/core/196/filelists/files diff --git a/config/rootfiles/core/196/update.sh b/config/rootfiles/core/196/update.sh new file mode 100644 index 0000000000..3688beed4a --- /dev/null +++ b/config/rootfiles/core/196/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=196 + +# 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/195/exclude b/config/rootfiles/oldcore/195/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/195/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/195/filelists/btrfs-progs b/config/rootfiles/oldcore/195/filelists/btrfs-progs similarity index 100% rename from config/rootfiles/core/195/filelists/btrfs-progs rename to config/rootfiles/oldcore/195/filelists/btrfs-progs diff --git a/config/rootfiles/oldcore/195/filelists/core-files b/config/rootfiles/oldcore/195/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/195/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/195/filelists/coreutils b/config/rootfiles/oldcore/195/filelists/coreutils similarity index 100% rename from config/rootfiles/core/195/filelists/coreutils rename to config/rootfiles/oldcore/195/filelists/coreutils diff --git a/config/rootfiles/core/195/filelists/diffutils b/config/rootfiles/oldcore/195/filelists/diffutils similarity index 100% rename from config/rootfiles/core/195/filelists/diffutils rename to config/rootfiles/oldcore/195/filelists/diffutils diff --git a/config/rootfiles/oldcore/195/filelists/files b/config/rootfiles/oldcore/195/filelists/files new file mode 100644 index 0000000000..c5bbfb87d3 --- /dev/null +++ b/config/rootfiles/oldcore/195/filelists/files @@ -0,0 +1,31 @@ +etc/fcron.cyclic/wg-dynamic +etc/iproute2/rt_tables +etc/rc.d/init.d/firewall +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/wireguard +lib/udev/network-aqm +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wireguard.cgi +srv/web/ipfire/cgi-bin/chpasswd.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/html/themes/ipfire/include/css/style.css +usr/lib/firewall/firewall-lib.pl +usr/local/bin/wireguardctrl +usr/sbin/firewall-policy +usr/sbin/setup +var/ipfire/backup/bin/backup.pl +var/ipfire/general-functions.pl +var/ipfire/header.pl +var/ipfire/http-client-functions.pl +var/ipfire/ids-functions.pl +var/ipfire/ipblocklist/sources +var/ipfire/menu.d/40-services.menu +var/ipfire/network-functions.pl +var/ipfire/wireguard-functions.pl diff --git a/config/rootfiles/core/195/filelists/fontconfig b/config/rootfiles/oldcore/195/filelists/fontconfig similarity index 100% rename from config/rootfiles/core/195/filelists/fontconfig rename to config/rootfiles/oldcore/195/filelists/fontconfig diff --git a/config/rootfiles/core/195/filelists/gawk b/config/rootfiles/oldcore/195/filelists/gawk similarity index 100% rename from config/rootfiles/core/195/filelists/gawk rename to config/rootfiles/oldcore/195/filelists/gawk diff --git a/config/rootfiles/core/195/filelists/grep b/config/rootfiles/oldcore/195/filelists/grep similarity index 100% rename from config/rootfiles/core/195/filelists/grep rename to config/rootfiles/oldcore/195/filelists/grep diff --git a/config/rootfiles/core/195/filelists/gzip b/config/rootfiles/oldcore/195/filelists/gzip similarity index 100% rename from config/rootfiles/core/195/filelists/gzip rename to config/rootfiles/oldcore/195/filelists/gzip diff --git a/config/rootfiles/core/195/filelists/harfbuzz b/config/rootfiles/oldcore/195/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/195/filelists/harfbuzz rename to config/rootfiles/oldcore/195/filelists/harfbuzz diff --git a/config/rootfiles/core/195/filelists/hwdata b/config/rootfiles/oldcore/195/filelists/hwdata similarity index 100% rename from config/rootfiles/core/195/filelists/hwdata rename to config/rootfiles/oldcore/195/filelists/hwdata diff --git a/config/rootfiles/core/195/filelists/libcap b/config/rootfiles/oldcore/195/filelists/libcap similarity index 100% rename from config/rootfiles/core/195/filelists/libcap rename to config/rootfiles/oldcore/195/filelists/libcap diff --git a/config/rootfiles/core/195/filelists/libffi b/config/rootfiles/oldcore/195/filelists/libffi similarity index 100% rename from config/rootfiles/core/195/filelists/libffi rename to config/rootfiles/oldcore/195/filelists/libffi diff --git a/config/rootfiles/core/195/filelists/libgpg-error b/config/rootfiles/oldcore/195/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/195/filelists/libgpg-error rename to config/rootfiles/oldcore/195/filelists/libgpg-error diff --git a/config/rootfiles/core/195/filelists/openssh b/config/rootfiles/oldcore/195/filelists/openssh similarity index 100% rename from config/rootfiles/core/195/filelists/openssh rename to config/rootfiles/oldcore/195/filelists/openssh diff --git a/config/rootfiles/core/195/filelists/openssl b/config/rootfiles/oldcore/195/filelists/openssl similarity index 100% rename from config/rootfiles/core/195/filelists/openssl rename to config/rootfiles/oldcore/195/filelists/openssl diff --git a/config/rootfiles/core/195/filelists/patch b/config/rootfiles/oldcore/195/filelists/patch similarity index 100% rename from config/rootfiles/core/195/filelists/patch rename to config/rootfiles/oldcore/195/filelists/patch diff --git a/config/rootfiles/core/195/filelists/protobuf b/config/rootfiles/oldcore/195/filelists/protobuf similarity index 100% rename from config/rootfiles/core/195/filelists/protobuf rename to config/rootfiles/oldcore/195/filelists/protobuf diff --git a/config/rootfiles/core/195/filelists/protobuf-c b/config/rootfiles/oldcore/195/filelists/protobuf-c similarity index 100% rename from config/rootfiles/core/195/filelists/protobuf-c rename to config/rootfiles/oldcore/195/filelists/protobuf-c diff --git a/config/rootfiles/core/195/filelists/smartmontools b/config/rootfiles/oldcore/195/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/195/filelists/smartmontools rename to config/rootfiles/oldcore/195/filelists/smartmontools diff --git a/config/rootfiles/core/195/filelists/sqlite b/config/rootfiles/oldcore/195/filelists/sqlite similarity index 100% rename from config/rootfiles/core/195/filelists/sqlite rename to config/rootfiles/oldcore/195/filelists/sqlite diff --git a/config/rootfiles/core/195/filelists/unbound b/config/rootfiles/oldcore/195/filelists/unbound similarity index 100% rename from config/rootfiles/core/195/filelists/unbound rename to config/rootfiles/oldcore/195/filelists/unbound diff --git a/config/rootfiles/core/195/filelists/wireguard-tools b/config/rootfiles/oldcore/195/filelists/wireguard-tools similarity index 100% rename from config/rootfiles/core/195/filelists/wireguard-tools rename to config/rootfiles/oldcore/195/filelists/wireguard-tools diff --git a/config/rootfiles/core/195/filelists/xfsprogs b/config/rootfiles/oldcore/195/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/195/filelists/xfsprogs rename to config/rootfiles/oldcore/195/filelists/xfsprogs diff --git a/config/rootfiles/core/195/update.sh b/config/rootfiles/oldcore/195/update.sh similarity index 100% rename from config/rootfiles/core/195/update.sh rename to config/rootfiles/oldcore/195/update.sh diff --git a/make.sh b/make.sh index 61921fee62..2352bfca53 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="195" # Core Level (Filename) +CORE="196" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.5