From 384302344cbc6a923757ba1c0e575f2a2463366e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Sat, 1 Jul 2023 18:55:36 +0000 Subject: [PATCH] Start Core Update 177 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Müller --- config/rootfiles/core/{176 => 177}/exclude | 0 .../core/{176 => 177}/filelists/core-files | 0 config/rootfiles/core/177/filelists/files | 0 config/rootfiles/core/177/update.sh | 67 +++++++++++++++++++ config/rootfiles/oldcore/176/exclude | 34 ++++++++++ .../176/filelists/aarch64/binutils | 0 .../176/filelists/aarch64/gcc | 0 .../176/filelists/aarch64/glibc | 0 .../{core => oldcore}/176/filelists/bind | 0 .../{core => oldcore}/176/filelists/collectd | 0 .../oldcore/176/filelists/core-files | 5 ++ .../{core => oldcore}/176/filelists/curl | 0 .../176/filelists/cyrus-sasl | 0 .../{core => oldcore}/176/filelists/dhcpcd | 0 .../{core => oldcore}/176/filelists/diffutils | 0 .../{core => oldcore}/176/filelists/ed | 0 .../{core => oldcore}/176/filelists/elinks | 0 .../{core => oldcore}/176/filelists/ethtool | 0 .../{core => oldcore}/176/filelists/files | 0 .../{core => oldcore}/176/filelists/freetype | 0 .../{core => oldcore}/176/filelists/gawk | 0 .../{core => oldcore}/176/filelists/gnutls | 0 .../{core => oldcore}/176/filelists/grep | 0 .../{core => oldcore}/176/filelists/harfbuzz | 0 .../{core => oldcore}/176/filelists/kmod | 0 .../{core => oldcore}/176/filelists/krb5 | 0 .../{core => oldcore}/176/filelists/less | 0 .../176/filelists/libarchive | 0 .../{core => oldcore}/176/filelists/libcap | 0 .../{core => oldcore}/176/filelists/libevent2 | 0 .../{core => oldcore}/176/filelists/libhtp | 0 .../{core => oldcore}/176/filelists/libloc | 0 .../{core => oldcore}/176/filelists/libssh | 0 .../{core => oldcore}/176/filelists/man | 0 .../176/filelists/misc-progs | 0 .../{core => oldcore}/176/filelists/mpfr | 0 .../{core => oldcore}/176/filelists/nettle | 0 .../{core => oldcore}/176/filelists/pam | 0 .../{core => oldcore}/176/filelists/pciutils | 0 .../{core => oldcore}/176/filelists/procps | 0 .../{core => oldcore}/176/filelists/qpdf | 0 .../{core => oldcore}/176/filelists/sqlite | 0 .../176/filelists/strongswan | 0 .../{core => oldcore}/176/filelists/sudo | 0 .../{core => oldcore}/176/filelists/suricata | 0 .../{core => oldcore}/176/filelists/udev | 0 .../{core => oldcore}/176/filelists/wget | 0 .../{core => oldcore}/176/filelists/whois | 0 .../176/filelists/x86_64/binutils | 0 .../176/filelists/x86_64/gcc | 0 .../176/filelists/x86_64/glibc | 0 .../176/filelists/x86_64/intel-microcode | 0 .../rootfiles/{core => oldcore}/176/update.sh | 0 make.sh | 2 +- 54 files changed, 107 insertions(+), 1 deletion(-) rename config/rootfiles/core/{176 => 177}/exclude (100%) rename config/rootfiles/core/{176 => 177}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/177/filelists/files create mode 100644 config/rootfiles/core/177/update.sh create mode 100644 config/rootfiles/oldcore/176/exclude rename config/rootfiles/{core => oldcore}/176/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/176/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/176/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/176/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/176/filelists/collectd (100%) create mode 100644 config/rootfiles/oldcore/176/filelists/core-files rename config/rootfiles/{core => oldcore}/176/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/176/filelists/cyrus-sasl (100%) rename config/rootfiles/{core => oldcore}/176/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/176/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/176/filelists/ed (100%) rename config/rootfiles/{core => oldcore}/176/filelists/elinks (100%) rename config/rootfiles/{core => oldcore}/176/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/176/filelists/files (100%) rename config/rootfiles/{core => oldcore}/176/filelists/freetype (100%) rename config/rootfiles/{core => oldcore}/176/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/176/filelists/gnutls (100%) rename config/rootfiles/{core => oldcore}/176/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/176/filelists/harfbuzz (100%) rename config/rootfiles/{core => oldcore}/176/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/176/filelists/krb5 (100%) rename config/rootfiles/{core => oldcore}/176/filelists/less (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libevent2 (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/176/filelists/libssh (100%) rename config/rootfiles/{core => oldcore}/176/filelists/man (100%) rename config/rootfiles/{core => oldcore}/176/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/176/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/176/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/176/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/176/filelists/pciutils (100%) rename config/rootfiles/{core => oldcore}/176/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/176/filelists/qpdf (100%) rename config/rootfiles/{core => oldcore}/176/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/176/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/176/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/176/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/176/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/176/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/176/filelists/whois (100%) rename config/rootfiles/{core => oldcore}/176/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/176/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/176/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/176/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/176/update.sh (100%) diff --git a/config/rootfiles/core/176/exclude b/config/rootfiles/core/177/exclude similarity index 100% rename from config/rootfiles/core/176/exclude rename to config/rootfiles/core/177/exclude diff --git a/config/rootfiles/core/176/filelists/core-files b/config/rootfiles/core/177/filelists/core-files similarity index 100% rename from config/rootfiles/core/176/filelists/core-files rename to config/rootfiles/core/177/filelists/core-files diff --git a/config/rootfiles/core/177/filelists/files b/config/rootfiles/core/177/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh new file mode 100644 index 0000000000..f3eed0dfb0 --- /dev/null +++ b/config/rootfiles/core/177/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=177 + +# 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/176/exclude b/config/rootfiles/oldcore/176/exclude new file mode 100644 index 0000000000..378c2d5632 --- /dev/null +++ b/config/rootfiles/oldcore/176/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/176/filelists/aarch64/binutils b/config/rootfiles/oldcore/176/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/176/filelists/aarch64/binutils rename to config/rootfiles/oldcore/176/filelists/aarch64/binutils diff --git a/config/rootfiles/core/176/filelists/aarch64/gcc b/config/rootfiles/oldcore/176/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/176/filelists/aarch64/gcc rename to config/rootfiles/oldcore/176/filelists/aarch64/gcc diff --git a/config/rootfiles/core/176/filelists/aarch64/glibc b/config/rootfiles/oldcore/176/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/176/filelists/aarch64/glibc rename to config/rootfiles/oldcore/176/filelists/aarch64/glibc diff --git a/config/rootfiles/core/176/filelists/bind b/config/rootfiles/oldcore/176/filelists/bind similarity index 100% rename from config/rootfiles/core/176/filelists/bind rename to config/rootfiles/oldcore/176/filelists/bind diff --git a/config/rootfiles/core/176/filelists/collectd b/config/rootfiles/oldcore/176/filelists/collectd similarity index 100% rename from config/rootfiles/core/176/filelists/collectd rename to config/rootfiles/oldcore/176/filelists/collectd diff --git a/config/rootfiles/oldcore/176/filelists/core-files b/config/rootfiles/oldcore/176/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/176/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/176/filelists/curl b/config/rootfiles/oldcore/176/filelists/curl similarity index 100% rename from config/rootfiles/core/176/filelists/curl rename to config/rootfiles/oldcore/176/filelists/curl diff --git a/config/rootfiles/core/176/filelists/cyrus-sasl b/config/rootfiles/oldcore/176/filelists/cyrus-sasl similarity index 100% rename from config/rootfiles/core/176/filelists/cyrus-sasl rename to config/rootfiles/oldcore/176/filelists/cyrus-sasl diff --git a/config/rootfiles/core/176/filelists/dhcpcd b/config/rootfiles/oldcore/176/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/176/filelists/dhcpcd rename to config/rootfiles/oldcore/176/filelists/dhcpcd diff --git a/config/rootfiles/core/176/filelists/diffutils b/config/rootfiles/oldcore/176/filelists/diffutils similarity index 100% rename from config/rootfiles/core/176/filelists/diffutils rename to config/rootfiles/oldcore/176/filelists/diffutils diff --git a/config/rootfiles/core/176/filelists/ed b/config/rootfiles/oldcore/176/filelists/ed similarity index 100% rename from config/rootfiles/core/176/filelists/ed rename to config/rootfiles/oldcore/176/filelists/ed diff --git a/config/rootfiles/core/176/filelists/elinks b/config/rootfiles/oldcore/176/filelists/elinks similarity index 100% rename from config/rootfiles/core/176/filelists/elinks rename to config/rootfiles/oldcore/176/filelists/elinks diff --git a/config/rootfiles/core/176/filelists/ethtool b/config/rootfiles/oldcore/176/filelists/ethtool similarity index 100% rename from config/rootfiles/core/176/filelists/ethtool rename to config/rootfiles/oldcore/176/filelists/ethtool diff --git a/config/rootfiles/core/176/filelists/files b/config/rootfiles/oldcore/176/filelists/files similarity index 100% rename from config/rootfiles/core/176/filelists/files rename to config/rootfiles/oldcore/176/filelists/files diff --git a/config/rootfiles/core/176/filelists/freetype b/config/rootfiles/oldcore/176/filelists/freetype similarity index 100% rename from config/rootfiles/core/176/filelists/freetype rename to config/rootfiles/oldcore/176/filelists/freetype diff --git a/config/rootfiles/core/176/filelists/gawk b/config/rootfiles/oldcore/176/filelists/gawk similarity index 100% rename from config/rootfiles/core/176/filelists/gawk rename to config/rootfiles/oldcore/176/filelists/gawk diff --git a/config/rootfiles/core/176/filelists/gnutls b/config/rootfiles/oldcore/176/filelists/gnutls similarity index 100% rename from config/rootfiles/core/176/filelists/gnutls rename to config/rootfiles/oldcore/176/filelists/gnutls diff --git a/config/rootfiles/core/176/filelists/grep b/config/rootfiles/oldcore/176/filelists/grep similarity index 100% rename from config/rootfiles/core/176/filelists/grep rename to config/rootfiles/oldcore/176/filelists/grep diff --git a/config/rootfiles/core/176/filelists/harfbuzz b/config/rootfiles/oldcore/176/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/176/filelists/harfbuzz rename to config/rootfiles/oldcore/176/filelists/harfbuzz diff --git a/config/rootfiles/core/176/filelists/kmod b/config/rootfiles/oldcore/176/filelists/kmod similarity index 100% rename from config/rootfiles/core/176/filelists/kmod rename to config/rootfiles/oldcore/176/filelists/kmod diff --git a/config/rootfiles/core/176/filelists/krb5 b/config/rootfiles/oldcore/176/filelists/krb5 similarity index 100% rename from config/rootfiles/core/176/filelists/krb5 rename to config/rootfiles/oldcore/176/filelists/krb5 diff --git a/config/rootfiles/core/176/filelists/less b/config/rootfiles/oldcore/176/filelists/less similarity index 100% rename from config/rootfiles/core/176/filelists/less rename to config/rootfiles/oldcore/176/filelists/less diff --git a/config/rootfiles/core/176/filelists/libarchive b/config/rootfiles/oldcore/176/filelists/libarchive similarity index 100% rename from config/rootfiles/core/176/filelists/libarchive rename to config/rootfiles/oldcore/176/filelists/libarchive diff --git a/config/rootfiles/core/176/filelists/libcap b/config/rootfiles/oldcore/176/filelists/libcap similarity index 100% rename from config/rootfiles/core/176/filelists/libcap rename to config/rootfiles/oldcore/176/filelists/libcap diff --git a/config/rootfiles/core/176/filelists/libevent2 b/config/rootfiles/oldcore/176/filelists/libevent2 similarity index 100% rename from config/rootfiles/core/176/filelists/libevent2 rename to config/rootfiles/oldcore/176/filelists/libevent2 diff --git a/config/rootfiles/core/176/filelists/libhtp b/config/rootfiles/oldcore/176/filelists/libhtp similarity index 100% rename from config/rootfiles/core/176/filelists/libhtp rename to config/rootfiles/oldcore/176/filelists/libhtp diff --git a/config/rootfiles/core/176/filelists/libloc b/config/rootfiles/oldcore/176/filelists/libloc similarity index 100% rename from config/rootfiles/core/176/filelists/libloc rename to config/rootfiles/oldcore/176/filelists/libloc diff --git a/config/rootfiles/core/176/filelists/libssh b/config/rootfiles/oldcore/176/filelists/libssh similarity index 100% rename from config/rootfiles/core/176/filelists/libssh rename to config/rootfiles/oldcore/176/filelists/libssh diff --git a/config/rootfiles/core/176/filelists/man b/config/rootfiles/oldcore/176/filelists/man similarity index 100% rename from config/rootfiles/core/176/filelists/man rename to config/rootfiles/oldcore/176/filelists/man diff --git a/config/rootfiles/core/176/filelists/misc-progs b/config/rootfiles/oldcore/176/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/176/filelists/misc-progs rename to config/rootfiles/oldcore/176/filelists/misc-progs diff --git a/config/rootfiles/core/176/filelists/mpfr b/config/rootfiles/oldcore/176/filelists/mpfr similarity index 100% rename from config/rootfiles/core/176/filelists/mpfr rename to config/rootfiles/oldcore/176/filelists/mpfr diff --git a/config/rootfiles/core/176/filelists/nettle b/config/rootfiles/oldcore/176/filelists/nettle similarity index 100% rename from config/rootfiles/core/176/filelists/nettle rename to config/rootfiles/oldcore/176/filelists/nettle diff --git a/config/rootfiles/core/176/filelists/pam b/config/rootfiles/oldcore/176/filelists/pam similarity index 100% rename from config/rootfiles/core/176/filelists/pam rename to config/rootfiles/oldcore/176/filelists/pam diff --git a/config/rootfiles/core/176/filelists/pciutils b/config/rootfiles/oldcore/176/filelists/pciutils similarity index 100% rename from config/rootfiles/core/176/filelists/pciutils rename to config/rootfiles/oldcore/176/filelists/pciutils diff --git a/config/rootfiles/core/176/filelists/procps b/config/rootfiles/oldcore/176/filelists/procps similarity index 100% rename from config/rootfiles/core/176/filelists/procps rename to config/rootfiles/oldcore/176/filelists/procps diff --git a/config/rootfiles/core/176/filelists/qpdf b/config/rootfiles/oldcore/176/filelists/qpdf similarity index 100% rename from config/rootfiles/core/176/filelists/qpdf rename to config/rootfiles/oldcore/176/filelists/qpdf diff --git a/config/rootfiles/core/176/filelists/sqlite b/config/rootfiles/oldcore/176/filelists/sqlite similarity index 100% rename from config/rootfiles/core/176/filelists/sqlite rename to config/rootfiles/oldcore/176/filelists/sqlite diff --git a/config/rootfiles/core/176/filelists/strongswan b/config/rootfiles/oldcore/176/filelists/strongswan similarity index 100% rename from config/rootfiles/core/176/filelists/strongswan rename to config/rootfiles/oldcore/176/filelists/strongswan diff --git a/config/rootfiles/core/176/filelists/sudo b/config/rootfiles/oldcore/176/filelists/sudo similarity index 100% rename from config/rootfiles/core/176/filelists/sudo rename to config/rootfiles/oldcore/176/filelists/sudo diff --git a/config/rootfiles/core/176/filelists/suricata b/config/rootfiles/oldcore/176/filelists/suricata similarity index 100% rename from config/rootfiles/core/176/filelists/suricata rename to config/rootfiles/oldcore/176/filelists/suricata diff --git a/config/rootfiles/core/176/filelists/udev b/config/rootfiles/oldcore/176/filelists/udev similarity index 100% rename from config/rootfiles/core/176/filelists/udev rename to config/rootfiles/oldcore/176/filelists/udev diff --git a/config/rootfiles/core/176/filelists/wget b/config/rootfiles/oldcore/176/filelists/wget similarity index 100% rename from config/rootfiles/core/176/filelists/wget rename to config/rootfiles/oldcore/176/filelists/wget diff --git a/config/rootfiles/core/176/filelists/whois b/config/rootfiles/oldcore/176/filelists/whois similarity index 100% rename from config/rootfiles/core/176/filelists/whois rename to config/rootfiles/oldcore/176/filelists/whois diff --git a/config/rootfiles/core/176/filelists/x86_64/binutils b/config/rootfiles/oldcore/176/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/176/filelists/x86_64/binutils rename to config/rootfiles/oldcore/176/filelists/x86_64/binutils diff --git a/config/rootfiles/core/176/filelists/x86_64/gcc b/config/rootfiles/oldcore/176/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/176/filelists/x86_64/gcc rename to config/rootfiles/oldcore/176/filelists/x86_64/gcc diff --git a/config/rootfiles/core/176/filelists/x86_64/glibc b/config/rootfiles/oldcore/176/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/176/filelists/x86_64/glibc rename to config/rootfiles/oldcore/176/filelists/x86_64/glibc diff --git a/config/rootfiles/core/176/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/176/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/176/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/176/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/176/update.sh b/config/rootfiles/oldcore/176/update.sh similarity index 100% rename from config/rootfiles/core/176/update.sh rename to config/rootfiles/oldcore/176/update.sh diff --git a/make.sh b/make.sh index 1378f7802f..db9ee9a975 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="176" # Core Level (Filename) +CORE="177" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.2