]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Start Core Update 176
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Jun 2023 09:23:02 +0000 (09:23 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Jun 2023 09:23:02 +0000 (09:23 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
57 files changed:
config/rootfiles/core/176/exclude [moved from config/rootfiles/core/175/exclude with 100% similarity]
config/rootfiles/core/176/filelists/core-files [moved from config/rootfiles/core/175/filelists/core-files with 100% similarity]
config/rootfiles/core/176/filelists/files [new file with mode: 0644]
config/rootfiles/core/176/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/175/exclude [new file with mode: 0644]
config/rootfiles/oldcore/175/filelists/aarch64/linux [moved from config/rootfiles/core/175/filelists/aarch64/linux with 100% similarity]
config/rootfiles/oldcore/175/filelists/aarch64/u-boot [moved from config/rootfiles/core/175/filelists/aarch64/u-boot with 100% similarity]
config/rootfiles/oldcore/175/filelists/acpid [moved from config/rootfiles/core/175/filelists/acpid with 100% similarity]
config/rootfiles/oldcore/175/filelists/apache2 [moved from config/rootfiles/core/175/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/175/filelists/apr [moved from config/rootfiles/core/175/filelists/apr with 100% similarity]
config/rootfiles/oldcore/175/filelists/aprutil [moved from config/rootfiles/core/175/filelists/aprutil with 100% similarity]
config/rootfiles/oldcore/175/filelists/arping [moved from config/rootfiles/core/175/filelists/arping with 100% similarity]
config/rootfiles/oldcore/175/filelists/bash [moved from config/rootfiles/core/175/filelists/bash with 100% similarity]
config/rootfiles/oldcore/175/filelists/bind [moved from config/rootfiles/core/175/filelists/bind with 100% similarity]
config/rootfiles/oldcore/175/filelists/collectd [moved from config/rootfiles/core/175/filelists/collectd with 100% similarity]
config/rootfiles/oldcore/175/filelists/core-files [new file with mode: 0644]
config/rootfiles/oldcore/175/filelists/curl [moved from config/rootfiles/core/175/filelists/curl with 100% similarity]
config/rootfiles/oldcore/175/filelists/dma [moved from config/rootfiles/core/175/filelists/dma with 100% similarity]
config/rootfiles/oldcore/175/filelists/elinks [moved from config/rootfiles/core/175/filelists/elinks with 100% similarity]
config/rootfiles/oldcore/175/filelists/files [moved from config/rootfiles/core/175/filelists/files with 100% similarity]
config/rootfiles/oldcore/175/filelists/gnupg [moved from config/rootfiles/core/175/filelists/gnupg with 100% similarity]
config/rootfiles/oldcore/175/filelists/grep [moved from config/rootfiles/core/175/filelists/grep with 100% similarity]
config/rootfiles/oldcore/175/filelists/harfbuzz [moved from config/rootfiles/core/175/filelists/harfbuzz with 100% similarity]
config/rootfiles/oldcore/175/filelists/iproute2 [moved from config/rootfiles/core/175/filelists/iproute2 with 100% similarity]
config/rootfiles/oldcore/175/filelists/krb5 [moved from config/rootfiles/core/175/filelists/krb5 with 100% similarity]
config/rootfiles/oldcore/175/filelists/libcap [moved from config/rootfiles/core/175/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/175/filelists/libevent2 [moved from config/rootfiles/core/175/filelists/libevent2 with 100% similarity]
config/rootfiles/oldcore/175/filelists/libgcrypt [moved from config/rootfiles/core/175/filelists/libgcrypt with 100% similarity]
config/rootfiles/oldcore/175/filelists/libgpg-error [moved from config/rootfiles/core/175/filelists/libgpg-error with 100% similarity]
config/rootfiles/oldcore/175/filelists/libhtp [moved from config/rootfiles/core/175/filelists/libhtp with 100% similarity]
config/rootfiles/oldcore/175/filelists/libpcap [moved from config/rootfiles/core/175/filelists/libpcap with 100% similarity]
config/rootfiles/oldcore/175/filelists/libxml2 [moved from config/rootfiles/core/175/filelists/libxml2 with 100% similarity]
config/rootfiles/oldcore/175/filelists/lvm2 [moved from config/rootfiles/core/175/filelists/lvm2 with 100% similarity]
config/rootfiles/oldcore/175/filelists/mpfr [moved from config/rootfiles/core/175/filelists/mpfr with 100% similarity]
config/rootfiles/oldcore/175/filelists/newt [moved from config/rootfiles/core/175/filelists/newt with 100% similarity]
config/rootfiles/oldcore/175/filelists/ntp [moved from config/rootfiles/core/175/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/175/filelists/openldap [moved from config/rootfiles/core/175/filelists/openldap with 100% similarity]
config/rootfiles/oldcore/175/filelists/openssh [moved from config/rootfiles/core/175/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/175/filelists/openssl [moved from config/rootfiles/core/175/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/175/filelists/openvpn [moved from config/rootfiles/core/175/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/175/filelists/parted [moved from config/rootfiles/core/175/filelists/parted with 100% similarity]
config/rootfiles/oldcore/175/filelists/pciutils [moved from config/rootfiles/core/175/filelists/pciutils with 100% similarity]
config/rootfiles/oldcore/175/filelists/poppler [moved from config/rootfiles/core/175/filelists/poppler with 100% similarity]
config/rootfiles/oldcore/175/filelists/ppp [moved from config/rootfiles/core/175/filelists/ppp with 100% similarity]
config/rootfiles/oldcore/175/filelists/qpdf [moved from config/rootfiles/core/175/filelists/qpdf with 100% similarity]
config/rootfiles/oldcore/175/filelists/slang [moved from config/rootfiles/core/175/filelists/slang with 100% similarity]
config/rootfiles/oldcore/175/filelists/sqlite [moved from config/rootfiles/core/175/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/175/filelists/squid [moved from config/rootfiles/core/175/filelists/squid with 100% similarity]
config/rootfiles/oldcore/175/filelists/suricata [moved from config/rootfiles/core/175/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/175/filelists/tzdata [moved from config/rootfiles/core/175/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/175/filelists/unbound [moved from config/rootfiles/core/175/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/175/filelists/wpa_supplicant [moved from config/rootfiles/core/175/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/175/filelists/x86_64/linux [moved from config/rootfiles/core/175/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/175/filelists/xfsprogs [moved from config/rootfiles/core/175/filelists/xfsprogs with 100% similarity]
config/rootfiles/oldcore/175/filelists/zstd [moved from config/rootfiles/core/175/filelists/zstd with 100% similarity]
config/rootfiles/oldcore/175/update.sh [moved from config/rootfiles/core/175/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/176/filelists/files b/config/rootfiles/core/176/filelists/files
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/config/rootfiles/core/176/update.sh b/config/rootfiles/core/176/update.sh
new file mode 100644 (file)
index 0000000..75fdc0e
--- /dev/null
@@ -0,0 +1,65 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=176
+
+# 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
+
+# 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/175/exclude b/config/rootfiles/oldcore/175/exclude
new file mode 100644 (file)
index 0000000..378c2d5
--- /dev/null
@@ -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/oldcore/175/filelists/core-files b/config/rootfiles/oldcore/175/filelists/core-files
new file mode 100644 (file)
index 0000000..0dec37e
--- /dev/null
@@ -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/make.sh b/make.sh
index 2c0bcae453ce6fd565f960216cf5382f4426b0ea..6b9a8146bd89d94d7ce27bd0b9e7b4724c7198d4 100755 (executable)
--- 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="175"                                                     # Core Level (Filename)
+CORE="176"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop