]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Start Core Update 174
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Feb 2023 09:33:36 +0000 (09:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Feb 2023 09:33:36 +0000 (09:33 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
82 files changed:
config/rootfiles/core/174/exclude [moved from config/rootfiles/core/173/exclude with 100% similarity]
config/rootfiles/core/174/filelists/core-files [moved from config/rootfiles/core/173/core-files with 100% similarity]
config/rootfiles/core/174/filelists/files [new file with mode: 0644]
config/rootfiles/core/174/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/173/core-files [new file with mode: 0644]
config/rootfiles/oldcore/173/exclude [new file with mode: 0644]
config/rootfiles/oldcore/173/filelists/aarch64/linux [moved from config/rootfiles/core/173/filelists/aarch64/linux with 100% similarity]
config/rootfiles/oldcore/173/filelists/apache2 [moved from config/rootfiles/core/173/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/173/filelists/armv6l/linux [moved from config/rootfiles/core/173/filelists/armv6l/linux with 100% similarity]
config/rootfiles/oldcore/173/filelists/bind [moved from config/rootfiles/core/173/filelists/bind with 100% similarity]
config/rootfiles/oldcore/173/filelists/core-files [moved from config/rootfiles/core/173/filelists/core-files with 100% similarity]
config/rootfiles/oldcore/173/filelists/coreutils [moved from config/rootfiles/core/173/filelists/coreutils with 100% similarity]
config/rootfiles/oldcore/173/filelists/curl [moved from config/rootfiles/core/173/filelists/curl with 100% similarity]
config/rootfiles/oldcore/173/filelists/dracut [moved from config/rootfiles/core/173/filelists/dracut with 100% similarity]
config/rootfiles/oldcore/173/filelists/ethtool [moved from config/rootfiles/core/173/filelists/ethtool with 100% similarity]
config/rootfiles/oldcore/173/filelists/file [moved from config/rootfiles/core/173/filelists/file with 100% similarity]
config/rootfiles/oldcore/173/filelists/files [moved from config/rootfiles/core/173/filelists/files with 100% similarity]
config/rootfiles/oldcore/173/filelists/fontconfig [moved from config/rootfiles/core/173/filelists/fontconfig with 100% similarity]
config/rootfiles/oldcore/173/filelists/fuse [moved from config/rootfiles/core/173/filelists/fuse with 100% similarity]
config/rootfiles/oldcore/173/filelists/grep [moved from config/rootfiles/core/173/filelists/grep with 100% similarity]
config/rootfiles/oldcore/173/filelists/harfbuzz [moved from config/rootfiles/core/173/filelists/harfbuzz with 100% similarity]
config/rootfiles/oldcore/173/filelists/hdparm [moved from config/rootfiles/core/173/filelists/hdparm with 100% similarity]
config/rootfiles/oldcore/173/filelists/hwdata [moved from config/rootfiles/core/173/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/173/filelists/iana-etc [moved from config/rootfiles/core/173/filelists/iana-etc with 100% similarity]
config/rootfiles/oldcore/173/filelists/iproute2 [moved from config/rootfiles/core/173/filelists/iproute2 with 100% similarity]
config/rootfiles/oldcore/173/filelists/ipset [moved from config/rootfiles/core/173/filelists/ipset with 100% similarity]
config/rootfiles/oldcore/173/filelists/iptables [moved from config/rootfiles/core/173/filelists/iptables with 100% similarity]
config/rootfiles/oldcore/173/filelists/iputils [moved from config/rootfiles/core/173/filelists/iputils with 100% similarity]
config/rootfiles/oldcore/173/filelists/iw [moved from config/rootfiles/core/173/filelists/iw with 100% similarity]
config/rootfiles/oldcore/173/filelists/jquery [moved from config/rootfiles/core/173/filelists/jquery with 100% similarity]
config/rootfiles/oldcore/173/filelists/json-c [moved from config/rootfiles/core/173/filelists/json-c with 100% similarity]
config/rootfiles/oldcore/173/filelists/keyutils [moved from config/rootfiles/core/173/filelists/keyutils with 100% similarity]
config/rootfiles/oldcore/173/filelists/knot [moved from config/rootfiles/core/173/filelists/knot with 100% similarity]
config/rootfiles/oldcore/173/filelists/krb5 [moved from config/rootfiles/core/173/filelists/krb5 with 100% similarity]
config/rootfiles/oldcore/173/filelists/lcms2 [moved from config/rootfiles/core/173/filelists/lcms2 with 100% similarity]
config/rootfiles/oldcore/173/filelists/less [moved from config/rootfiles/core/173/filelists/less with 100% similarity]
config/rootfiles/oldcore/173/filelists/libarchive [moved from config/rootfiles/core/173/filelists/libarchive with 100% similarity]
config/rootfiles/oldcore/173/filelists/libcap [moved from config/rootfiles/core/173/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/173/filelists/libconfig [moved from config/rootfiles/core/173/filelists/libconfig with 100% similarity]
config/rootfiles/oldcore/173/filelists/libffi [moved from config/rootfiles/core/173/filelists/libffi with 100% similarity]
config/rootfiles/oldcore/173/filelists/libgpg-error [moved from config/rootfiles/core/173/filelists/libgpg-error with 100% similarity]
config/rootfiles/oldcore/173/filelists/libgudev [moved from config/rootfiles/core/173/filelists/libgudev with 100% similarity]
config/rootfiles/oldcore/173/filelists/libidn [moved from config/rootfiles/core/173/filelists/libidn with 100% similarity]
config/rootfiles/oldcore/173/filelists/libinih [moved from config/rootfiles/core/173/filelists/libinih with 100% similarity]
config/rootfiles/oldcore/173/filelists/libjpeg [moved from config/rootfiles/core/173/filelists/libjpeg with 100% similarity]
config/rootfiles/oldcore/173/filelists/libloc [moved from config/rootfiles/core/173/filelists/libloc with 100% similarity]
config/rootfiles/oldcore/173/filelists/libmpc [moved from config/rootfiles/core/173/filelists/libmpc with 100% similarity]
config/rootfiles/oldcore/173/filelists/libpcap [moved from config/rootfiles/core/173/filelists/libpcap with 100% similarity]
config/rootfiles/oldcore/173/filelists/libqmi [moved from config/rootfiles/core/173/filelists/libqmi with 100% similarity]
config/rootfiles/oldcore/173/filelists/libssh [moved from config/rootfiles/core/173/filelists/libssh with 100% similarity]
config/rootfiles/oldcore/173/filelists/libstatgrab [moved from config/rootfiles/core/173/filelists/libstatgrab with 100% similarity]
config/rootfiles/oldcore/173/filelists/libtiff [moved from config/rootfiles/core/173/filelists/libtiff with 100% similarity]
config/rootfiles/oldcore/173/filelists/libtirpc [moved from config/rootfiles/core/173/filelists/libtirpc with 100% similarity]
config/rootfiles/oldcore/173/filelists/libtool [moved from config/rootfiles/core/173/filelists/libtool with 100% similarity]
config/rootfiles/oldcore/173/filelists/libusb [moved from config/rootfiles/core/173/filelists/libusb with 100% similarity]
config/rootfiles/oldcore/173/filelists/libxslt [moved from config/rootfiles/core/173/filelists/libxslt with 100% similarity]
config/rootfiles/oldcore/173/filelists/libyang [moved from config/rootfiles/core/173/filelists/libyang with 100% similarity]
config/rootfiles/oldcore/173/filelists/logrotate [moved from config/rootfiles/core/173/filelists/logrotate with 100% similarity]
config/rootfiles/oldcore/173/filelists/lsof [moved from config/rootfiles/core/173/filelists/lsof with 100% similarity]
config/rootfiles/oldcore/173/filelists/lz4 [moved from config/rootfiles/core/173/filelists/lz4 with 100% similarity]
config/rootfiles/oldcore/173/filelists/mpfr [moved from config/rootfiles/core/173/filelists/mpfr with 100% similarity]
config/rootfiles/oldcore/173/filelists/nano [moved from config/rootfiles/core/173/filelists/nano with 100% similarity]
config/rootfiles/oldcore/173/filelists/ncurses [moved from config/rootfiles/core/173/filelists/ncurses with 100% similarity]
config/rootfiles/oldcore/173/filelists/openssh [moved from config/rootfiles/core/173/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/173/filelists/openssl [moved from config/rootfiles/core/173/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/173/filelists/openvpn [moved from config/rootfiles/core/173/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/173/filelists/pcre2 [moved from config/rootfiles/core/173/filelists/pcre2 with 100% similarity]
config/rootfiles/oldcore/173/filelists/perl-HTML-Parser [moved from config/rootfiles/core/173/filelists/perl-HTML-Parser with 100% similarity]
config/rootfiles/oldcore/173/filelists/poppler [moved from config/rootfiles/core/173/filelists/poppler with 100% similarity]
config/rootfiles/oldcore/173/filelists/psmisc [moved from config/rootfiles/core/173/filelists/psmisc with 100% similarity]
config/rootfiles/oldcore/173/filelists/shadow [moved from config/rootfiles/core/173/filelists/shadow with 100% similarity]
config/rootfiles/oldcore/173/filelists/sqlite [moved from config/rootfiles/core/173/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/173/filelists/squid-asnbl [moved from config/rootfiles/core/173/filelists/squid-asnbl with 100% similarity]
config/rootfiles/oldcore/173/filelists/strongswan [moved from config/rootfiles/core/173/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/173/filelists/sudo [moved from config/rootfiles/core/173/filelists/sudo with 100% similarity]
config/rootfiles/oldcore/173/filelists/suricata [moved from config/rootfiles/core/173/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/173/filelists/x86_64/files [moved from config/rootfiles/core/173/filelists/x86_64/files with 100% similarity]
config/rootfiles/oldcore/173/filelists/x86_64/linux [moved from config/rootfiles/core/173/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/173/filelists/xfsprogs [moved from config/rootfiles/core/173/filelists/xfsprogs with 100% similarity]
config/rootfiles/oldcore/173/filelists/xz [moved from config/rootfiles/core/173/filelists/xz with 100% similarity]
config/rootfiles/oldcore/173/update.sh [moved from config/rootfiles/core/173/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh
new file mode 100644 (file)
index 0000000..e3b4db1
--- /dev/null
@@ -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) 2022 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=174
+
+# 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
+
+# Remove files
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# Regenerate all initrds
+
+# 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/173/core-files b/config/rootfiles/oldcore/173/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/config/rootfiles/oldcore/173/exclude b/config/rootfiles/oldcore/173/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/make.sh b/make.sh
index a4a0200c4a88aa1fa90878adcce0d560dc1a0b94..c6a592ba7a6d000d94789b0c5795871778a1cde6 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="173"                                                     # Core Level (Filename)
+CORE="174"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop