core187: start updater

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/186/exclude b/config/rootfiles/core/187/exclude
similarity index 100%
rename from config/rootfiles/core/186/exclude
rename to config/rootfiles/core/187/exclude

diff --git a/config/rootfiles/core/186/filelists/core-files b/config/rootfiles/core/187/filelists/core-files
similarity index 100%
rename from config/rootfiles/core/186/filelists/core-files
rename to config/rootfiles/core/187/filelists/core-files

diff --git a/config/rootfiles/core/187/filelists/files b/config/rootfiles/core/187/filelists/files
new file mode 100644 (file)
index 0000000..53793fd
--- /dev/null
+++ b/config/rootfiles/core/187/filelists/files
@@ -0,0 +1,58 @@
+etc/rc.d/init.d/functions
+etc/sudoers.d/logwatch-mdadm
+lib/firmware/brcm/BCM-0a5c-6410.hcd
+lib/firmware/brcm/brcmfmac43012-sdio.bin
+lib/firmware/brcm/brcmfmac43012-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43430-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
+lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
+lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
+lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
+lib/firmware/brcm/brcmfmac4356-sdio.clm_blob
+lib/firmware/brcm/brcmfmac4356-sdio.khadas,vim2.txt
+lib/firmware/brcm/brcmfmac43570-pcie.clm_blob
+lib/firmware/brcm/brcmfmac4373-sdio.clm_blob
+lib/firmware/brcm/brcmfmac54591-pcie.bin
+lib/firmware/brcm/brcmfmac54591-pcie.clm_blob
+lib/firmware/cxgb4/t4-config.txt
+lib/firmware/cxgb4/t5-config.txt
+lib/firmware/cxgb4/t6-config.txt
+lib/firmware/intel/ice/ddp/ice.pkg
+lib/firmware/netronome/flower/nic_AMDA0058-0011_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_8x10.nffw
+lib/firmware/nvidia/tegra124/vic.bin
+lib/firmware/nvidia/tegra186/vic.bin
+lib/firmware/nvidia/tegra210/vic.bin
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/time.cgi
+usr/lib/python3.10/lib-dynload/_lzma.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/local/bin/update-ids-ruleset
+var/ipfire/backup/bin/backup.pl
+var/ipfire/ids-functions.pl
+var/ipfire/main/manualpages
+var/ipfire/ovpn/openssl/ovpn.cnf

diff --git a/config/rootfiles/core/187/update.sh b/config/rootfiles/core/187/update.sh
new file mode 100644 (file)
index 0000000..3aded31
--- /dev/null
+++ b/config/rootfiles/core/187/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=187
+
+# 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/186/exclude b/config/rootfiles/oldcore/186/exclude
new file mode 100644 (file)
index 0000000..8ee1c3c
--- /dev/null
+++ b/config/rootfiles/oldcore/186/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/186/filelists/aarch64/linux b/config/rootfiles/oldcore/186/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/186/filelists/aarch64/linux
rename to config/rootfiles/oldcore/186/filelists/aarch64/linux

diff --git a/config/rootfiles/core/186/filelists/apache2 b/config/rootfiles/oldcore/186/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/186/filelists/apache2
rename to config/rootfiles/oldcore/186/filelists/apache2

diff --git a/config/rootfiles/core/186/filelists/bind b/config/rootfiles/oldcore/186/filelists/bind
similarity index 100%
rename from config/rootfiles/core/186/filelists/bind
rename to config/rootfiles/oldcore/186/filelists/bind

diff --git a/config/rootfiles/core/186/filelists/btrfs-progs b/config/rootfiles/oldcore/186/filelists/btrfs-progs
similarity index 100%
rename from config/rootfiles/core/186/filelists/btrfs-progs
rename to config/rootfiles/oldcore/186/filelists/btrfs-progs

diff --git a/config/rootfiles/core/186/filelists/collectd b/config/rootfiles/oldcore/186/filelists/collectd
similarity index 100%
rename from config/rootfiles/core/186/filelists/collectd
rename to config/rootfiles/oldcore/186/filelists/collectd

