From: Michael Tremer Date: Fri, 23 Aug 2024 09:53:22 +0000 (+0000) Subject: Start Core Update 189 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb0aac9beb72e808e0daa1a09bcd79be56789ee1;p=people%2Fmfischer%2Fipfire-2.x.git Start Core Update 189 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/189/exclude b/config/rootfiles/core/189/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/core/189/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/188/filelists/core-files b/config/rootfiles/core/189/filelists/core-files similarity index 100% rename from config/rootfiles/core/188/filelists/core-files rename to config/rootfiles/core/189/filelists/core-files diff --git a/config/rootfiles/core/189/update.sh b/config/rootfiles/core/189/update.sh new file mode 100644 index 000000000..42f8c8e4a --- /dev/null +++ b/config/rootfiles/core/189/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=189 + +# 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/188/exclude b/config/rootfiles/oldcore/188/exclude similarity index 100% rename from config/rootfiles/core/188/exclude rename to config/rootfiles/oldcore/188/exclude diff --git a/config/rootfiles/core/188/filelists/aarch64/linux b/config/rootfiles/oldcore/188/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/188/filelists/aarch64/linux rename to config/rootfiles/oldcore/188/filelists/aarch64/linux diff --git a/config/rootfiles/core/188/filelists/aarch64/util-linux b/config/rootfiles/oldcore/188/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/188/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/188/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/188/filelists/apache2 b/config/rootfiles/oldcore/188/filelists/apache2 similarity index 100% rename from config/rootfiles/core/188/filelists/apache2 rename to config/rootfiles/oldcore/188/filelists/apache2 diff --git a/config/rootfiles/core/188/filelists/arping b/config/rootfiles/oldcore/188/filelists/arping similarity index 100% rename from config/rootfiles/core/188/filelists/arping rename to config/rootfiles/oldcore/188/filelists/arping diff --git a/config/rootfiles/core/188/filelists/bash b/config/rootfiles/oldcore/188/filelists/bash similarity index 100% rename from config/rootfiles/core/188/filelists/bash rename to config/rootfiles/oldcore/188/filelists/bash diff --git a/config/rootfiles/core/188/filelists/btrfs-progs b/config/rootfiles/oldcore/188/filelists/btrfs-progs similarity index 100% rename from config/rootfiles/core/188/filelists/btrfs-progs rename to config/rootfiles/oldcore/188/filelists/btrfs-progs diff --git a/config/rootfiles/oldcore/188/filelists/core-files b/config/rootfiles/oldcore/188/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/188/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/188/filelists/coreutils b/config/rootfiles/oldcore/188/filelists/coreutils similarity index 100% rename from config/rootfiles/core/188/filelists/coreutils rename to config/rootfiles/oldcore/188/filelists/coreutils diff --git a/config/rootfiles/core/188/filelists/curl b/config/rootfiles/oldcore/188/filelists/curl similarity index 100% rename from config/rootfiles/core/188/filelists/curl rename to config/rootfiles/oldcore/188/filelists/curl diff --git a/config/rootfiles/core/188/filelists/cyrus-sasl b/config/rootfiles/oldcore/188/filelists/cyrus-sasl similarity index 100% rename from config/rootfiles/core/188/filelists/cyrus-sasl rename to config/rootfiles/oldcore/188/filelists/cyrus-sasl diff --git a/config/rootfiles/core/188/filelists/dhcp b/config/rootfiles/oldcore/188/filelists/dhcp similarity index 100% rename from config/rootfiles/core/188/filelists/dhcp rename to config/rootfiles/oldcore/188/filelists/dhcp diff --git a/config/rootfiles/core/188/filelists/e2fsprogs b/config/rootfiles/oldcore/188/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/188/filelists/e2fsprogs rename to config/rootfiles/oldcore/188/filelists/e2fsprogs diff --git a/config/rootfiles/core/188/filelists/exfatprogs b/config/rootfiles/oldcore/188/filelists/exfatprogs similarity index 100% rename from config/rootfiles/core/188/filelists/exfatprogs rename to config/rootfiles/oldcore/188/filelists/exfatprogs diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/oldcore/188/filelists/files similarity index 100% rename from config/rootfiles/core/188/filelists/files rename to config/rootfiles/oldcore/188/filelists/files diff --git a/config/rootfiles/core/188/filelists/findutils b/config/rootfiles/oldcore/188/filelists/findutils similarity index 100% rename from config/rootfiles/core/188/filelists/findutils rename to config/rootfiles/oldcore/188/filelists/findutils diff --git a/config/rootfiles/core/188/filelists/gettext b/config/rootfiles/oldcore/188/filelists/gettext similarity index 100% rename from config/rootfiles/core/188/filelists/gettext rename to config/rootfiles/oldcore/188/filelists/gettext diff --git a/config/rootfiles/core/188/filelists/hwdata b/config/rootfiles/oldcore/188/filelists/hwdata similarity index 100% rename from config/rootfiles/core/188/filelists/hwdata rename to config/rootfiles/oldcore/188/filelists/hwdata diff --git a/config/rootfiles/core/188/filelists/iana-etc b/config/rootfiles/oldcore/188/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/188/filelists/iana-etc rename to config/rootfiles/oldcore/188/filelists/iana-etc diff --git a/config/rootfiles/core/188/filelists/iproute2 b/config/rootfiles/oldcore/188/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/188/filelists/iproute2 rename to config/rootfiles/oldcore/188/filelists/iproute2 diff --git a/config/rootfiles/core/188/filelists/knot b/config/rootfiles/oldcore/188/filelists/knot similarity index 100% rename from config/rootfiles/core/188/filelists/knot rename to config/rootfiles/oldcore/188/filelists/knot diff --git a/config/rootfiles/core/188/filelists/less b/config/rootfiles/oldcore/188/filelists/less similarity index 100% rename from config/rootfiles/core/188/filelists/less rename to config/rootfiles/oldcore/188/filelists/less diff --git a/config/rootfiles/core/188/filelists/libarchive b/config/rootfiles/oldcore/188/filelists/libarchive similarity index 100% rename from config/rootfiles/core/188/filelists/libarchive rename to config/rootfiles/oldcore/188/filelists/libarchive diff --git a/config/rootfiles/core/188/filelists/libcap b/config/rootfiles/oldcore/188/filelists/libcap similarity index 100% rename from config/rootfiles/core/188/filelists/libcap rename to config/rootfiles/oldcore/188/filelists/libcap diff --git a/config/rootfiles/core/188/filelists/libcap-ng b/config/rootfiles/oldcore/188/filelists/libcap-ng similarity index 100% rename from config/rootfiles/core/188/filelists/libcap-ng rename to config/rootfiles/oldcore/188/filelists/libcap-ng diff --git a/config/rootfiles/core/188/filelists/libgcrypt b/config/rootfiles/oldcore/188/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/188/filelists/libgcrypt rename to config/rootfiles/oldcore/188/filelists/libgcrypt diff --git a/config/rootfiles/core/188/filelists/libgpg-error b/config/rootfiles/oldcore/188/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/188/filelists/libgpg-error rename to config/rootfiles/oldcore/188/filelists/libgpg-error diff --git a/config/rootfiles/core/188/filelists/libinih b/config/rootfiles/oldcore/188/filelists/libinih similarity index 100% rename from config/rootfiles/core/188/filelists/libinih rename to config/rootfiles/oldcore/188/filelists/libinih diff --git a/config/rootfiles/core/188/filelists/libjpeg b/config/rootfiles/oldcore/188/filelists/libjpeg similarity index 100% rename from config/rootfiles/core/188/filelists/libjpeg rename to config/rootfiles/oldcore/188/filelists/libjpeg diff --git a/config/rootfiles/core/188/filelists/libnet b/config/rootfiles/oldcore/188/filelists/libnet similarity index 100% rename from config/rootfiles/core/188/filelists/libnet rename to config/rootfiles/oldcore/188/filelists/libnet diff --git a/config/rootfiles/core/188/filelists/libnl-3 b/config/rootfiles/oldcore/188/filelists/libnl-3 similarity index 100% rename from config/rootfiles/core/188/filelists/libnl-3 rename to config/rootfiles/oldcore/188/filelists/libnl-3 diff --git a/config/rootfiles/core/188/filelists/libqmi b/config/rootfiles/oldcore/188/filelists/libqmi similarity index 100% rename from config/rootfiles/core/188/filelists/libqmi rename to config/rootfiles/oldcore/188/filelists/libqmi diff --git a/config/rootfiles/core/188/filelists/libsodium b/config/rootfiles/oldcore/188/filelists/libsodium similarity index 100% rename from config/rootfiles/core/188/filelists/libsodium rename to config/rootfiles/oldcore/188/filelists/libsodium diff --git a/config/rootfiles/core/188/filelists/libtiff b/config/rootfiles/oldcore/188/filelists/libtiff similarity index 100% rename from config/rootfiles/core/188/filelists/libtiff rename to config/rootfiles/oldcore/188/filelists/libtiff diff --git a/config/rootfiles/core/188/filelists/libtirpc b/config/rootfiles/oldcore/188/filelists/libtirpc similarity index 100% rename from config/rootfiles/core/188/filelists/libtirpc rename to config/rootfiles/oldcore/188/filelists/libtirpc diff --git a/config/rootfiles/core/188/filelists/libusb b/config/rootfiles/oldcore/188/filelists/libusb similarity index 100% rename from config/rootfiles/core/188/filelists/libusb rename to config/rootfiles/oldcore/188/filelists/libusb diff --git a/config/rootfiles/core/188/filelists/libuv b/config/rootfiles/oldcore/188/filelists/libuv similarity index 100% rename from config/rootfiles/core/188/filelists/libuv rename to config/rootfiles/oldcore/188/filelists/libuv diff --git a/config/rootfiles/core/188/filelists/libxml2 b/config/rootfiles/oldcore/188/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/188/filelists/libxml2 rename to config/rootfiles/oldcore/188/filelists/libxml2 diff --git a/config/rootfiles/core/188/filelists/libxslt b/config/rootfiles/oldcore/188/filelists/libxslt similarity index 100% rename from config/rootfiles/core/188/filelists/libxslt rename to config/rootfiles/oldcore/188/filelists/libxslt diff --git a/config/rootfiles/core/188/filelists/linux-atm b/config/rootfiles/oldcore/188/filelists/linux-atm similarity index 100% rename from config/rootfiles/core/188/filelists/linux-atm rename to config/rootfiles/oldcore/188/filelists/linux-atm diff --git a/config/rootfiles/core/188/filelists/lz4 b/config/rootfiles/oldcore/188/filelists/lz4 similarity index 100% rename from config/rootfiles/core/188/filelists/lz4 rename to config/rootfiles/oldcore/188/filelists/lz4 diff --git a/config/rootfiles/core/188/filelists/man-pages b/config/rootfiles/oldcore/188/filelists/man-pages similarity index 100% rename from config/rootfiles/core/188/filelists/man-pages rename to config/rootfiles/oldcore/188/filelists/man-pages diff --git a/config/rootfiles/core/188/filelists/nasm b/config/rootfiles/oldcore/188/filelists/nasm similarity index 100% rename from config/rootfiles/core/188/filelists/nasm rename to config/rootfiles/oldcore/188/filelists/nasm diff --git a/config/rootfiles/core/188/filelists/ncurses b/config/rootfiles/oldcore/188/filelists/ncurses similarity index 100% rename from config/rootfiles/core/188/filelists/ncurses rename to config/rootfiles/oldcore/188/filelists/ncurses diff --git a/config/rootfiles/core/188/filelists/pcre2 b/config/rootfiles/oldcore/188/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/188/filelists/pcre2 rename to config/rootfiles/oldcore/188/filelists/pcre2 diff --git a/config/rootfiles/core/188/filelists/poppler b/config/rootfiles/oldcore/188/filelists/poppler similarity index 100% rename from config/rootfiles/core/188/filelists/poppler rename to config/rootfiles/oldcore/188/filelists/poppler diff --git a/config/rootfiles/core/188/filelists/readline b/config/rootfiles/oldcore/188/filelists/readline similarity index 100% rename from config/rootfiles/core/188/filelists/readline rename to config/rootfiles/oldcore/188/filelists/readline diff --git a/config/rootfiles/core/188/filelists/riscv64/linux b/config/rootfiles/oldcore/188/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/188/filelists/riscv64/linux rename to config/rootfiles/oldcore/188/filelists/riscv64/linux diff --git a/config/rootfiles/core/188/filelists/riscv64/util-linux b/config/rootfiles/oldcore/188/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/188/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/188/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/188/filelists/rrdtool b/config/rootfiles/oldcore/188/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/188/filelists/rrdtool rename to config/rootfiles/oldcore/188/filelists/rrdtool diff --git a/config/rootfiles/core/188/filelists/shadow b/config/rootfiles/oldcore/188/filelists/shadow similarity index 100% rename from config/rootfiles/core/188/filelists/shadow rename to config/rootfiles/oldcore/188/filelists/shadow diff --git a/config/rootfiles/core/188/filelists/sqlite b/config/rootfiles/oldcore/188/filelists/sqlite similarity index 100% rename from config/rootfiles/core/188/filelists/sqlite rename to config/rootfiles/oldcore/188/filelists/sqlite diff --git a/config/rootfiles/core/188/filelists/suricata b/config/rootfiles/oldcore/188/filelists/suricata similarity index 100% rename from config/rootfiles/core/188/filelists/suricata rename to config/rootfiles/oldcore/188/filelists/suricata diff --git a/config/rootfiles/core/188/filelists/unbound b/config/rootfiles/oldcore/188/filelists/unbound similarity index 100% rename from config/rootfiles/core/188/filelists/unbound rename to config/rootfiles/oldcore/188/filelists/unbound diff --git a/config/rootfiles/core/188/filelists/web-user-interface b/config/rootfiles/oldcore/188/filelists/web-user-interface similarity index 100% rename from config/rootfiles/core/188/filelists/web-user-interface rename to config/rootfiles/oldcore/188/filelists/web-user-interface diff --git a/config/rootfiles/core/188/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/188/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/188/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/188/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/188/filelists/x86_64/linux b/config/rootfiles/oldcore/188/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/188/filelists/x86_64/linux rename to config/rootfiles/oldcore/188/filelists/x86_64/linux diff --git a/config/rootfiles/core/188/filelists/x86_64/util-linux b/config/rootfiles/oldcore/188/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/188/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/188/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/oldcore/188/update.sh similarity index 100% rename from config/rootfiles/core/188/update.sh rename to config/rootfiles/oldcore/188/update.sh diff --git a/make.sh b/make.sh index a541f19b2..dec7b3a45 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="188" # Core Level (Filename) +CORE="189" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir