From: Michael Tremer Date: Mon, 22 Jul 2024 15:09:13 +0000 (+0000) Subject: Start Core Update 188 X-Git-Tag: v2.29-core188~10^2~247 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=357211c24fc6a60b5a9c138cdea35aaf7d82b8da;p=ipfire-2.x.git Start Core Update 188 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/187/exclude b/config/rootfiles/core/188/exclude similarity index 100% rename from config/rootfiles/core/187/exclude rename to config/rootfiles/core/188/exclude diff --git a/config/rootfiles/core/187/filelists/core-files b/config/rootfiles/core/188/filelists/core-files similarity index 100% rename from config/rootfiles/core/187/filelists/core-files rename to config/rootfiles/core/188/filelists/core-files diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/core/188/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh new file mode 100644 index 0000000000..668e4e97fb --- /dev/null +++ b/config/rootfiles/core/188/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) 2024 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=188 + +# 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/187/exclude b/config/rootfiles/oldcore/187/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/187/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/187/filelists/aarch64/gcc b/config/rootfiles/oldcore/187/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/187/filelists/aarch64/gcc rename to config/rootfiles/oldcore/187/filelists/aarch64/gcc diff --git a/config/rootfiles/core/187/filelists/aarch64/util-linux b/config/rootfiles/oldcore/187/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/187/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/187/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/187/filelists/aarch64/vectorscan b/config/rootfiles/oldcore/187/filelists/aarch64/vectorscan similarity index 100% rename from config/rootfiles/core/187/filelists/aarch64/vectorscan rename to config/rootfiles/oldcore/187/filelists/aarch64/vectorscan diff --git a/config/rootfiles/core/187/filelists/apache2 b/config/rootfiles/oldcore/187/filelists/apache2 similarity index 100% rename from config/rootfiles/core/187/filelists/apache2 rename to config/rootfiles/oldcore/187/filelists/apache2 diff --git a/config/rootfiles/core/187/filelists/bind b/config/rootfiles/oldcore/187/filelists/bind similarity index 100% rename from config/rootfiles/core/187/filelists/bind rename to config/rootfiles/oldcore/187/filelists/bind diff --git a/config/rootfiles/core/187/filelists/ca-certificates b/config/rootfiles/oldcore/187/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/187/filelists/ca-certificates rename to config/rootfiles/oldcore/187/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/187/filelists/core-files b/config/rootfiles/oldcore/187/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/187/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/187/filelists/cpio b/config/rootfiles/oldcore/187/filelists/cpio similarity index 100% rename from config/rootfiles/core/187/filelists/cpio rename to config/rootfiles/oldcore/187/filelists/cpio diff --git a/config/rootfiles/core/187/filelists/curl b/config/rootfiles/oldcore/187/filelists/curl similarity index 100% rename from config/rootfiles/core/187/filelists/curl rename to config/rootfiles/oldcore/187/filelists/curl diff --git a/config/rootfiles/core/187/filelists/dhcpcd b/config/rootfiles/oldcore/187/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/187/filelists/dhcpcd rename to config/rootfiles/oldcore/187/filelists/dhcpcd diff --git a/config/rootfiles/core/187/filelists/e2fsprogs b/config/rootfiles/oldcore/187/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/187/filelists/e2fsprogs rename to config/rootfiles/oldcore/187/filelists/e2fsprogs diff --git a/config/rootfiles/core/187/filelists/ethtool b/config/rootfiles/oldcore/187/filelists/ethtool similarity index 100% rename from config/rootfiles/core/187/filelists/ethtool rename to config/rootfiles/oldcore/187/filelists/ethtool diff --git a/config/rootfiles/core/187/filelists/files b/config/rootfiles/oldcore/187/filelists/files similarity index 100% rename from config/rootfiles/core/187/filelists/files rename to config/rootfiles/oldcore/187/filelists/files diff --git a/config/rootfiles/core/187/filelists/gnutls b/config/rootfiles/oldcore/187/filelists/gnutls similarity index 100% rename from config/rootfiles/core/187/filelists/gnutls rename to config/rootfiles/oldcore/187/filelists/gnutls diff --git a/config/rootfiles/core/187/filelists/iana-etc b/config/rootfiles/oldcore/187/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/187/filelists/iana-etc rename to config/rootfiles/oldcore/187/filelists/iana-etc diff --git a/config/rootfiles/core/187/filelists/ipblocklist-sources b/config/rootfiles/oldcore/187/filelists/ipblocklist-sources similarity index 100% rename from config/rootfiles/core/187/filelists/ipblocklist-sources rename to config/rootfiles/oldcore/187/filelists/ipblocklist-sources diff --git a/config/rootfiles/core/187/filelists/iw b/config/rootfiles/oldcore/187/filelists/iw similarity index 100% rename from config/rootfiles/core/187/filelists/iw rename to config/rootfiles/oldcore/187/filelists/iw diff --git a/config/rootfiles/core/187/filelists/jq b/config/rootfiles/oldcore/187/filelists/jq similarity index 100% rename from config/rootfiles/core/187/filelists/jq rename to config/rootfiles/oldcore/187/filelists/jq diff --git a/config/rootfiles/core/187/filelists/kbd b/config/rootfiles/oldcore/187/filelists/kbd similarity index 100% rename from config/rootfiles/core/187/filelists/kbd rename to config/rootfiles/oldcore/187/filelists/kbd diff --git a/config/rootfiles/core/187/filelists/libedit b/config/rootfiles/oldcore/187/filelists/libedit similarity index 100% rename from config/rootfiles/core/187/filelists/libedit rename to config/rootfiles/oldcore/187/filelists/libedit diff --git a/config/rootfiles/core/187/filelists/lzip b/config/rootfiles/oldcore/187/filelists/lzip similarity index 100% rename from config/rootfiles/core/187/filelists/lzip rename to config/rootfiles/oldcore/187/filelists/lzip diff --git a/config/rootfiles/core/187/filelists/mdadm b/config/rootfiles/oldcore/187/filelists/mdadm similarity index 100% rename from config/rootfiles/core/187/filelists/mdadm rename to config/rootfiles/oldcore/187/filelists/mdadm diff --git a/config/rootfiles/core/187/filelists/ntp b/config/rootfiles/oldcore/187/filelists/ntp similarity index 100% rename from config/rootfiles/core/187/filelists/ntp rename to config/rootfiles/oldcore/187/filelists/ntp diff --git a/config/rootfiles/core/187/filelists/oath-toolkit b/config/rootfiles/oldcore/187/filelists/oath-toolkit similarity index 100% rename from config/rootfiles/core/187/filelists/oath-toolkit rename to config/rootfiles/oldcore/187/filelists/oath-toolkit diff --git a/config/rootfiles/core/187/filelists/openssh b/config/rootfiles/oldcore/187/filelists/openssh similarity index 100% rename from config/rootfiles/core/187/filelists/openssh rename to config/rootfiles/oldcore/187/filelists/openssh diff --git a/config/rootfiles/core/187/filelists/pam b/config/rootfiles/oldcore/187/filelists/pam similarity index 100% rename from config/rootfiles/core/187/filelists/pam rename to config/rootfiles/oldcore/187/filelists/pam diff --git a/config/rootfiles/core/187/filelists/pcre2 b/config/rootfiles/oldcore/187/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/187/filelists/pcre2 rename to config/rootfiles/oldcore/187/filelists/pcre2 diff --git a/config/rootfiles/core/187/filelists/ppp b/config/rootfiles/oldcore/187/filelists/ppp similarity index 100% rename from config/rootfiles/core/187/filelists/ppp rename to config/rootfiles/oldcore/187/filelists/ppp diff --git a/config/rootfiles/core/187/filelists/psmisc b/config/rootfiles/oldcore/187/filelists/psmisc similarity index 100% rename from config/rootfiles/core/187/filelists/psmisc rename to config/rootfiles/oldcore/187/filelists/psmisc diff --git a/config/rootfiles/core/187/filelists/riscv64/gcc b/config/rootfiles/oldcore/187/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/187/filelists/riscv64/gcc rename to config/rootfiles/oldcore/187/filelists/riscv64/gcc diff --git a/config/rootfiles/core/187/filelists/riscv64/util-linux b/config/rootfiles/oldcore/187/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/187/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/187/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/187/filelists/screen b/config/rootfiles/oldcore/187/filelists/screen similarity index 100% rename from config/rootfiles/core/187/filelists/screen rename to config/rootfiles/oldcore/187/filelists/screen diff --git a/config/rootfiles/core/187/filelists/shadow b/config/rootfiles/oldcore/187/filelists/shadow similarity index 100% rename from config/rootfiles/core/187/filelists/shadow rename to config/rootfiles/oldcore/187/filelists/shadow diff --git a/config/rootfiles/core/187/filelists/sqlite b/config/rootfiles/oldcore/187/filelists/sqlite similarity index 100% rename from config/rootfiles/core/187/filelists/sqlite rename to config/rootfiles/oldcore/187/filelists/sqlite diff --git a/config/rootfiles/core/187/filelists/squid b/config/rootfiles/oldcore/187/filelists/squid similarity index 100% rename from config/rootfiles/core/187/filelists/squid rename to config/rootfiles/oldcore/187/filelists/squid diff --git a/config/rootfiles/core/187/filelists/strongswan b/config/rootfiles/oldcore/187/filelists/strongswan similarity index 100% rename from config/rootfiles/core/187/filelists/strongswan rename to config/rootfiles/oldcore/187/filelists/strongswan diff --git a/config/rootfiles/core/187/filelists/suricata b/config/rootfiles/oldcore/187/filelists/suricata similarity index 100% rename from config/rootfiles/core/187/filelists/suricata rename to config/rootfiles/oldcore/187/filelists/suricata diff --git a/config/rootfiles/core/187/filelists/unbound b/config/rootfiles/oldcore/187/filelists/unbound similarity index 100% rename from config/rootfiles/core/187/filelists/unbound rename to config/rootfiles/oldcore/187/filelists/unbound diff --git a/config/rootfiles/core/187/filelists/vim b/config/rootfiles/oldcore/187/filelists/vim similarity index 100% rename from config/rootfiles/core/187/filelists/vim rename to config/rootfiles/oldcore/187/filelists/vim diff --git a/config/rootfiles/core/187/filelists/whois b/config/rootfiles/oldcore/187/filelists/whois similarity index 100% rename from config/rootfiles/core/187/filelists/whois rename to config/rootfiles/oldcore/187/filelists/whois diff --git a/config/rootfiles/core/187/filelists/x86_64/gcc b/config/rootfiles/oldcore/187/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/187/filelists/x86_64/gcc rename to config/rootfiles/oldcore/187/filelists/x86_64/gcc diff --git a/config/rootfiles/core/187/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/187/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/187/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/187/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/187/filelists/x86_64/util-linux b/config/rootfiles/oldcore/187/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/187/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/187/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/187/filelists/x86_64/vectorscan b/config/rootfiles/oldcore/187/filelists/x86_64/vectorscan similarity index 100% rename from config/rootfiles/core/187/filelists/x86_64/vectorscan rename to config/rootfiles/oldcore/187/filelists/x86_64/vectorscan diff --git a/config/rootfiles/core/187/filelists/xfsprogs b/config/rootfiles/oldcore/187/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/187/filelists/xfsprogs rename to config/rootfiles/oldcore/187/filelists/xfsprogs diff --git a/config/rootfiles/core/187/filelists/zstd b/config/rootfiles/oldcore/187/filelists/zstd similarity index 100% rename from config/rootfiles/core/187/filelists/zstd rename to config/rootfiles/oldcore/187/filelists/zstd diff --git a/config/rootfiles/core/187/update.sh b/config/rootfiles/oldcore/187/update.sh similarity index 100% rename from config/rootfiles/core/187/update.sh rename to config/rootfiles/oldcore/187/update.sh diff --git a/make.sh b/make.sh index 69e1fd7e45..d2054eff31 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="187" # Core Level (Filename) +CORE="188" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`