diff --git a/config/rootfiles/oldcore/186/filelists/core-files b/config/rootfiles/oldcore/186/filelists/core-files
new file mode 100644 (file)
index 0000000..0dec37e
--- /dev/null
+++ b/config/rootfiles/oldcore/186/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/186/filelists/dracut b/config/rootfiles/oldcore/186/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/186/filelists/dracut
rename to config/rootfiles/oldcore/186/filelists/dracut

diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/oldcore/186/filelists/files
similarity index 100%
rename from config/rootfiles/core/186/filelists/files
rename to config/rootfiles/oldcore/186/filelists/files

diff --git a/config/rootfiles/core/186/filelists/grub-btrfs b/config/rootfiles/oldcore/186/filelists/grub-btrfs
similarity index 100%
rename from config/rootfiles/core/186/filelists/grub-btrfs
rename to config/rootfiles/oldcore/186/filelists/grub-btrfs

diff --git a/config/rootfiles/core/186/filelists/inotify-tools b/config/rootfiles/oldcore/186/filelists/inotify-tools
similarity index 100%
rename from config/rootfiles/core/186/filelists/inotify-tools
rename to config/rootfiles/oldcore/186/filelists/inotify-tools

diff --git a/config/rootfiles/core/186/filelists/kmod b/config/rootfiles/oldcore/186/filelists/kmod
similarity index 100%
rename from config/rootfiles/core/186/filelists/kmod
rename to config/rootfiles/oldcore/186/filelists/kmod

diff --git a/config/rootfiles/core/186/filelists/libhtp b/config/rootfiles/oldcore/186/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/186/filelists/libhtp
rename to config/rootfiles/oldcore/186/filelists/libhtp

diff --git a/config/rootfiles/core/186/filelists/riscv64/linux b/config/rootfiles/oldcore/186/filelists/riscv64/linux
similarity index 100%
rename from config/rootfiles/core/186/filelists/riscv64/linux
rename to config/rootfiles/oldcore/186/filelists/riscv64/linux

diff --git a/config/rootfiles/core/186/filelists/sqlite b/config/rootfiles/oldcore/186/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/186/filelists/sqlite
rename to config/rootfiles/oldcore/186/filelists/sqlite

diff --git a/config/rootfiles/core/186/filelists/squid b/config/rootfiles/oldcore/186/filelists/squid
similarity index 100%
rename from config/rootfiles/core/186/filelists/squid
rename to config/rootfiles/oldcore/186/filelists/squid

diff --git a/config/rootfiles/core/186/filelists/strongswan b/config/rootfiles/oldcore/186/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/186/filelists/strongswan
rename to config/rootfiles/oldcore/186/filelists/strongswan

diff --git a/config/rootfiles/core/186/filelists/suricata b/config/rootfiles/oldcore/186/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/186/filelists/suricata
rename to config/rootfiles/oldcore/186/filelists/suricata

diff --git a/config/rootfiles/core/186/filelists/tzdata b/config/rootfiles/oldcore/186/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/186/filelists/tzdata
rename to config/rootfiles/oldcore/186/filelists/tzdata

diff --git a/config/rootfiles/core/186/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/186/filelists/x86_64/intel-microcode
similarity index 100%
rename from config/rootfiles/core/186/filelists/x86_64/intel-microcode
rename to config/rootfiles/oldcore/186/filelists/x86_64/intel-microcode

diff --git a/config/rootfiles/core/186/filelists/x86_64/linux b/config/rootfiles/oldcore/186/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/186/filelists/x86_64/linux
rename to config/rootfiles/oldcore/186/filelists/x86_64/linux

diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/oldcore/186/update.sh
similarity index 100%
rename from config/rootfiles/core/186/update.sh
rename to config/rootfiles/oldcore/186/update.sh

diff --git a/make.sh b/make.sh
index a4ba09326655f210f75e61b97a246ffa9e854795..eb4ca25295c5089bb04a6c00c9c19450879e6d0d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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="186"                                                     # Core Level (Filename)
+CORE="187"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop