From ffe528be289f5605ead71b1ae0560468a5d87866 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Jan 2024 11:33:43 +0000 Subject: [PATCH] Start Core Update 184 Signed-off-by: Michael Tremer --- config/rootfiles/core/{183 => 184}/exclude | 0 .../core/{183 => 184}/filelists/core-files | 0 config/rootfiles/core/184/filelists/files | 0 config/rootfiles/core/184/update.sh | 70 +++++++++++++++++++ config/rootfiles/oldcore/183/exclude | 35 ++++++++++ .../183/filelists/aarch64/grub | 0 .../183/filelists/aarch64/linux | 0 .../{core => oldcore}/183/filelists/apache2 | 0 .../{core => oldcore}/183/filelists/bash | 0 .../{core => oldcore}/183/filelists/bind | 0 .../oldcore/183/filelists/core-files | 5 ++ .../{core => oldcore}/183/filelists/cpio | 0 .../{core => oldcore}/183/filelists/dracut | 0 .../{core => oldcore}/183/filelists/files | 0 .../183/filelists/fontconfig | 0 .../{core => oldcore}/183/filelists/gnutls | 0 .../{core => oldcore}/183/filelists/iptables | 0 .../{core => oldcore}/183/filelists/iputils | 0 .../{core => oldcore}/183/filelists/kbd | 0 .../{core => oldcore}/183/filelists/kmod | 0 .../{core => oldcore}/183/filelists/lcms2 | 0 .../{core => oldcore}/183/filelists/libgcrypt | 0 .../{core => oldcore}/183/filelists/libnl-3 | 0 .../{core => oldcore}/183/filelists/libssh | 0 .../{core => oldcore}/183/filelists/libxml2 | 0 .../{core => oldcore}/183/filelists/lmdb | 0 .../{core => oldcore}/183/filelists/lsof | 0 .../{core => oldcore}/183/filelists/openssh | 0 .../{core => oldcore}/183/filelists/openssl | 0 .../{core => oldcore}/183/filelists/p11-kit | 0 .../{core => oldcore}/183/filelists/qpdf | 0 .../183/filelists/riscv64/grub | 0 .../183/filelists/riscv64/linux | 0 .../183/filelists/strongswan | 0 .../{core => oldcore}/183/filelists/sudo | 0 .../{core => oldcore}/183/filelists/tzdata | 0 .../183/filelists/web-user-interface | 0 .../183/filelists/x86_64/grub | 0 .../183/filelists/x86_64/linux | 0 .../rootfiles/{core => oldcore}/183/update.sh | 0 make.sh | 2 +- 41 files changed, 111 insertions(+), 1 deletion(-) rename config/rootfiles/core/{183 => 184}/exclude (100%) rename config/rootfiles/core/{183 => 184}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/184/filelists/files create mode 100644 config/rootfiles/core/184/update.sh create mode 100644 config/rootfiles/oldcore/183/exclude rename config/rootfiles/{core => oldcore}/183/filelists/aarch64/grub (100%) rename config/rootfiles/{core => oldcore}/183/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/183/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/183/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/183/filelists/bind (100%) create mode 100644 config/rootfiles/oldcore/183/filelists/core-files rename config/rootfiles/{core => oldcore}/183/filelists/cpio (100%) rename config/rootfiles/{core => oldcore}/183/filelists/dracut (100%) rename config/rootfiles/{core => oldcore}/183/filelists/files (100%) rename config/rootfiles/{core => oldcore}/183/filelists/fontconfig (100%) rename config/rootfiles/{core => oldcore}/183/filelists/gnutls (100%) rename config/rootfiles/{core => oldcore}/183/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/183/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/183/filelists/kbd (100%) rename config/rootfiles/{core => oldcore}/183/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/183/filelists/lcms2 (100%) rename config/rootfiles/{core => oldcore}/183/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/183/filelists/libnl-3 (100%) rename config/rootfiles/{core => oldcore}/183/filelists/libssh (100%) rename config/rootfiles/{core => oldcore}/183/filelists/libxml2 (100%) rename config/rootfiles/{core => oldcore}/183/filelists/lmdb (100%) rename config/rootfiles/{core => oldcore}/183/filelists/lsof (100%) rename config/rootfiles/{core => oldcore}/183/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/183/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/183/filelists/p11-kit (100%) rename config/rootfiles/{core => oldcore}/183/filelists/qpdf (100%) rename config/rootfiles/{core => oldcore}/183/filelists/riscv64/grub (100%) rename config/rootfiles/{core => oldcore}/183/filelists/riscv64/linux (100%) rename config/rootfiles/{core => oldcore}/183/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/183/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/183/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/183/filelists/web-user-interface (100%) rename config/rootfiles/{core => oldcore}/183/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/183/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/183/update.sh (100%) diff --git a/config/rootfiles/core/183/exclude b/config/rootfiles/core/184/exclude similarity index 100% rename from config/rootfiles/core/183/exclude rename to config/rootfiles/core/184/exclude diff --git a/config/rootfiles/core/183/filelists/core-files b/config/rootfiles/core/184/filelists/core-files similarity index 100% rename from config/rootfiles/core/183/filelists/core-files rename to config/rootfiles/core/184/filelists/core-files diff --git a/config/rootfiles/core/184/filelists/files b/config/rootfiles/core/184/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/update.sh new file mode 100644 index 0000000000..1059d1a1ba --- /dev/null +++ b/config/rootfiles/core/184/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) 2023 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=184 + +# 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/oldcore/183/exclude b/config/rootfiles/oldcore/183/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/183/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/183/filelists/aarch64/grub b/config/rootfiles/oldcore/183/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/183/filelists/aarch64/grub rename to config/rootfiles/oldcore/183/filelists/aarch64/grub diff --git a/config/rootfiles/core/183/filelists/aarch64/linux b/config/rootfiles/oldcore/183/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/183/filelists/aarch64/linux rename to config/rootfiles/oldcore/183/filelists/aarch64/linux diff --git a/config/rootfiles/core/183/filelists/apache2 b/config/rootfiles/oldcore/183/filelists/apache2 similarity index 100% rename from config/rootfiles/core/183/filelists/apache2 rename to config/rootfiles/oldcore/183/filelists/apache2 diff --git a/config/rootfiles/core/183/filelists/bash b/config/rootfiles/oldcore/183/filelists/bash similarity index 100% rename from config/rootfiles/core/183/filelists/bash rename to config/rootfiles/oldcore/183/filelists/bash diff --git a/config/rootfiles/core/183/filelists/bind b/config/rootfiles/oldcore/183/filelists/bind similarity index 100% rename from config/rootfiles/core/183/filelists/bind rename to config/rootfiles/oldcore/183/filelists/bind diff --git a/config/rootfiles/oldcore/183/filelists/core-files b/config/rootfiles/oldcore/183/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/183/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/183/filelists/cpio b/config/rootfiles/oldcore/183/filelists/cpio similarity index 100% rename from config/rootfiles/core/183/filelists/cpio rename to config/rootfiles/oldcore/183/filelists/cpio diff --git a/config/rootfiles/core/183/filelists/dracut b/config/rootfiles/oldcore/183/filelists/dracut similarity index 100% rename from config/rootfiles/core/183/filelists/dracut rename to config/rootfiles/oldcore/183/filelists/dracut diff --git a/config/rootfiles/core/183/filelists/files b/config/rootfiles/oldcore/183/filelists/files similarity index 100% rename from config/rootfiles/core/183/filelists/files rename to config/rootfiles/oldcore/183/filelists/files diff --git a/config/rootfiles/core/183/filelists/fontconfig b/config/rootfiles/oldcore/183/filelists/fontconfig similarity index 100% rename from config/rootfiles/core/183/filelists/fontconfig rename to config/rootfiles/oldcore/183/filelists/fontconfig diff --git a/config/rootfiles/core/183/filelists/gnutls b/config/rootfiles/oldcore/183/filelists/gnutls similarity index 100% rename from config/rootfiles/core/183/filelists/gnutls rename to config/rootfiles/oldcore/183/filelists/gnutls diff --git a/config/rootfiles/core/183/filelists/iptables b/config/rootfiles/oldcore/183/filelists/iptables similarity index 100% rename from config/rootfiles/core/183/filelists/iptables rename to config/rootfiles/oldcore/183/filelists/iptables diff --git a/config/rootfiles/core/183/filelists/iputils b/config/rootfiles/oldcore/183/filelists/iputils similarity index 100% rename from config/rootfiles/core/183/filelists/iputils rename to config/rootfiles/oldcore/183/filelists/iputils diff --git a/config/rootfiles/core/183/filelists/kbd b/config/rootfiles/oldcore/183/filelists/kbd similarity index 100% rename from config/rootfiles/core/183/filelists/kbd rename to config/rootfiles/oldcore/183/filelists/kbd diff --git a/config/rootfiles/core/183/filelists/kmod b/config/rootfiles/oldcore/183/filelists/kmod similarity index 100% rename from config/rootfiles/core/183/filelists/kmod rename to config/rootfiles/oldcore/183/filelists/kmod diff --git a/config/rootfiles/core/183/filelists/lcms2 b/config/rootfiles/oldcore/183/filelists/lcms2 similarity index 100% rename from config/rootfiles/core/183/filelists/lcms2 rename to config/rootfiles/oldcore/183/filelists/lcms2 diff --git a/config/rootfiles/core/183/filelists/libgcrypt b/config/rootfiles/oldcore/183/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/183/filelists/libgcrypt rename to config/rootfiles/oldcore/183/filelists/libgcrypt diff --git a/config/rootfiles/core/183/filelists/libnl-3 b/config/rootfiles/oldcore/183/filelists/libnl-3 similarity index 100% rename from config/rootfiles/core/183/filelists/libnl-3 rename to config/rootfiles/oldcore/183/filelists/libnl-3 diff --git a/config/rootfiles/core/183/filelists/libssh b/config/rootfiles/oldcore/183/filelists/libssh similarity index 100% rename from config/rootfiles/core/183/filelists/libssh rename to config/rootfiles/oldcore/183/filelists/libssh diff --git a/config/rootfiles/core/183/filelists/libxml2 b/config/rootfiles/oldcore/183/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/183/filelists/libxml2 rename to config/rootfiles/oldcore/183/filelists/libxml2 diff --git a/config/rootfiles/core/183/filelists/lmdb b/config/rootfiles/oldcore/183/filelists/lmdb similarity index 100% rename from config/rootfiles/core/183/filelists/lmdb rename to config/rootfiles/oldcore/183/filelists/lmdb diff --git a/config/rootfiles/core/183/filelists/lsof b/config/rootfiles/oldcore/183/filelists/lsof similarity index 100% rename from config/rootfiles/core/183/filelists/lsof rename to config/rootfiles/oldcore/183/filelists/lsof diff --git a/config/rootfiles/core/183/filelists/openssh b/config/rootfiles/oldcore/183/filelists/openssh similarity index 100% rename from config/rootfiles/core/183/filelists/openssh rename to config/rootfiles/oldcore/183/filelists/openssh diff --git a/config/rootfiles/core/183/filelists/openssl b/config/rootfiles/oldcore/183/filelists/openssl similarity index 100% rename from config/rootfiles/core/183/filelists/openssl rename to config/rootfiles/oldcore/183/filelists/openssl diff --git a/config/rootfiles/core/183/filelists/p11-kit b/config/rootfiles/oldcore/183/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/183/filelists/p11-kit rename to config/rootfiles/oldcore/183/filelists/p11-kit diff --git a/config/rootfiles/core/183/filelists/qpdf b/config/rootfiles/oldcore/183/filelists/qpdf similarity index 100% rename from config/rootfiles/core/183/filelists/qpdf rename to config/rootfiles/oldcore/183/filelists/qpdf diff --git a/config/rootfiles/core/183/filelists/riscv64/grub b/config/rootfiles/oldcore/183/filelists/riscv64/grub similarity index 100% rename from config/rootfiles/core/183/filelists/riscv64/grub rename to config/rootfiles/oldcore/183/filelists/riscv64/grub diff --git a/config/rootfiles/core/183/filelists/riscv64/linux b/config/rootfiles/oldcore/183/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/183/filelists/riscv64/linux rename to config/rootfiles/oldcore/183/filelists/riscv64/linux diff --git a/config/rootfiles/core/183/filelists/strongswan b/config/rootfiles/oldcore/183/filelists/strongswan similarity index 100% rename from config/rootfiles/core/183/filelists/strongswan rename to config/rootfiles/oldcore/183/filelists/strongswan diff --git a/config/rootfiles/core/183/filelists/sudo b/config/rootfiles/oldcore/183/filelists/sudo similarity index 100% rename from config/rootfiles/core/183/filelists/sudo rename to config/rootfiles/oldcore/183/filelists/sudo diff --git a/config/rootfiles/core/183/filelists/tzdata b/config/rootfiles/oldcore/183/filelists/tzdata similarity index 100% rename from config/rootfiles/core/183/filelists/tzdata rename to config/rootfiles/oldcore/183/filelists/tzdata diff --git a/config/rootfiles/core/183/filelists/web-user-interface b/config/rootfiles/oldcore/183/filelists/web-user-interface similarity index 100% rename from config/rootfiles/core/183/filelists/web-user-interface rename to config/rootfiles/oldcore/183/filelists/web-user-interface diff --git a/config/rootfiles/core/183/filelists/x86_64/grub b/config/rootfiles/oldcore/183/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/183/filelists/x86_64/grub rename to config/rootfiles/oldcore/183/filelists/x86_64/grub diff --git a/config/rootfiles/core/183/filelists/x86_64/linux b/config/rootfiles/oldcore/183/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/183/filelists/x86_64/linux rename to config/rootfiles/oldcore/183/filelists/x86_64/linux diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/oldcore/183/update.sh similarity index 100% rename from config/rootfiles/core/183/update.sh rename to config/rootfiles/oldcore/183/update.sh diff --git a/make.sh b/make.sh index 06e09c9a3e..7877a642c5 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="183" # Core Level (Filename) +CORE="184" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.5