From 8c1cc06d5f5766741fd7e5f36688b9773de4c1a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Fri, 14 Jan 2022 13:33:55 +0000 Subject: [PATCH] Start Core Update 164 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Müller --- config/rootfiles/core/{163 => 164}/core-files | 0 config/rootfiles/core/{163 => 164}/exclude | 0 .../core/{163 => 164/filelists}/files | 0 config/rootfiles/core/164/update.sh | 88 +++++++++++++++++++ config/rootfiles/oldcore/163/core-files | 5 ++ config/rootfiles/oldcore/163/exclude | 34 +++++++ .../{core => oldcore}/163/filelists/apache2 | 0 .../{core => oldcore}/163/filelists/bash | 0 .../163/filelists/ca-certificates | 0 .../{core => oldcore}/163/filelists/curl | 0 .../{core => oldcore}/163/filelists/e2fsprogs | 0 .../{core => oldcore}/163/filelists/ethtool | 0 .../163/filelists/exfatprogs | 0 .../{core => oldcore}/163/filelists/files | 0 .../{core => oldcore}/163/filelists/freetype | 0 .../{core => oldcore}/163/filelists/fribidi | 0 .../{core => oldcore}/163/filelists/gdb | 0 .../{core => oldcore}/163/filelists/glib | 0 .../{core => oldcore}/163/filelists/grep | 0 .../{core => oldcore}/163/filelists/gzip | 0 .../{core => oldcore}/163/filelists/harfbuzz | 0 .../{core => oldcore}/163/filelists/iproute2 | 0 .../163/filelists/libarchive | 0 .../{core => oldcore}/163/filelists/libcap | 0 .../{core => oldcore}/163/filelists/libedit | 0 .../{core => oldcore}/163/filelists/libgcrypt | 0 .../163/filelists/libgpg-error | 0 .../{core => oldcore}/163/filelists/libloc | 0 .../{core => oldcore}/163/filelists/libtasn1 | 0 .../{core => oldcore}/163/filelists/liburcu | 0 .../163/filelists/linux-firmware | 0 .../{core => oldcore}/163/filelists/m4 | 0 .../{core => oldcore}/163/filelists/ncurses | 0 .../{core => oldcore}/163/filelists/pam | 0 .../{core => oldcore}/163/filelists/pango | 0 .../{core => oldcore}/163/filelists/poppler | 0 .../{core => oldcore}/163/filelists/qpdf | 0 .../{core => oldcore}/163/filelists/rng-tools | 0 .../{core => oldcore}/163/filelists/sdparm | 0 .../{core => oldcore}/163/filelists/shadow | 0 .../{core => oldcore}/163/filelists/sqlite | 0 .../{core => oldcore}/163/filelists/squid | 0 .../{core => oldcore}/163/filelists/sudo | 0 .../{core => oldcore}/163/filelists/sysvinit | 0 .../{core => oldcore}/163/filelists/unbound | 0 .../{core => oldcore}/163/filelists/wget | 0 .../{core => oldcore}/163/filelists/xfsprogs | 0 config/rootfiles/oldcore/163/files | 0 .../rootfiles/{core => oldcore}/163/update.sh | 0 make.sh | 2 +- 50 files changed, 128 insertions(+), 1 deletion(-) rename config/rootfiles/core/{163 => 164}/core-files (100%) rename config/rootfiles/core/{163 => 164}/exclude (100%) rename config/rootfiles/core/{163 => 164/filelists}/files (100%) create mode 100644 config/rootfiles/core/164/update.sh create mode 100644 config/rootfiles/oldcore/163/core-files create mode 100644 config/rootfiles/oldcore/163/exclude rename config/rootfiles/{core => oldcore}/163/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/163/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/163/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/163/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/163/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/163/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/163/filelists/exfatprogs (100%) rename config/rootfiles/{core => oldcore}/163/filelists/files (100%) rename config/rootfiles/{core => oldcore}/163/filelists/freetype (100%) rename config/rootfiles/{core => oldcore}/163/filelists/fribidi (100%) rename config/rootfiles/{core => oldcore}/163/filelists/gdb (100%) rename config/rootfiles/{core => oldcore}/163/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/163/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/163/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/163/filelists/harfbuzz (100%) rename config/rootfiles/{core => oldcore}/163/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libedit (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/163/filelists/libtasn1 (100%) rename config/rootfiles/{core => oldcore}/163/filelists/liburcu (100%) rename config/rootfiles/{core => oldcore}/163/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/163/filelists/m4 (100%) rename config/rootfiles/{core => oldcore}/163/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/163/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/163/filelists/pango (100%) rename config/rootfiles/{core => oldcore}/163/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/163/filelists/qpdf (100%) rename config/rootfiles/{core => oldcore}/163/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/163/filelists/sdparm (100%) rename config/rootfiles/{core => oldcore}/163/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/163/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/163/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/163/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/163/filelists/sysvinit (100%) rename config/rootfiles/{core => oldcore}/163/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/163/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/163/filelists/xfsprogs (100%) create mode 100644 config/rootfiles/oldcore/163/files rename config/rootfiles/{core => oldcore}/163/update.sh (100%) diff --git a/config/rootfiles/core/163/core-files b/config/rootfiles/core/164/core-files similarity index 100% rename from config/rootfiles/core/163/core-files rename to config/rootfiles/core/164/core-files diff --git a/config/rootfiles/core/163/exclude b/config/rootfiles/core/164/exclude similarity index 100% rename from config/rootfiles/core/163/exclude rename to config/rootfiles/core/164/exclude diff --git a/config/rootfiles/core/163/files b/config/rootfiles/core/164/filelists/files similarity index 100% rename from config/rootfiles/core/163/files rename to config/rootfiles/core/164/filelists/files diff --git a/config/rootfiles/core/164/update.sh b/config/rootfiles/core/164/update.sh new file mode 100644 index 0000000000..2382a03953 --- /dev/null +++ b/config/rootfiles/core/164/update.sh @@ -0,0 +1,88 @@ +#!/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=164 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove files + +# Stop services + +# Extract files +extract_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/163/core-files b/config/rootfiles/oldcore/163/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/163/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/163/exclude b/config/rootfiles/oldcore/163/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/oldcore/163/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +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 +usr/share/xt_geoip +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/163/filelists/apache2 b/config/rootfiles/oldcore/163/filelists/apache2 similarity index 100% rename from config/rootfiles/core/163/filelists/apache2 rename to config/rootfiles/oldcore/163/filelists/apache2 diff --git a/config/rootfiles/core/163/filelists/bash b/config/rootfiles/oldcore/163/filelists/bash similarity index 100% rename from config/rootfiles/core/163/filelists/bash rename to config/rootfiles/oldcore/163/filelists/bash diff --git a/config/rootfiles/core/163/filelists/ca-certificates b/config/rootfiles/oldcore/163/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/163/filelists/ca-certificates rename to config/rootfiles/oldcore/163/filelists/ca-certificates diff --git a/config/rootfiles/core/163/filelists/curl b/config/rootfiles/oldcore/163/filelists/curl similarity index 100% rename from config/rootfiles/core/163/filelists/curl rename to config/rootfiles/oldcore/163/filelists/curl diff --git a/config/rootfiles/core/163/filelists/e2fsprogs b/config/rootfiles/oldcore/163/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/163/filelists/e2fsprogs rename to config/rootfiles/oldcore/163/filelists/e2fsprogs diff --git a/config/rootfiles/core/163/filelists/ethtool b/config/rootfiles/oldcore/163/filelists/ethtool similarity index 100% rename from config/rootfiles/core/163/filelists/ethtool rename to config/rootfiles/oldcore/163/filelists/ethtool diff --git a/config/rootfiles/core/163/filelists/exfatprogs b/config/rootfiles/oldcore/163/filelists/exfatprogs similarity index 100% rename from config/rootfiles/core/163/filelists/exfatprogs rename to config/rootfiles/oldcore/163/filelists/exfatprogs diff --git a/config/rootfiles/core/163/filelists/files b/config/rootfiles/oldcore/163/filelists/files similarity index 100% rename from config/rootfiles/core/163/filelists/files rename to config/rootfiles/oldcore/163/filelists/files diff --git a/config/rootfiles/core/163/filelists/freetype b/config/rootfiles/oldcore/163/filelists/freetype similarity index 100% rename from config/rootfiles/core/163/filelists/freetype rename to config/rootfiles/oldcore/163/filelists/freetype diff --git a/config/rootfiles/core/163/filelists/fribidi b/config/rootfiles/oldcore/163/filelists/fribidi similarity index 100% rename from config/rootfiles/core/163/filelists/fribidi rename to config/rootfiles/oldcore/163/filelists/fribidi diff --git a/config/rootfiles/core/163/filelists/gdb b/config/rootfiles/oldcore/163/filelists/gdb similarity index 100% rename from config/rootfiles/core/163/filelists/gdb rename to config/rootfiles/oldcore/163/filelists/gdb diff --git a/config/rootfiles/core/163/filelists/glib b/config/rootfiles/oldcore/163/filelists/glib similarity index 100% rename from config/rootfiles/core/163/filelists/glib rename to config/rootfiles/oldcore/163/filelists/glib diff --git a/config/rootfiles/core/163/filelists/grep b/config/rootfiles/oldcore/163/filelists/grep similarity index 100% rename from config/rootfiles/core/163/filelists/grep rename to config/rootfiles/oldcore/163/filelists/grep diff --git a/config/rootfiles/core/163/filelists/gzip b/config/rootfiles/oldcore/163/filelists/gzip similarity index 100% rename from config/rootfiles/core/163/filelists/gzip rename to config/rootfiles/oldcore/163/filelists/gzip diff --git a/config/rootfiles/core/163/filelists/harfbuzz b/config/rootfiles/oldcore/163/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/163/filelists/harfbuzz rename to config/rootfiles/oldcore/163/filelists/harfbuzz diff --git a/config/rootfiles/core/163/filelists/iproute2 b/config/rootfiles/oldcore/163/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/163/filelists/iproute2 rename to config/rootfiles/oldcore/163/filelists/iproute2 diff --git a/config/rootfiles/core/163/filelists/libarchive b/config/rootfiles/oldcore/163/filelists/libarchive similarity index 100% rename from config/rootfiles/core/163/filelists/libarchive rename to config/rootfiles/oldcore/163/filelists/libarchive diff --git a/config/rootfiles/core/163/filelists/libcap b/config/rootfiles/oldcore/163/filelists/libcap similarity index 100% rename from config/rootfiles/core/163/filelists/libcap rename to config/rootfiles/oldcore/163/filelists/libcap diff --git a/config/rootfiles/core/163/filelists/libedit b/config/rootfiles/oldcore/163/filelists/libedit similarity index 100% rename from config/rootfiles/core/163/filelists/libedit rename to config/rootfiles/oldcore/163/filelists/libedit diff --git a/config/rootfiles/core/163/filelists/libgcrypt b/config/rootfiles/oldcore/163/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/163/filelists/libgcrypt rename to config/rootfiles/oldcore/163/filelists/libgcrypt diff --git a/config/rootfiles/core/163/filelists/libgpg-error b/config/rootfiles/oldcore/163/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/163/filelists/libgpg-error rename to config/rootfiles/oldcore/163/filelists/libgpg-error diff --git a/config/rootfiles/core/163/filelists/libloc b/config/rootfiles/oldcore/163/filelists/libloc similarity index 100% rename from config/rootfiles/core/163/filelists/libloc rename to config/rootfiles/oldcore/163/filelists/libloc diff --git a/config/rootfiles/core/163/filelists/libtasn1 b/config/rootfiles/oldcore/163/filelists/libtasn1 similarity index 100% rename from config/rootfiles/core/163/filelists/libtasn1 rename to config/rootfiles/oldcore/163/filelists/libtasn1 diff --git a/config/rootfiles/core/163/filelists/liburcu b/config/rootfiles/oldcore/163/filelists/liburcu similarity index 100% rename from config/rootfiles/core/163/filelists/liburcu rename to config/rootfiles/oldcore/163/filelists/liburcu diff --git a/config/rootfiles/core/163/filelists/linux-firmware b/config/rootfiles/oldcore/163/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/163/filelists/linux-firmware rename to config/rootfiles/oldcore/163/filelists/linux-firmware diff --git a/config/rootfiles/core/163/filelists/m4 b/config/rootfiles/oldcore/163/filelists/m4 similarity index 100% rename from config/rootfiles/core/163/filelists/m4 rename to config/rootfiles/oldcore/163/filelists/m4 diff --git a/config/rootfiles/core/163/filelists/ncurses b/config/rootfiles/oldcore/163/filelists/ncurses similarity index 100% rename from config/rootfiles/core/163/filelists/ncurses rename to config/rootfiles/oldcore/163/filelists/ncurses diff --git a/config/rootfiles/core/163/filelists/pam b/config/rootfiles/oldcore/163/filelists/pam similarity index 100% rename from config/rootfiles/core/163/filelists/pam rename to config/rootfiles/oldcore/163/filelists/pam diff --git a/config/rootfiles/core/163/filelists/pango b/config/rootfiles/oldcore/163/filelists/pango similarity index 100% rename from config/rootfiles/core/163/filelists/pango rename to config/rootfiles/oldcore/163/filelists/pango diff --git a/config/rootfiles/core/163/filelists/poppler b/config/rootfiles/oldcore/163/filelists/poppler similarity index 100% rename from config/rootfiles/core/163/filelists/poppler rename to config/rootfiles/oldcore/163/filelists/poppler diff --git a/config/rootfiles/core/163/filelists/qpdf b/config/rootfiles/oldcore/163/filelists/qpdf similarity index 100% rename from config/rootfiles/core/163/filelists/qpdf rename to config/rootfiles/oldcore/163/filelists/qpdf diff --git a/config/rootfiles/core/163/filelists/rng-tools b/config/rootfiles/oldcore/163/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/163/filelists/rng-tools rename to config/rootfiles/oldcore/163/filelists/rng-tools diff --git a/config/rootfiles/core/163/filelists/sdparm b/config/rootfiles/oldcore/163/filelists/sdparm similarity index 100% rename from config/rootfiles/core/163/filelists/sdparm rename to config/rootfiles/oldcore/163/filelists/sdparm diff --git a/config/rootfiles/core/163/filelists/shadow b/config/rootfiles/oldcore/163/filelists/shadow similarity index 100% rename from config/rootfiles/core/163/filelists/shadow rename to config/rootfiles/oldcore/163/filelists/shadow diff --git a/config/rootfiles/core/163/filelists/sqlite b/config/rootfiles/oldcore/163/filelists/sqlite similarity index 100% rename from config/rootfiles/core/163/filelists/sqlite rename to config/rootfiles/oldcore/163/filelists/sqlite diff --git a/config/rootfiles/core/163/filelists/squid b/config/rootfiles/oldcore/163/filelists/squid similarity index 100% rename from config/rootfiles/core/163/filelists/squid rename to config/rootfiles/oldcore/163/filelists/squid diff --git a/config/rootfiles/core/163/filelists/sudo b/config/rootfiles/oldcore/163/filelists/sudo similarity index 100% rename from config/rootfiles/core/163/filelists/sudo rename to config/rootfiles/oldcore/163/filelists/sudo diff --git a/config/rootfiles/core/163/filelists/sysvinit b/config/rootfiles/oldcore/163/filelists/sysvinit similarity index 100% rename from config/rootfiles/core/163/filelists/sysvinit rename to config/rootfiles/oldcore/163/filelists/sysvinit diff --git a/config/rootfiles/core/163/filelists/unbound b/config/rootfiles/oldcore/163/filelists/unbound similarity index 100% rename from config/rootfiles/core/163/filelists/unbound rename to config/rootfiles/oldcore/163/filelists/unbound diff --git a/config/rootfiles/core/163/filelists/wget b/config/rootfiles/oldcore/163/filelists/wget similarity index 100% rename from config/rootfiles/core/163/filelists/wget rename to config/rootfiles/oldcore/163/filelists/wget diff --git a/config/rootfiles/core/163/filelists/xfsprogs b/config/rootfiles/oldcore/163/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/163/filelists/xfsprogs rename to config/rootfiles/oldcore/163/filelists/xfsprogs diff --git a/config/rootfiles/oldcore/163/files b/config/rootfiles/oldcore/163/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/163/update.sh b/config/rootfiles/oldcore/163/update.sh similarity index 100% rename from config/rootfiles/core/163/update.sh rename to config/rootfiles/oldcore/163/update.sh diff --git a/make.sh b/make.sh index 7568ee232f..51d3acc854 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,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="163" # Core Level (Filename) +CORE="164" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.2