From: Michael Tremer Date: Sat, 22 Feb 2025 12:57:41 +0000 (+0000) Subject: Start Core Update 193 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a58fda374ae6d07a3fa1397bd1b1df6a923d4b3d;p=people%2Fms%2Fipfire-2.x.git Start Core Update 193 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/193/exclude b/config/rootfiles/core/193/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/core/193/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/192/filelists/core-files b/config/rootfiles/core/193/filelists/core-files similarity index 100% rename from config/rootfiles/core/192/filelists/core-files rename to config/rootfiles/core/193/filelists/core-files diff --git a/config/rootfiles/core/193/filelists/files b/config/rootfiles/core/193/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/193/update.sh b/config/rootfiles/core/193/update.sh new file mode 100644 index 000000000..fea9c08c0 --- /dev/null +++ b/config/rootfiles/core/193/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) 2024 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=193 + +# 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 + +# Apply local configuration to sshd_config + +# 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/core/192/exclude b/config/rootfiles/oldcore/192/exclude similarity index 100% rename from config/rootfiles/core/192/exclude rename to config/rootfiles/oldcore/192/exclude diff --git a/config/rootfiles/core/192/filelists/aarch64/linux b/config/rootfiles/oldcore/192/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/192/filelists/aarch64/linux rename to config/rootfiles/oldcore/192/filelists/aarch64/linux diff --git a/config/rootfiles/core/192/filelists/aarch64/u-boot b/config/rootfiles/oldcore/192/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/192/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/192/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/192/filelists/collectd b/config/rootfiles/oldcore/192/filelists/collectd similarity index 100% rename from config/rootfiles/core/192/filelists/collectd rename to config/rootfiles/oldcore/192/filelists/collectd diff --git a/config/rootfiles/oldcore/192/filelists/core-files b/config/rootfiles/oldcore/192/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/192/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/192/filelists/dma b/config/rootfiles/oldcore/192/filelists/dma similarity index 100% rename from config/rootfiles/core/192/filelists/dma rename to config/rootfiles/oldcore/192/filelists/dma diff --git a/config/rootfiles/core/192/filelists/e2fsprogs b/config/rootfiles/oldcore/192/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/192/filelists/e2fsprogs rename to config/rootfiles/oldcore/192/filelists/e2fsprogs diff --git a/config/rootfiles/core/192/filelists/files b/config/rootfiles/oldcore/192/filelists/files similarity index 100% rename from config/rootfiles/core/192/filelists/files rename to config/rootfiles/oldcore/192/filelists/files diff --git a/config/rootfiles/core/192/filelists/hwdata b/config/rootfiles/oldcore/192/filelists/hwdata similarity index 100% rename from config/rootfiles/core/192/filelists/hwdata rename to config/rootfiles/oldcore/192/filelists/hwdata diff --git a/config/rootfiles/core/192/filelists/kbd b/config/rootfiles/oldcore/192/filelists/kbd similarity index 100% rename from config/rootfiles/core/192/filelists/kbd rename to config/rootfiles/oldcore/192/filelists/kbd diff --git a/config/rootfiles/core/192/filelists/libpng b/config/rootfiles/oldcore/192/filelists/libpng similarity index 100% rename from config/rootfiles/core/192/filelists/libpng rename to config/rootfiles/oldcore/192/filelists/libpng diff --git a/config/rootfiles/core/192/filelists/liburcu b/config/rootfiles/oldcore/192/filelists/liburcu similarity index 100% rename from config/rootfiles/core/192/filelists/liburcu rename to config/rootfiles/oldcore/192/filelists/liburcu diff --git a/config/rootfiles/core/192/filelists/libyang b/config/rootfiles/oldcore/192/filelists/libyang similarity index 100% rename from config/rootfiles/core/192/filelists/libyang rename to config/rootfiles/oldcore/192/filelists/libyang diff --git a/config/rootfiles/core/192/filelists/mdadm b/config/rootfiles/oldcore/192/filelists/mdadm similarity index 100% rename from config/rootfiles/core/192/filelists/mdadm rename to config/rootfiles/oldcore/192/filelists/mdadm diff --git a/config/rootfiles/core/192/filelists/nano b/config/rootfiles/oldcore/192/filelists/nano similarity index 100% rename from config/rootfiles/core/192/filelists/nano rename to config/rootfiles/oldcore/192/filelists/nano diff --git a/config/rootfiles/core/192/filelists/nettle b/config/rootfiles/oldcore/192/filelists/nettle similarity index 100% rename from config/rootfiles/core/192/filelists/nettle rename to config/rootfiles/oldcore/192/filelists/nettle diff --git a/config/rootfiles/core/192/filelists/openssh b/config/rootfiles/oldcore/192/filelists/openssh similarity index 100% rename from config/rootfiles/core/192/filelists/openssh rename to config/rootfiles/oldcore/192/filelists/openssh diff --git a/config/rootfiles/core/192/filelists/openssl b/config/rootfiles/oldcore/192/filelists/openssl similarity index 100% rename from config/rootfiles/core/192/filelists/openssl rename to config/rootfiles/oldcore/192/filelists/openssl diff --git a/config/rootfiles/core/192/filelists/perl-File-LibMagic b/config/rootfiles/oldcore/192/filelists/perl-File-LibMagic similarity index 100% rename from config/rootfiles/core/192/filelists/perl-File-LibMagic rename to config/rootfiles/oldcore/192/filelists/perl-File-LibMagic diff --git a/config/rootfiles/core/192/filelists/ppp b/config/rootfiles/oldcore/192/filelists/ppp similarity index 100% rename from config/rootfiles/core/192/filelists/ppp rename to config/rootfiles/oldcore/192/filelists/ppp diff --git a/config/rootfiles/core/192/filelists/protobuf b/config/rootfiles/oldcore/192/filelists/protobuf similarity index 100% rename from config/rootfiles/core/192/filelists/protobuf rename to config/rootfiles/oldcore/192/filelists/protobuf diff --git a/config/rootfiles/core/192/filelists/riscv64/linux b/config/rootfiles/oldcore/192/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/192/filelists/riscv64/linux rename to config/rootfiles/oldcore/192/filelists/riscv64/linux diff --git a/config/rootfiles/core/192/filelists/suricata b/config/rootfiles/oldcore/192/filelists/suricata similarity index 100% rename from config/rootfiles/core/192/filelists/suricata rename to config/rootfiles/oldcore/192/filelists/suricata diff --git a/config/rootfiles/core/192/filelists/udev b/config/rootfiles/oldcore/192/filelists/udev similarity index 100% rename from config/rootfiles/core/192/filelists/udev rename to config/rootfiles/oldcore/192/filelists/udev diff --git a/config/rootfiles/core/192/filelists/x86_64/collectd b/config/rootfiles/oldcore/192/filelists/x86_64/collectd similarity index 100% rename from config/rootfiles/core/192/filelists/x86_64/collectd rename to config/rootfiles/oldcore/192/filelists/x86_64/collectd diff --git a/config/rootfiles/core/192/filelists/x86_64/linux b/config/rootfiles/oldcore/192/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/192/filelists/x86_64/linux rename to config/rootfiles/oldcore/192/filelists/x86_64/linux diff --git a/config/rootfiles/core/192/filelists/zlib-ng b/config/rootfiles/oldcore/192/filelists/zlib-ng similarity index 100% rename from config/rootfiles/core/192/filelists/zlib-ng rename to config/rootfiles/oldcore/192/filelists/zlib-ng diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/oldcore/192/update.sh similarity index 100% rename from config/rootfiles/core/192/update.sh rename to config/rootfiles/oldcore/192/update.sh diff --git a/make.sh b/make.sh index 411107a3a..b90f85a73 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="192" # Core Level (Filename) +CORE="193" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir