From 9e44d2ccf445bd56168141a8f08bd722daaa3bf1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 16 Sep 2024 17:01:55 +0000 Subject: [PATCH] Start Core Update 190 Signed-off-by: Michael Tremer --- config/rootfiles/core/190/exclude | 36 ++++++++++ .../core/{189 => 190}/filelists/core-files | 0 config/rootfiles/core/190/update.sh | 70 +++++++++++++++++++ .../rootfiles/{core => oldcore}/189/exclude | 0 .../189/filelists/aarch64/binutils | 0 .../189/filelists/aarch64/gcc | 0 .../189/filelists/aarch64/glibc | 0 .../189/filelists/aarch64/ruby | 0 .../{core => oldcore}/189/filelists/automake | 0 .../{core => oldcore}/189/filelists/bind | 0 .../oldcore/189/filelists/core-files | 5 ++ .../{core => oldcore}/189/filelists/coreutils | 0 .../{core => oldcore}/189/filelists/dhcpcd | 0 .../{core => oldcore}/189/filelists/expat | 0 .../{core => oldcore}/189/filelists/files | 0 .../{core => oldcore}/189/filelists/gdbm | 0 .../{core => oldcore}/189/filelists/gnutls | 0 .../{core => oldcore}/189/filelists/iana-etc | 0 .../189/filelists/linux-firmware | 0 .../{core => oldcore}/189/filelists/lua | 0 .../{core => oldcore}/189/filelists/meson | 0 .../189/filelists/misc-progs | 0 .../{core => oldcore}/189/filelists/openssl | 0 .../{core => oldcore}/189/filelists/openvpn | 0 .../{core => oldcore}/189/filelists/p11-kit | 0 .../189/filelists/riscv64/binutils | 0 .../189/filelists/riscv64/gcc | 0 .../189/filelists/riscv64/glibc | 0 .../189/filelists/riscv64/ruby | 0 .../{core => oldcore}/189/filelists/sudo | 0 .../{core => oldcore}/189/filelists/suricata | 0 .../{core => oldcore}/189/filelists/sysvinit | 0 .../189/filelists/x86_64/binutils | 0 .../189/filelists/x86_64/gcc | 0 .../189/filelists/x86_64/glibc | 0 .../189/filelists/x86_64/intel-microcode | 0 .../189/filelists/x86_64/ruby | 0 .../{core => oldcore}/189/filelists/xfsprogs | 0 .../rootfiles/{core => oldcore}/189/update.sh | 0 make.sh | 2 +- 40 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/190/exclude rename config/rootfiles/core/{189 => 190}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/190/update.sh rename config/rootfiles/{core => oldcore}/189/exclude (100%) rename config/rootfiles/{core => oldcore}/189/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/189/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/aarch64/ruby (100%) rename config/rootfiles/{core => oldcore}/189/filelists/automake (100%) rename config/rootfiles/{core => oldcore}/189/filelists/bind (100%) create mode 100644 config/rootfiles/oldcore/189/filelists/core-files rename config/rootfiles/{core => oldcore}/189/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/189/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/189/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/189/filelists/files (100%) rename config/rootfiles/{core => oldcore}/189/filelists/gdbm (100%) rename config/rootfiles/{core => oldcore}/189/filelists/gnutls (100%) rename config/rootfiles/{core => oldcore}/189/filelists/iana-etc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/189/filelists/lua (100%) rename config/rootfiles/{core => oldcore}/189/filelists/meson (100%) rename config/rootfiles/{core => oldcore}/189/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/189/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/189/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/189/filelists/p11-kit (100%) rename config/rootfiles/{core => oldcore}/189/filelists/riscv64/binutils (100%) rename config/rootfiles/{core => oldcore}/189/filelists/riscv64/gcc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/riscv64/glibc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/riscv64/ruby (100%) rename config/rootfiles/{core => oldcore}/189/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/189/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/189/filelists/sysvinit (100%) rename config/rootfiles/{core => oldcore}/189/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/189/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/189/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/189/filelists/x86_64/ruby (100%) rename config/rootfiles/{core => oldcore}/189/filelists/xfsprogs (100%) rename config/rootfiles/{core => oldcore}/189/update.sh (100%) diff --git a/config/rootfiles/core/190/exclude b/config/rootfiles/core/190/exclude new file mode 100644 index 000000000..32c932f91 --- /dev/null +++ b/config/rootfiles/core/190/exclude @@ -0,0 +1,36 @@ +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/log/squid/access.log +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/189/filelists/core-files b/config/rootfiles/core/190/filelists/core-files similarity index 100% rename from config/rootfiles/core/189/filelists/core-files rename to config/rootfiles/core/190/filelists/core-files diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh new file mode 100644 index 000000000..5abd6d6b7 --- /dev/null +++ b/config/rootfiles/core/190/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) 2024 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=190 + +# 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 + +# Extract files +extract_files + +# Remove files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply local configuration to sshd_config +/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/core/189/exclude b/config/rootfiles/oldcore/189/exclude similarity index 100% rename from config/rootfiles/core/189/exclude rename to config/rootfiles/oldcore/189/exclude diff --git a/config/rootfiles/core/189/filelists/aarch64/binutils b/config/rootfiles/oldcore/189/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/189/filelists/aarch64/binutils rename to config/rootfiles/oldcore/189/filelists/aarch64/binutils diff --git a/config/rootfiles/core/189/filelists/aarch64/gcc b/config/rootfiles/oldcore/189/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/189/filelists/aarch64/gcc rename to config/rootfiles/oldcore/189/filelists/aarch64/gcc diff --git a/config/rootfiles/core/189/filelists/aarch64/glibc b/config/rootfiles/oldcore/189/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/189/filelists/aarch64/glibc rename to config/rootfiles/oldcore/189/filelists/aarch64/glibc diff --git a/config/rootfiles/core/189/filelists/aarch64/ruby b/config/rootfiles/oldcore/189/filelists/aarch64/ruby similarity index 100% rename from config/rootfiles/core/189/filelists/aarch64/ruby rename to config/rootfiles/oldcore/189/filelists/aarch64/ruby diff --git a/config/rootfiles/core/189/filelists/automake b/config/rootfiles/oldcore/189/filelists/automake similarity index 100% rename from config/rootfiles/core/189/filelists/automake rename to config/rootfiles/oldcore/189/filelists/automake diff --git a/config/rootfiles/core/189/filelists/bind b/config/rootfiles/oldcore/189/filelists/bind similarity index 100% rename from config/rootfiles/core/189/filelists/bind rename to config/rootfiles/oldcore/189/filelists/bind diff --git a/config/rootfiles/oldcore/189/filelists/core-files b/config/rootfiles/oldcore/189/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/189/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/189/filelists/coreutils b/config/rootfiles/oldcore/189/filelists/coreutils similarity index 100% rename from config/rootfiles/core/189/filelists/coreutils rename to config/rootfiles/oldcore/189/filelists/coreutils diff --git a/config/rootfiles/core/189/filelists/dhcpcd b/config/rootfiles/oldcore/189/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/189/filelists/dhcpcd rename to config/rootfiles/oldcore/189/filelists/dhcpcd diff --git a/config/rootfiles/core/189/filelists/expat b/config/rootfiles/oldcore/189/filelists/expat similarity index 100% rename from config/rootfiles/core/189/filelists/expat rename to config/rootfiles/oldcore/189/filelists/expat diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/oldcore/189/filelists/files similarity index 100% rename from config/rootfiles/core/189/filelists/files rename to config/rootfiles/oldcore/189/filelists/files diff --git a/config/rootfiles/core/189/filelists/gdbm b/config/rootfiles/oldcore/189/filelists/gdbm similarity index 100% rename from config/rootfiles/core/189/filelists/gdbm rename to config/rootfiles/oldcore/189/filelists/gdbm diff --git a/config/rootfiles/core/189/filelists/gnutls b/config/rootfiles/oldcore/189/filelists/gnutls similarity index 100% rename from config/rootfiles/core/189/filelists/gnutls rename to config/rootfiles/oldcore/189/filelists/gnutls diff --git a/config/rootfiles/core/189/filelists/iana-etc b/config/rootfiles/oldcore/189/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/189/filelists/iana-etc rename to config/rootfiles/oldcore/189/filelists/iana-etc diff --git a/config/rootfiles/core/189/filelists/linux-firmware b/config/rootfiles/oldcore/189/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/189/filelists/linux-firmware rename to config/rootfiles/oldcore/189/filelists/linux-firmware diff --git a/config/rootfiles/core/189/filelists/lua b/config/rootfiles/oldcore/189/filelists/lua similarity index 100% rename from config/rootfiles/core/189/filelists/lua rename to config/rootfiles/oldcore/189/filelists/lua diff --git a/config/rootfiles/core/189/filelists/meson b/config/rootfiles/oldcore/189/filelists/meson similarity index 100% rename from config/rootfiles/core/189/filelists/meson rename to config/rootfiles/oldcore/189/filelists/meson diff --git a/config/rootfiles/core/189/filelists/misc-progs b/config/rootfiles/oldcore/189/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/189/filelists/misc-progs rename to config/rootfiles/oldcore/189/filelists/misc-progs diff --git a/config/rootfiles/core/189/filelists/openssl b/config/rootfiles/oldcore/189/filelists/openssl similarity index 100% rename from config/rootfiles/core/189/filelists/openssl rename to config/rootfiles/oldcore/189/filelists/openssl diff --git a/config/rootfiles/core/189/filelists/openvpn b/config/rootfiles/oldcore/189/filelists/openvpn similarity index 100% rename from config/rootfiles/core/189/filelists/openvpn rename to config/rootfiles/oldcore/189/filelists/openvpn diff --git a/config/rootfiles/core/189/filelists/p11-kit b/config/rootfiles/oldcore/189/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/189/filelists/p11-kit rename to config/rootfiles/oldcore/189/filelists/p11-kit diff --git a/config/rootfiles/core/189/filelists/riscv64/binutils b/config/rootfiles/oldcore/189/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/189/filelists/riscv64/binutils rename to config/rootfiles/oldcore/189/filelists/riscv64/binutils diff --git a/config/rootfiles/core/189/filelists/riscv64/gcc b/config/rootfiles/oldcore/189/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/189/filelists/riscv64/gcc rename to config/rootfiles/oldcore/189/filelists/riscv64/gcc diff --git a/config/rootfiles/core/189/filelists/riscv64/glibc b/config/rootfiles/oldcore/189/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/189/filelists/riscv64/glibc rename to config/rootfiles/oldcore/189/filelists/riscv64/glibc diff --git a/config/rootfiles/core/189/filelists/riscv64/ruby b/config/rootfiles/oldcore/189/filelists/riscv64/ruby similarity index 100% rename from config/rootfiles/core/189/filelists/riscv64/ruby rename to config/rootfiles/oldcore/189/filelists/riscv64/ruby diff --git a/config/rootfiles/core/189/filelists/sudo b/config/rootfiles/oldcore/189/filelists/sudo similarity index 100% rename from config/rootfiles/core/189/filelists/sudo rename to config/rootfiles/oldcore/189/filelists/sudo diff --git a/config/rootfiles/core/189/filelists/suricata b/config/rootfiles/oldcore/189/filelists/suricata similarity index 100% rename from config/rootfiles/core/189/filelists/suricata rename to config/rootfiles/oldcore/189/filelists/suricata diff --git a/config/rootfiles/core/189/filelists/sysvinit b/config/rootfiles/oldcore/189/filelists/sysvinit similarity index 100% rename from config/rootfiles/core/189/filelists/sysvinit rename to config/rootfiles/oldcore/189/filelists/sysvinit diff --git a/config/rootfiles/core/189/filelists/x86_64/binutils b/config/rootfiles/oldcore/189/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/189/filelists/x86_64/binutils rename to config/rootfiles/oldcore/189/filelists/x86_64/binutils diff --git a/config/rootfiles/core/189/filelists/x86_64/gcc b/config/rootfiles/oldcore/189/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/189/filelists/x86_64/gcc rename to config/rootfiles/oldcore/189/filelists/x86_64/gcc diff --git a/config/rootfiles/core/189/filelists/x86_64/glibc b/config/rootfiles/oldcore/189/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/189/filelists/x86_64/glibc rename to config/rootfiles/oldcore/189/filelists/x86_64/glibc diff --git a/config/rootfiles/core/189/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/189/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/189/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/189/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/189/filelists/x86_64/ruby b/config/rootfiles/oldcore/189/filelists/x86_64/ruby similarity index 100% rename from config/rootfiles/core/189/filelists/x86_64/ruby rename to config/rootfiles/oldcore/189/filelists/x86_64/ruby diff --git a/config/rootfiles/core/189/filelists/xfsprogs b/config/rootfiles/oldcore/189/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/189/filelists/xfsprogs rename to config/rootfiles/oldcore/189/filelists/xfsprogs diff --git a/config/rootfiles/core/189/update.sh b/config/rootfiles/oldcore/189/update.sh similarity index 100% rename from config/rootfiles/core/189/update.sh rename to config/rootfiles/oldcore/189/update.sh diff --git a/make.sh b/make.sh index 3853982f8..383aa25cc 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="189" # Core Level (Filename) +CORE="190" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.5