From: Michael Tremer Date: Fri, 10 Feb 2023 09:33:36 +0000 (+0000) Subject: Start Core Update 174 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=668164608a66a9f4140c57b47196b71e0d3b47d9;p=people%2Fstevee%2Fipfire-2.x.git Start Core Update 174 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/173/exclude b/config/rootfiles/core/174/exclude similarity index 100% rename from config/rootfiles/core/173/exclude rename to config/rootfiles/core/174/exclude diff --git a/config/rootfiles/core/173/core-files b/config/rootfiles/core/174/filelists/core-files similarity index 100% rename from config/rootfiles/core/173/core-files rename to config/rootfiles/core/174/filelists/core-files diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh new file mode 100644 index 0000000000..e3b4db15d0 --- /dev/null +++ b/config/rootfiles/core/174/update.sh @@ -0,0 +1,69 @@ +#!/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) 2022 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=174 + +# 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 + +# update linker config +ldconfig + +# Remove files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# Regenerate all initrds + +# 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/173/core-files b/config/rootfiles/oldcore/173/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/173/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/oldcore/173/exclude b/config/rootfiles/oldcore/173/exclude new file mode 100644 index 0000000000..378c2d5632 --- /dev/null +++ b/config/rootfiles/oldcore/173/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/173/filelists/aarch64/linux b/config/rootfiles/oldcore/173/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/173/filelists/aarch64/linux rename to config/rootfiles/oldcore/173/filelists/aarch64/linux diff --git a/config/rootfiles/core/173/filelists/apache2 b/config/rootfiles/oldcore/173/filelists/apache2 similarity index 100% rename from config/rootfiles/core/173/filelists/apache2 rename to config/rootfiles/oldcore/173/filelists/apache2 diff --git a/config/rootfiles/core/173/filelists/armv6l/linux b/config/rootfiles/oldcore/173/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/173/filelists/armv6l/linux rename to config/rootfiles/oldcore/173/filelists/armv6l/linux diff --git a/config/rootfiles/core/173/filelists/bind b/config/rootfiles/oldcore/173/filelists/bind similarity index 100% rename from config/rootfiles/core/173/filelists/bind rename to config/rootfiles/oldcore/173/filelists/bind diff --git a/config/rootfiles/core/173/filelists/core-files b/config/rootfiles/oldcore/173/filelists/core-files similarity index 100% rename from config/rootfiles/core/173/filelists/core-files rename to config/rootfiles/oldcore/173/filelists/core-files diff --git a/config/rootfiles/core/173/filelists/coreutils b/config/rootfiles/oldcore/173/filelists/coreutils similarity index 100% rename from config/rootfiles/core/173/filelists/coreutils rename to config/rootfiles/oldcore/173/filelists/coreutils diff --git a/config/rootfiles/core/173/filelists/curl b/config/rootfiles/oldcore/173/filelists/curl similarity index 100% rename from config/rootfiles/core/173/filelists/curl rename to config/rootfiles/oldcore/173/filelists/curl diff --git a/config/rootfiles/core/173/filelists/dracut b/config/rootfiles/oldcore/173/filelists/dracut similarity index 100% rename from config/rootfiles/core/173/filelists/dracut rename to config/rootfiles/oldcore/173/filelists/dracut diff --git a/config/rootfiles/core/173/filelists/ethtool b/config/rootfiles/oldcore/173/filelists/ethtool similarity index 100% rename from config/rootfiles/core/173/filelists/ethtool rename to config/rootfiles/oldcore/173/filelists/ethtool diff --git a/config/rootfiles/core/173/filelists/file b/config/rootfiles/oldcore/173/filelists/file similarity index 100% rename from config/rootfiles/core/173/filelists/file rename to config/rootfiles/oldcore/173/filelists/file diff --git a/config/rootfiles/core/173/filelists/files b/config/rootfiles/oldcore/173/filelists/files similarity index 100% rename from config/rootfiles/core/173/filelists/files rename to config/rootfiles/oldcore/173/filelists/files diff --git a/config/rootfiles/core/173/filelists/fontconfig b/config/rootfiles/oldcore/173/filelists/fontconfig similarity index 100% rename from config/rootfiles/core/173/filelists/fontconfig rename to config/rootfiles/oldcore/173/filelists/fontconfig diff --git a/config/rootfiles/core/173/filelists/fuse b/config/rootfiles/oldcore/173/filelists/fuse similarity index 100% rename from config/rootfiles/core/173/filelists/fuse rename to config/rootfiles/oldcore/173/filelists/fuse diff --git a/config/rootfiles/core/173/filelists/grep b/config/rootfiles/oldcore/173/filelists/grep similarity index 100% rename from config/rootfiles/core/173/filelists/grep rename to config/rootfiles/oldcore/173/filelists/grep diff --git a/config/rootfiles/core/173/filelists/harfbuzz b/config/rootfiles/oldcore/173/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/173/filelists/harfbuzz rename to config/rootfiles/oldcore/173/filelists/harfbuzz diff --git a/config/rootfiles/core/173/filelists/hdparm b/config/rootfiles/oldcore/173/filelists/hdparm similarity index 100% rename from config/rootfiles/core/173/filelists/hdparm rename to config/rootfiles/oldcore/173/filelists/hdparm diff --git a/config/rootfiles/core/173/filelists/hwdata b/config/rootfiles/oldcore/173/filelists/hwdata similarity index 100% rename from config/rootfiles/core/173/filelists/hwdata rename to config/rootfiles/oldcore/173/filelists/hwdata diff --git a/config/rootfiles/core/173/filelists/iana-etc b/config/rootfiles/oldcore/173/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/173/filelists/iana-etc rename to config/rootfiles/oldcore/173/filelists/iana-etc diff --git a/config/rootfiles/core/173/filelists/iproute2 b/config/rootfiles/oldcore/173/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/173/filelists/iproute2 rename to config/rootfiles/oldcore/173/filelists/iproute2 diff --git a/config/rootfiles/core/173/filelists/ipset b/config/rootfiles/oldcore/173/filelists/ipset similarity index 100% rename from config/rootfiles/core/173/filelists/ipset rename to config/rootfiles/oldcore/173/filelists/ipset diff --git a/config/rootfiles/core/173/filelists/iptables b/config/rootfiles/oldcore/173/filelists/iptables similarity index 100% rename from config/rootfiles/core/173/filelists/iptables rename to config/rootfiles/oldcore/173/filelists/iptables diff --git a/config/rootfiles/core/173/filelists/iputils b/config/rootfiles/oldcore/173/filelists/iputils similarity index 100% rename from config/rootfiles/core/173/filelists/iputils rename to config/rootfiles/oldcore/173/filelists/iputils diff --git a/config/rootfiles/core/173/filelists/iw b/config/rootfiles/oldcore/173/filelists/iw similarity index 100% rename from config/rootfiles/core/173/filelists/iw rename to config/rootfiles/oldcore/173/filelists/iw diff --git a/config/rootfiles/core/173/filelists/jquery b/config/rootfiles/oldcore/173/filelists/jquery similarity index 100% rename from config/rootfiles/core/173/filelists/jquery rename to config/rootfiles/oldcore/173/filelists/jquery diff --git a/config/rootfiles/core/173/filelists/json-c b/config/rootfiles/oldcore/173/filelists/json-c similarity index 100% rename from config/rootfiles/core/173/filelists/json-c rename to config/rootfiles/oldcore/173/filelists/json-c diff --git a/config/rootfiles/core/173/filelists/keyutils b/config/rootfiles/oldcore/173/filelists/keyutils similarity index 100% rename from config/rootfiles/core/173/filelists/keyutils rename to config/rootfiles/oldcore/173/filelists/keyutils diff --git a/config/rootfiles/core/173/filelists/knot b/config/rootfiles/oldcore/173/filelists/knot similarity index 100% rename from config/rootfiles/core/173/filelists/knot rename to config/rootfiles/oldcore/173/filelists/knot diff --git a/config/rootfiles/core/173/filelists/krb5 b/config/rootfiles/oldcore/173/filelists/krb5 similarity index 100% rename from config/rootfiles/core/173/filelists/krb5 rename to config/rootfiles/oldcore/173/filelists/krb5 diff --git a/config/rootfiles/core/173/filelists/lcms2 b/config/rootfiles/oldcore/173/filelists/lcms2 similarity index 100% rename from config/rootfiles/core/173/filelists/lcms2 rename to config/rootfiles/oldcore/173/filelists/lcms2 diff --git a/config/rootfiles/core/173/filelists/less b/config/rootfiles/oldcore/173/filelists/less similarity index 100% rename from config/rootfiles/core/173/filelists/less rename to config/rootfiles/oldcore/173/filelists/less diff --git a/config/rootfiles/core/173/filelists/libarchive b/config/rootfiles/oldcore/173/filelists/libarchive similarity index 100% rename from config/rootfiles/core/173/filelists/libarchive rename to config/rootfiles/oldcore/173/filelists/libarchive diff --git a/config/rootfiles/core/173/filelists/libcap b/config/rootfiles/oldcore/173/filelists/libcap similarity index 100% rename from config/rootfiles/core/173/filelists/libcap rename to config/rootfiles/oldcore/173/filelists/libcap diff --git a/config/rootfiles/core/173/filelists/libconfig b/config/rootfiles/oldcore/173/filelists/libconfig similarity index 100% rename from config/rootfiles/core/173/filelists/libconfig rename to config/rootfiles/oldcore/173/filelists/libconfig diff --git a/config/rootfiles/core/173/filelists/libffi b/config/rootfiles/oldcore/173/filelists/libffi similarity index 100% rename from config/rootfiles/core/173/filelists/libffi rename to config/rootfiles/oldcore/173/filelists/libffi diff --git a/config/rootfiles/core/173/filelists/libgpg-error b/config/rootfiles/oldcore/173/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/173/filelists/libgpg-error rename to config/rootfiles/oldcore/173/filelists/libgpg-error diff --git a/config/rootfiles/core/173/filelists/libgudev b/config/rootfiles/oldcore/173/filelists/libgudev similarity index 100% rename from config/rootfiles/core/173/filelists/libgudev rename to config/rootfiles/oldcore/173/filelists/libgudev diff --git a/config/rootfiles/core/173/filelists/libidn b/config/rootfiles/oldcore/173/filelists/libidn similarity index 100% rename from config/rootfiles/core/173/filelists/libidn rename to config/rootfiles/oldcore/173/filelists/libidn diff --git a/config/rootfiles/core/173/filelists/libinih b/config/rootfiles/oldcore/173/filelists/libinih similarity index 100% rename from config/rootfiles/core/173/filelists/libinih rename to config/rootfiles/oldcore/173/filelists/libinih diff --git a/config/rootfiles/core/173/filelists/libjpeg b/config/rootfiles/oldcore/173/filelists/libjpeg similarity index 100% rename from config/rootfiles/core/173/filelists/libjpeg rename to config/rootfiles/oldcore/173/filelists/libjpeg diff --git a/config/rootfiles/core/173/filelists/libloc b/config/rootfiles/oldcore/173/filelists/libloc similarity index 100% rename from config/rootfiles/core/173/filelists/libloc rename to config/rootfiles/oldcore/173/filelists/libloc diff --git a/config/rootfiles/core/173/filelists/libmpc b/config/rootfiles/oldcore/173/filelists/libmpc similarity index 100% rename from config/rootfiles/core/173/filelists/libmpc rename to config/rootfiles/oldcore/173/filelists/libmpc diff --git a/config/rootfiles/core/173/filelists/libpcap b/config/rootfiles/oldcore/173/filelists/libpcap similarity index 100% rename from config/rootfiles/core/173/filelists/libpcap rename to config/rootfiles/oldcore/173/filelists/libpcap diff --git a/config/rootfiles/core/173/filelists/libqmi b/config/rootfiles/oldcore/173/filelists/libqmi similarity index 100% rename from config/rootfiles/core/173/filelists/libqmi rename to config/rootfiles/oldcore/173/filelists/libqmi diff --git a/config/rootfiles/core/173/filelists/libssh b/config/rootfiles/oldcore/173/filelists/libssh similarity index 100% rename from config/rootfiles/core/173/filelists/libssh rename to config/rootfiles/oldcore/173/filelists/libssh diff --git a/config/rootfiles/core/173/filelists/libstatgrab b/config/rootfiles/oldcore/173/filelists/libstatgrab similarity index 100% rename from config/rootfiles/core/173/filelists/libstatgrab rename to config/rootfiles/oldcore/173/filelists/libstatgrab diff --git a/config/rootfiles/core/173/filelists/libtiff b/config/rootfiles/oldcore/173/filelists/libtiff similarity index 100% rename from config/rootfiles/core/173/filelists/libtiff rename to config/rootfiles/oldcore/173/filelists/libtiff diff --git a/config/rootfiles/core/173/filelists/libtirpc b/config/rootfiles/oldcore/173/filelists/libtirpc similarity index 100% rename from config/rootfiles/core/173/filelists/libtirpc rename to config/rootfiles/oldcore/173/filelists/libtirpc diff --git a/config/rootfiles/core/173/filelists/libtool b/config/rootfiles/oldcore/173/filelists/libtool similarity index 100% rename from config/rootfiles/core/173/filelists/libtool rename to config/rootfiles/oldcore/173/filelists/libtool diff --git a/config/rootfiles/core/173/filelists/libusb b/config/rootfiles/oldcore/173/filelists/libusb similarity index 100% rename from config/rootfiles/core/173/filelists/libusb rename to config/rootfiles/oldcore/173/filelists/libusb diff --git a/config/rootfiles/core/173/filelists/libxslt b/config/rootfiles/oldcore/173/filelists/libxslt similarity index 100% rename from config/rootfiles/core/173/filelists/libxslt rename to config/rootfiles/oldcore/173/filelists/libxslt diff --git a/config/rootfiles/core/173/filelists/libyang b/config/rootfiles/oldcore/173/filelists/libyang similarity index 100% rename from config/rootfiles/core/173/filelists/libyang rename to config/rootfiles/oldcore/173/filelists/libyang diff --git a/config/rootfiles/core/173/filelists/logrotate b/config/rootfiles/oldcore/173/filelists/logrotate similarity index 100% rename from config/rootfiles/core/173/filelists/logrotate rename to config/rootfiles/oldcore/173/filelists/logrotate diff --git a/config/rootfiles/core/173/filelists/lsof b/config/rootfiles/oldcore/173/filelists/lsof similarity index 100% rename from config/rootfiles/core/173/filelists/lsof rename to config/rootfiles/oldcore/173/filelists/lsof diff --git a/config/rootfiles/core/173/filelists/lz4 b/config/rootfiles/oldcore/173/filelists/lz4 similarity index 100% rename from config/rootfiles/core/173/filelists/lz4 rename to config/rootfiles/oldcore/173/filelists/lz4 diff --git a/config/rootfiles/core/173/filelists/mpfr b/config/rootfiles/oldcore/173/filelists/mpfr similarity index 100% rename from config/rootfiles/core/173/filelists/mpfr rename to config/rootfiles/oldcore/173/filelists/mpfr diff --git a/config/rootfiles/core/173/filelists/nano b/config/rootfiles/oldcore/173/filelists/nano similarity index 100% rename from config/rootfiles/core/173/filelists/nano rename to config/rootfiles/oldcore/173/filelists/nano diff --git a/config/rootfiles/core/173/filelists/ncurses b/config/rootfiles/oldcore/173/filelists/ncurses similarity index 100% rename from config/rootfiles/core/173/filelists/ncurses rename to config/rootfiles/oldcore/173/filelists/ncurses diff --git a/config/rootfiles/core/173/filelists/openssh b/config/rootfiles/oldcore/173/filelists/openssh similarity index 100% rename from config/rootfiles/core/173/filelists/openssh rename to config/rootfiles/oldcore/173/filelists/openssh diff --git a/config/rootfiles/core/173/filelists/openssl b/config/rootfiles/oldcore/173/filelists/openssl similarity index 100% rename from config/rootfiles/core/173/filelists/openssl rename to config/rootfiles/oldcore/173/filelists/openssl diff --git a/config/rootfiles/core/173/filelists/openvpn b/config/rootfiles/oldcore/173/filelists/openvpn similarity index 100% rename from config/rootfiles/core/173/filelists/openvpn rename to config/rootfiles/oldcore/173/filelists/openvpn diff --git a/config/rootfiles/core/173/filelists/pcre2 b/config/rootfiles/oldcore/173/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/173/filelists/pcre2 rename to config/rootfiles/oldcore/173/filelists/pcre2 diff --git a/config/rootfiles/core/173/filelists/perl-HTML-Parser b/config/rootfiles/oldcore/173/filelists/perl-HTML-Parser similarity index 100% rename from config/rootfiles/core/173/filelists/perl-HTML-Parser rename to config/rootfiles/oldcore/173/filelists/perl-HTML-Parser diff --git a/config/rootfiles/core/173/filelists/poppler b/config/rootfiles/oldcore/173/filelists/poppler similarity index 100% rename from config/rootfiles/core/173/filelists/poppler rename to config/rootfiles/oldcore/173/filelists/poppler diff --git a/config/rootfiles/core/173/filelists/psmisc b/config/rootfiles/oldcore/173/filelists/psmisc similarity index 100% rename from config/rootfiles/core/173/filelists/psmisc rename to config/rootfiles/oldcore/173/filelists/psmisc diff --git a/config/rootfiles/core/173/filelists/shadow b/config/rootfiles/oldcore/173/filelists/shadow similarity index 100% rename from config/rootfiles/core/173/filelists/shadow rename to config/rootfiles/oldcore/173/filelists/shadow diff --git a/config/rootfiles/core/173/filelists/sqlite b/config/rootfiles/oldcore/173/filelists/sqlite similarity index 100% rename from config/rootfiles/core/173/filelists/sqlite rename to config/rootfiles/oldcore/173/filelists/sqlite diff --git a/config/rootfiles/core/173/filelists/squid-asnbl b/config/rootfiles/oldcore/173/filelists/squid-asnbl similarity index 100% rename from config/rootfiles/core/173/filelists/squid-asnbl rename to config/rootfiles/oldcore/173/filelists/squid-asnbl diff --git a/config/rootfiles/core/173/filelists/strongswan b/config/rootfiles/oldcore/173/filelists/strongswan similarity index 100% rename from config/rootfiles/core/173/filelists/strongswan rename to config/rootfiles/oldcore/173/filelists/strongswan diff --git a/config/rootfiles/core/173/filelists/sudo b/config/rootfiles/oldcore/173/filelists/sudo similarity index 100% rename from config/rootfiles/core/173/filelists/sudo rename to config/rootfiles/oldcore/173/filelists/sudo diff --git a/config/rootfiles/core/173/filelists/suricata b/config/rootfiles/oldcore/173/filelists/suricata similarity index 100% rename from config/rootfiles/core/173/filelists/suricata rename to config/rootfiles/oldcore/173/filelists/suricata diff --git a/config/rootfiles/core/173/filelists/x86_64/files b/config/rootfiles/oldcore/173/filelists/x86_64/files similarity index 100% rename from config/rootfiles/core/173/filelists/x86_64/files rename to config/rootfiles/oldcore/173/filelists/x86_64/files diff --git a/config/rootfiles/core/173/filelists/x86_64/linux b/config/rootfiles/oldcore/173/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/173/filelists/x86_64/linux rename to config/rootfiles/oldcore/173/filelists/x86_64/linux diff --git a/config/rootfiles/core/173/filelists/xfsprogs b/config/rootfiles/oldcore/173/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/173/filelists/xfsprogs rename to config/rootfiles/oldcore/173/filelists/xfsprogs diff --git a/config/rootfiles/core/173/filelists/xz b/config/rootfiles/oldcore/173/filelists/xz similarity index 100% rename from config/rootfiles/core/173/filelists/xz rename to config/rootfiles/oldcore/173/filelists/xz diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/oldcore/173/update.sh similarity index 100% rename from config/rootfiles/core/173/update.sh rename to config/rootfiles/oldcore/173/update.sh diff --git a/make.sh b/make.sh index a4a0200c4a..c6a592ba7a 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.27" # Version number -CORE="173" # Core Level (Filename) +CORE="174" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop