diff --git a/config/rootfiles/core/174/exclude b/config/rootfiles/core/175/exclude similarity index 100% rename from config/rootfiles/core/174/exclude rename to config/rootfiles/core/175/exclude diff --git a/config/rootfiles/core/174/filelists/core-files b/config/rootfiles/core/175/filelists/core-files similarity index 100% rename from config/rootfiles/core/174/filelists/core-files rename to config/rootfiles/core/175/filelists/core-files diff --git a/config/rootfiles/core/175/filelists/files b/config/rootfiles/core/175/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh new file mode 100644 index 000000000..ad8ebed54 --- /dev/null +++ b/config/rootfiles/core/175/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) 2023 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=175 + +# 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 + +# 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/174/exclude b/config/rootfiles/oldcore/174/exclude new file mode 100644 index 000000000..378c2d563 --- /dev/null +++ b/config/rootfiles/oldcore/174/exclude @@ -0,0 +1,34 @@ +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/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/174/filelists/aarch64/binutils b/config/rootfiles/oldcore/174/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/174/filelists/aarch64/binutils rename to config/rootfiles/oldcore/174/filelists/aarch64/binutils diff --git a/config/rootfiles/core/174/filelists/aarch64/boost b/config/rootfiles/oldcore/174/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/174/filelists/aarch64/boost rename to config/rootfiles/oldcore/174/filelists/aarch64/boost diff --git a/config/rootfiles/core/174/filelists/aarch64/efivar b/config/rootfiles/oldcore/174/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/174/filelists/aarch64/efivar rename to config/rootfiles/oldcore/174/filelists/aarch64/efivar diff --git a/config/rootfiles/core/174/filelists/aarch64/gcc b/config/rootfiles/oldcore/174/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/174/filelists/aarch64/gcc rename to config/rootfiles/oldcore/174/filelists/aarch64/gcc diff --git a/config/rootfiles/core/174/filelists/aarch64/glibc b/config/rootfiles/oldcore/174/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/174/filelists/aarch64/glibc rename to config/rootfiles/oldcore/174/filelists/aarch64/glibc diff --git a/config/rootfiles/core/174/filelists/apache2 b/config/rootfiles/oldcore/174/filelists/apache2 similarity index 100% rename from config/rootfiles/core/174/filelists/apache2 rename to config/rootfiles/oldcore/174/filelists/apache2 diff --git a/config/rootfiles/core/174/filelists/apr b/config/rootfiles/oldcore/174/filelists/apr similarity index 100% rename from config/rootfiles/core/174/filelists/apr rename to config/rootfiles/oldcore/174/filelists/apr diff --git a/config/rootfiles/core/174/filelists/bind b/config/rootfiles/oldcore/174/filelists/bind similarity index 100% rename from config/rootfiles/core/174/filelists/bind rename to config/rootfiles/oldcore/174/filelists/bind diff --git a/config/rootfiles/core/174/filelists/ca-certificates b/config/rootfiles/oldcore/174/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/174/filelists/ca-certificates rename to config/rootfiles/oldcore/174/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/174/filelists/core-files b/config/rootfiles/oldcore/174/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/174/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/174/filelists/curl b/config/rootfiles/oldcore/174/filelists/curl similarity index 100% rename from config/rootfiles/core/174/filelists/curl rename to config/rootfiles/oldcore/174/filelists/curl diff --git a/config/rootfiles/core/174/filelists/e2fsprogs b/config/rootfiles/oldcore/174/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/174/filelists/e2fsprogs rename to config/rootfiles/oldcore/174/filelists/e2fsprogs diff --git a/config/rootfiles/core/174/filelists/elinks b/config/rootfiles/oldcore/174/filelists/elinks similarity index 100% rename from config/rootfiles/core/174/filelists/elinks rename to config/rootfiles/oldcore/174/filelists/elinks diff --git a/config/rootfiles/core/174/filelists/ethtool b/config/rootfiles/oldcore/174/filelists/ethtool similarity index 100% rename from config/rootfiles/core/174/filelists/ethtool rename to config/rootfiles/oldcore/174/filelists/ethtool diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/oldcore/174/filelists/files similarity index 100% rename from config/rootfiles/core/174/filelists/files rename to config/rootfiles/oldcore/174/filelists/files diff --git a/config/rootfiles/core/174/filelists/freetype b/config/rootfiles/oldcore/174/filelists/freetype similarity index 100% rename from config/rootfiles/core/174/filelists/freetype rename to config/rootfiles/oldcore/174/filelists/freetype diff --git a/config/rootfiles/core/174/filelists/gnutls b/config/rootfiles/oldcore/174/filelists/gnutls similarity index 100% rename from config/rootfiles/core/174/filelists/gnutls rename to config/rootfiles/oldcore/174/filelists/gnutls diff --git a/config/rootfiles/core/174/filelists/grep b/config/rootfiles/oldcore/174/filelists/grep similarity index 100% rename from config/rootfiles/core/174/filelists/grep rename to config/rootfiles/oldcore/174/filelists/grep diff --git a/config/rootfiles/core/174/filelists/harfbuzz b/config/rootfiles/oldcore/174/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/174/filelists/harfbuzz rename to config/rootfiles/oldcore/174/filelists/harfbuzz diff --git a/config/rootfiles/core/174/filelists/iproute2 b/config/rootfiles/oldcore/174/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/174/filelists/iproute2 rename to config/rootfiles/oldcore/174/filelists/iproute2 diff --git a/config/rootfiles/core/174/filelists/libtirpc b/config/rootfiles/oldcore/174/filelists/libtirpc similarity index 100% rename from config/rootfiles/core/174/filelists/libtirpc rename to config/rootfiles/oldcore/174/filelists/libtirpc diff --git a/config/rootfiles/core/174/filelists/liburcu b/config/rootfiles/oldcore/174/filelists/liburcu similarity index 100% rename from config/rootfiles/core/174/filelists/liburcu rename to config/rootfiles/oldcore/174/filelists/liburcu diff --git a/config/rootfiles/core/174/filelists/lmdb b/config/rootfiles/oldcore/174/filelists/lmdb similarity index 100% rename from config/rootfiles/core/174/filelists/lmdb rename to config/rootfiles/oldcore/174/filelists/lmdb diff --git a/config/rootfiles/core/174/filelists/logwatch b/config/rootfiles/oldcore/174/filelists/logwatch similarity index 100% rename from config/rootfiles/core/174/filelists/logwatch rename to config/rootfiles/oldcore/174/filelists/logwatch diff --git a/config/rootfiles/core/174/filelists/lsof b/config/rootfiles/oldcore/174/filelists/lsof similarity index 100% rename from config/rootfiles/core/174/filelists/lsof rename to config/rootfiles/oldcore/174/filelists/lsof diff --git a/config/rootfiles/core/174/filelists/pango b/config/rootfiles/oldcore/174/filelists/pango similarity index 100% rename from config/rootfiles/core/174/filelists/pango rename to config/rootfiles/oldcore/174/filelists/pango diff --git a/config/rootfiles/core/174/filelists/perl-TimeDate b/config/rootfiles/oldcore/174/filelists/perl-TimeDate similarity index 100% rename from config/rootfiles/core/174/filelists/perl-TimeDate rename to config/rootfiles/oldcore/174/filelists/perl-TimeDate diff --git a/config/rootfiles/core/174/filelists/poppler b/config/rootfiles/oldcore/174/filelists/poppler similarity index 100% rename from config/rootfiles/core/174/filelists/poppler rename to config/rootfiles/oldcore/174/filelists/poppler diff --git a/config/rootfiles/core/174/filelists/poppler-data b/config/rootfiles/oldcore/174/filelists/poppler-data similarity index 100% rename from config/rootfiles/core/174/filelists/poppler-data rename to config/rootfiles/oldcore/174/filelists/poppler-data diff --git a/config/rootfiles/core/174/filelists/qpdf b/config/rootfiles/oldcore/174/filelists/qpdf similarity index 100% rename from config/rootfiles/core/174/filelists/qpdf rename to config/rootfiles/oldcore/174/filelists/qpdf diff --git a/config/rootfiles/core/174/filelists/squid b/config/rootfiles/oldcore/174/filelists/squid similarity index 100% rename from config/rootfiles/core/174/filelists/squid rename to config/rootfiles/oldcore/174/filelists/squid diff --git a/config/rootfiles/core/174/filelists/strongswan b/config/rootfiles/oldcore/174/filelists/strongswan similarity index 100% rename from config/rootfiles/core/174/filelists/strongswan rename to config/rootfiles/oldcore/174/filelists/strongswan diff --git a/config/rootfiles/core/174/filelists/sudo b/config/rootfiles/oldcore/174/filelists/sudo similarity index 100% rename from config/rootfiles/core/174/filelists/sudo rename to config/rootfiles/oldcore/174/filelists/sudo diff --git a/config/rootfiles/core/174/filelists/tzdata b/config/rootfiles/oldcore/174/filelists/tzdata similarity index 100% rename from config/rootfiles/core/174/filelists/tzdata rename to config/rootfiles/oldcore/174/filelists/tzdata diff --git a/config/rootfiles/core/174/filelists/wireless-regdb b/config/rootfiles/oldcore/174/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/174/filelists/wireless-regdb rename to config/rootfiles/oldcore/174/filelists/wireless-regdb diff --git a/config/rootfiles/core/174/filelists/x86_64/binutils b/config/rootfiles/oldcore/174/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/binutils rename to config/rootfiles/oldcore/174/filelists/x86_64/binutils diff --git a/config/rootfiles/core/174/filelists/x86_64/boost b/config/rootfiles/oldcore/174/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/boost rename to config/rootfiles/oldcore/174/filelists/x86_64/boost diff --git a/config/rootfiles/core/174/filelists/x86_64/efivar b/config/rootfiles/oldcore/174/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/efivar rename to config/rootfiles/oldcore/174/filelists/x86_64/efivar diff --git a/config/rootfiles/core/174/filelists/x86_64/gcc b/config/rootfiles/oldcore/174/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/gcc rename to config/rootfiles/oldcore/174/filelists/x86_64/gcc diff --git a/config/rootfiles/core/174/filelists/x86_64/glibc b/config/rootfiles/oldcore/174/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/glibc rename to config/rootfiles/oldcore/174/filelists/x86_64/glibc diff --git a/config/rootfiles/core/174/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/174/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/174/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/174/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/174/filelists/zstd b/config/rootfiles/oldcore/174/filelists/zstd similarity index 100% rename from config/rootfiles/core/174/filelists/zstd rename to config/rootfiles/oldcore/174/filelists/zstd diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/oldcore/174/update.sh similarity index 100% rename from config/rootfiles/core/174/update.sh rename to config/rootfiles/oldcore/174/update.sh diff --git a/make.sh b/make.sh index 3b7f9850c..b545078ea 100755 --- a/make.sh +++ b/make.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -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.27" # Version number -CORE="174" # Core Level (Filename) +CORE="175" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop