]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Start Core Update 172
authorPeter Müller <peter.mueller@ipfire.org>
Mon, 24 Oct 2022 08:55:12 +0000 (08:55 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Mon, 24 Oct 2022 08:55:12 +0000 (08:55 +0000)
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
115 files changed:
config/rootfiles/core/172/core-files [moved from config/rootfiles/core/171/core-files with 100% similarity]
config/rootfiles/core/172/exclude [moved from config/rootfiles/core/171/exclude with 100% similarity]
config/rootfiles/core/172/filelists/core-files [moved from config/rootfiles/core/171/filelists/core-files with 100% similarity]
config/rootfiles/core/172/filelists/files [new file with mode: 0644]
config/rootfiles/core/172/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/171/core-files [new file with mode: 0644]
config/rootfiles/oldcore/171/exclude [new file with mode: 0644]
config/rootfiles/oldcore/171/filelists/aarch64/binutils [moved from config/rootfiles/core/171/filelists/aarch64/binutils with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/efivar [moved from config/rootfiles/core/171/filelists/aarch64/efivar with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/gcc [moved from config/rootfiles/core/171/filelists/aarch64/gcc with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/glibc [moved from config/rootfiles/core/171/filelists/aarch64/glibc with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/linux [moved from config/rootfiles/core/171/filelists/aarch64/linux with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/u-boot [moved from config/rootfiles/core/171/filelists/aarch64/u-boot with 100% similarity]
config/rootfiles/oldcore/171/filelists/aarch64/util-linux [moved from config/rootfiles/core/171/filelists/aarch64/util-linux with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/binutils [moved from config/rootfiles/core/171/filelists/armv6l/binutils with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/gcc [moved from config/rootfiles/core/171/filelists/armv6l/gcc with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/glibc [moved from config/rootfiles/core/171/filelists/armv6l/glibc with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/linux [moved from config/rootfiles/core/171/filelists/armv6l/linux with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/u-boot [moved from config/rootfiles/core/171/filelists/armv6l/u-boot with 100% similarity]
config/rootfiles/oldcore/171/filelists/armv6l/util-linux [moved from config/rootfiles/core/171/filelists/armv6l/util-linux with 100% similarity]
config/rootfiles/oldcore/171/filelists/bind [moved from config/rootfiles/core/171/filelists/bind with 100% similarity]
config/rootfiles/oldcore/171/filelists/ca-certificates [moved from config/rootfiles/core/171/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/171/filelists/collectd [moved from config/rootfiles/core/171/filelists/collectd with 100% similarity]
config/rootfiles/oldcore/171/filelists/core-files [new symlink]
config/rootfiles/oldcore/171/filelists/curl [moved from config/rootfiles/core/171/filelists/curl with 100% similarity]
config/rootfiles/oldcore/171/filelists/dhcp [moved from config/rootfiles/core/171/filelists/dhcp with 100% similarity]
config/rootfiles/oldcore/171/filelists/expat [moved from config/rootfiles/core/171/filelists/expat with 100% similarity]
config/rootfiles/oldcore/171/filelists/files [moved from config/rootfiles/core/171/filelists/files with 100% similarity]
config/rootfiles/oldcore/171/filelists/hdparm [moved from config/rootfiles/core/171/filelists/hdparm with 100% similarity]
config/rootfiles/oldcore/171/filelists/iproute2 [moved from config/rootfiles/core/171/filelists/iproute2 with 100% similarity]
config/rootfiles/oldcore/171/filelists/kbd [moved from config/rootfiles/core/171/filelists/kbd with 100% similarity]
config/rootfiles/oldcore/171/filelists/libarchive [moved from config/rootfiles/core/171/filelists/libarchive with 100% similarity]
config/rootfiles/oldcore/171/filelists/libhtp [moved from config/rootfiles/core/171/filelists/libhtp with 100% similarity]
config/rootfiles/oldcore/171/filelists/libloc [moved from config/rootfiles/core/171/filelists/libloc with 100% similarity]
config/rootfiles/oldcore/171/filelists/liboping [moved from config/rootfiles/core/171/filelists/liboping with 100% similarity]
config/rootfiles/oldcore/171/filelists/libsodium [moved from config/rootfiles/core/171/filelists/libsodium with 100% similarity]
config/rootfiles/oldcore/171/filelists/nettle [moved from config/rootfiles/core/171/filelists/nettle with 100% similarity]
config/rootfiles/oldcore/171/filelists/openvpn [moved from config/rootfiles/core/171/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl [moved from config/rootfiles/core/171/filelists/perl with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Apache-Htpasswd [moved from config/rootfiles/core/171/filelists/perl-Apache-Htpasswd with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Archive-Tar [moved from config/rootfiles/core/171/filelists/perl-Archive-Tar with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Archive-Zip [moved from config/rootfiles/core/171/filelists/perl-Archive-Zip with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-BerkeleyDB [moved from config/rootfiles/core/171/filelists/perl-BerkeleyDB with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-CGI [moved from config/rootfiles/core/171/filelists/perl-CGI with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Canary-Stability [moved from config/rootfiles/core/171/filelists/perl-Canary-Stability with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Compress-Zlib [moved from config/rootfiles/core/171/filelists/perl-Compress-Zlib with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Convert-TNEF [moved from config/rootfiles/core/171/filelists/perl-Convert-TNEF with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Convert-UUlib [moved from config/rootfiles/core/171/filelists/perl-Convert-UUlib with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Crypt-PasswdMD5 [moved from config/rootfiles/core/171/filelists/perl-Crypt-PasswdMD5 with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-DBD-SQLite [moved from config/rootfiles/core/171/filelists/perl-DBD-SQLite with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-DBI [moved from config/rootfiles/core/171/filelists/perl-DBI with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Data-UUID [moved from config/rootfiles/core/171/filelists/perl-Data-UUID with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Device-Modem [moved from config/rootfiles/core/171/filelists/perl-Device-Modem with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Device-SerialPort [moved from config/rootfiles/core/171/filelists/perl-Device-SerialPort with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Digest [moved from config/rootfiles/core/171/filelists/perl-Digest with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Digest-HMAC [moved from config/rootfiles/core/171/filelists/perl-Digest-HMAC with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Digest-SHA1 [moved from config/rootfiles/core/171/filelists/perl-Digest-SHA1 with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Email-Date-Format [moved from config/rootfiles/core/171/filelists/perl-Email-Date-Format with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-File-Remove [moved from config/rootfiles/core/171/filelists/perl-File-Remove with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Font-TTF [moved from config/rootfiles/core/171/filelists/perl-Font-TTF with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-GD [moved from config/rootfiles/core/171/filelists/perl-GD with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-GD-Graph [moved from config/rootfiles/core/171/filelists/perl-GD-Graph with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-GD-TextUtil [moved from config/rootfiles/core/171/filelists/perl-GD-TextUtil with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-HTML-Parser [moved from config/rootfiles/core/171/filelists/perl-HTML-Parser with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-HTML-Tagset [moved from config/rootfiles/core/171/filelists/perl-HTML-Tagset with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-HTML-Template [moved from config/rootfiles/core/171/filelists/perl-HTML-Template with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-HTTP-Date [moved from config/rootfiles/core/171/filelists/perl-HTTP-Date with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-HTTP-Message [moved from config/rootfiles/core/171/filelists/perl-HTTP-Message with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-IO-Socket-SSL [moved from config/rootfiles/core/171/filelists/perl-IO-Socket-SSL with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-IO-String [moved from config/rootfiles/core/171/filelists/perl-IO-String with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-IO-Stringy [moved from config/rootfiles/core/171/filelists/perl-IO-Stringy with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Imager [moved from config/rootfiles/core/171/filelists/perl-Imager with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Imager-QRCode [moved from config/rootfiles/core/171/filelists/perl-Imager-QRCode with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-LWP-Protocol-https [moved from config/rootfiles/core/171/filelists/perl-LWP-Protocol-https with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-MIME-Base32 [moved from config/rootfiles/core/171/filelists/perl-MIME-Base32 with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-MIME-Lite [moved from config/rootfiles/core/171/filelists/perl-MIME-Lite with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-MIME-Tools [moved from config/rootfiles/core/171/filelists/perl-MIME-Tools with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Mail-Tools [moved from config/rootfiles/core/171/filelists/perl-Mail-Tools with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-CIDR-Lite [moved from config/rootfiles/core/171/filelists/perl-Net-CIDR-Lite with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-DNS [moved from config/rootfiles/core/171/filelists/perl-Net-DNS with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-HTTP [moved from config/rootfiles/core/171/filelists/perl-Net-HTTP with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-IPv4Addr [moved from config/rootfiles/core/171/filelists/perl-Net-IPv4Addr with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-Server [moved from config/rootfiles/core/171/filelists/perl-Net-Server with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net-Telnet [moved from config/rootfiles/core/171/filelists/perl-Net-Telnet with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-NetAddr-IP [moved from config/rootfiles/core/171/filelists/perl-NetAddr-IP with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Net_SSLeay [moved from config/rootfiles/core/171/filelists/perl-Net_SSLeay with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-PDF-API2 [moved from config/rootfiles/core/171/filelists/perl-PDF-API2 with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Sort-Naturally [moved from config/rootfiles/core/171/filelists/perl-Sort-Naturally with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Switch [moved from config/rootfiles/core/171/filelists/perl-Switch with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Text-CSV_XS [moved from config/rootfiles/core/171/filelists/perl-Text-CSV_XS with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Try-Tiny [moved from config/rootfiles/core/171/filelists/perl-Try-Tiny with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-URI [moved from config/rootfiles/core/171/filelists/perl-URI with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-URI-Encode [moved from config/rootfiles/core/171/filelists/perl-URI-Encode with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-Unix-Syslog [moved from config/rootfiles/core/171/filelists/perl-Unix-Syslog with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-XML-Parser [moved from config/rootfiles/core/171/filelists/perl-XML-Parser with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-YAML-Tiny [moved from config/rootfiles/core/171/filelists/perl-YAML-Tiny with 100% similarity]
config/rootfiles/oldcore/171/filelists/perl-libwww [moved from config/rootfiles/core/171/filelists/perl-libwww with 100% similarity]
config/rootfiles/oldcore/171/filelists/rrdtool [moved from config/rootfiles/core/171/filelists/rrdtool with 100% similarity]
config/rootfiles/oldcore/171/filelists/sqlite [moved from config/rootfiles/core/171/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/171/filelists/squid [moved from config/rootfiles/core/171/filelists/squid with 100% similarity]
config/rootfiles/oldcore/171/filelists/strongswan [moved from config/rootfiles/core/171/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/171/filelists/suricata [moved from config/rootfiles/core/171/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/171/filelists/sysvinit [moved from config/rootfiles/core/171/filelists/sysvinit with 100% similarity]
config/rootfiles/oldcore/171/filelists/udev [moved from config/rootfiles/core/171/filelists/udev with 100% similarity]
config/rootfiles/oldcore/171/filelists/unbound [moved from config/rootfiles/core/171/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/171/filelists/wireless-regdb [moved from config/rootfiles/core/171/filelists/wireless-regdb with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/binutils [moved from config/rootfiles/core/171/filelists/x86_64/binutils with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/efivar [moved from config/rootfiles/core/171/filelists/x86_64/efivar with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/gcc [moved from config/rootfiles/core/171/filelists/x86_64/gcc with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/glibc [moved from config/rootfiles/core/171/filelists/x86_64/glibc with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/linux [moved from config/rootfiles/core/171/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/syslinux [moved from config/rootfiles/core/171/filelists/x86_64/syslinux with 100% similarity]
config/rootfiles/oldcore/171/filelists/x86_64/util-linux [moved from config/rootfiles/core/171/filelists/x86_64/util-linux with 100% similarity]
config/rootfiles/oldcore/171/update.sh [moved from config/rootfiles/core/171/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/172/filelists/files b/config/rootfiles/core/172/filelists/files
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
new file mode 100644 (file)
index 0000000..ddcc1e1
--- /dev/null
@@ -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) 2022 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=172
+
+# 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
+
+# Remove files
+
+# 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/171/core-files b/config/rootfiles/oldcore/171/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/171/exclude b/config/rootfiles/oldcore/171/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/171/filelists/core-files b/config/rootfiles/oldcore/171/filelists/core-files
new file mode 120000 (symlink)
index 0000000..709d6c1
--- /dev/null
@@ -0,0 +1 @@
+../core-files
\ No newline at end of file
diff --git a/make.sh b/make.sh
index e25eeef17c3d967ba5d6bb6be97c78a04cbef093..58220d04679566452b5c1bf69af5e7fe3d182687 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="171"                                                     # Core Level (Filename)
+CORE="172"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop