From 1134288b548a99f34d64a81fb9bcee6f55202a8b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 10 Apr 2021 13:35:36 +0000 Subject: [PATCH] Start Core Update 157 Signed-off-by: Michael Tremer --- config/rootfiles/core/{156 => 157}/exclude | 0 .../core/{156 => 157}/filelists/release-files | 0 config/rootfiles/core/157/update.sh | 136 ++++++++++++++++++ config/rootfiles/oldcore/156/exclude | 34 +++++ .../156/filelists/Archive-Tar | 0 .../156/filelists/Archive-Zip | 0 .../156/filelists/BerkeleyDB | 0 .../156/filelists/Compress-Zlib | 0 .../156/filelists/Convert-TNEF | 0 .../156/filelists/Convert-UUlib | 0 .../156/filelists/Crypt-PasswdMD5 | 0 .../156/filelists/Digest-HMAC | 0 .../156/filelists/Digest-SHA1 | 0 .../{core => oldcore}/156/filelists/GD-Graph | 0 .../156/filelists/GD-TextUtil | 0 .../156/filelists/HTML-Parser | 0 .../156/filelists/HTML-Tagset | 0 .../156/filelists/HTML-Template | 0 .../156/filelists/IO-Socket-SSL | 0 .../156/filelists/IO-Stringy | 0 .../156/filelists/MIME-Tools | 0 .../156/filelists/Mail-Tools | 0 .../{core => oldcore}/156/filelists/Net-DNS | 0 .../156/filelists/Net-IPv4Addr | 0 .../156/filelists/Net-Server | 0 .../156/filelists/Net-Telnet | 0 .../156/filelists/Net_SSLeay | 0 .../156/filelists/Text-Tabs+Wrap | 0 .../{core => oldcore}/156/filelists/URI | 0 .../156/filelists/Unix-Syslog | 0 .../156/filelists/XML-Parser | 0 .../156/filelists/aarch64/files | 0 .../{core => oldcore}/156/filelists/acl | 0 .../156/filelists/armv5tel/files | 0 .../{core => oldcore}/156/filelists/attr | 0 .../{core => oldcore}/156/filelists/bind | 0 .../{core => oldcore}/156/filelists/bzip2 | 0 .../{core => oldcore}/156/filelists/crda | 0 .../{core => oldcore}/156/filelists/diffutils | 0 .../{core => oldcore}/156/filelists/ed | 0 .../{core => oldcore}/156/filelists/files | 0 .../{core => oldcore}/156/filelists/gawk | 0 .../{core => oldcore}/156/filelists/gettext | 0 .../{core => oldcore}/156/filelists/gmp | 0 .../{core => oldcore}/156/filelists/grep | 0 .../{core => oldcore}/156/filelists/jquery | 0 .../{core => oldcore}/156/filelists/libcap | 0 .../{core => oldcore}/156/filelists/libloc | 0 .../{core => oldcore}/156/filelists/libmpc | 0 .../{core => oldcore}/156/filelists/liboping | 0 .../{core => oldcore}/156/filelists/libpcap | 0 .../156/filelists/libwww-perl | 0 .../{core => oldcore}/156/filelists/nettle | 0 .../{core => oldcore}/156/filelists/openssl | 0 .../{core => oldcore}/156/filelists/perl | 0 .../156/filelists/perl-Apache-Htpasswd | 0 .../{core => oldcore}/156/filelists/perl-CGI | 0 .../156/filelists/perl-DBD-SQLite | 0 .../{core => oldcore}/156/filelists/perl-DBI | 0 .../156/filelists/perl-Device-Modem | 0 .../156/filelists/perl-Device-SerialPort | 0 .../156/filelists/perl-Email-Date-Format | 0 .../156/filelists/perl-Font-TTF | 0 .../{core => oldcore}/156/filelists/perl-GD | 0 .../156/filelists/perl-IO-String | 0 .../156/filelists/perl-MIME-Lite | 0 .../156/filelists/perl-Net-CIDR-Lite | 0 .../156/filelists/perl-NetAddr-IP | 0 .../156/filelists/perl-PDF-API2 | 0 .../156/filelists/perl-Sort-Naturally | 0 .../156/filelists/perl-Switch | 0 .../156/filelists/perl-Text-CSV_XS | 0 .../oldcore/156/filelists/release-files | 5 + .../{core => oldcore}/156/filelists/rrdtool | 0 .../156/filelists/strongswan | 0 .../{core => oldcore}/156/filelists/sudo | 0 .../{core => oldcore}/156/filelists/suricata | 0 .../{core => oldcore}/156/filelists/sysvinit | 0 .../156/filelists/web-user-interface | 0 .../156/filelists/x86_64/files | 0 .../{core => oldcore}/156/filelists/zstd | 0 .../rootfiles/{core => oldcore}/156/update.sh | 0 make.sh | 2 +- 83 files changed, 176 insertions(+), 1 deletion(-) rename config/rootfiles/core/{156 => 157}/exclude (100%) rename config/rootfiles/core/{156 => 157}/filelists/release-files (100%) create mode 100644 config/rootfiles/core/157/update.sh create mode 100644 config/rootfiles/oldcore/156/exclude rename config/rootfiles/{core => oldcore}/156/filelists/Archive-Tar (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Archive-Zip (100%) rename config/rootfiles/{core => oldcore}/156/filelists/BerkeleyDB (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Compress-Zlib (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Convert-TNEF (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Convert-UUlib (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Crypt-PasswdMD5 (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Digest-HMAC (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Digest-SHA1 (100%) rename config/rootfiles/{core => oldcore}/156/filelists/GD-Graph (100%) rename config/rootfiles/{core => oldcore}/156/filelists/GD-TextUtil (100%) rename config/rootfiles/{core => oldcore}/156/filelists/HTML-Parser (100%) rename config/rootfiles/{core => oldcore}/156/filelists/HTML-Tagset (100%) rename config/rootfiles/{core => oldcore}/156/filelists/HTML-Template (100%) rename config/rootfiles/{core => oldcore}/156/filelists/IO-Socket-SSL (100%) rename config/rootfiles/{core => oldcore}/156/filelists/IO-Stringy (100%) rename config/rootfiles/{core => oldcore}/156/filelists/MIME-Tools (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Mail-Tools (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Net-DNS (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Net-IPv4Addr (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Net-Server (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Net-Telnet (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Text-Tabs+Wrap (100%) rename config/rootfiles/{core => oldcore}/156/filelists/URI (100%) rename config/rootfiles/{core => oldcore}/156/filelists/Unix-Syslog (100%) rename config/rootfiles/{core => oldcore}/156/filelists/XML-Parser (100%) rename config/rootfiles/{core => oldcore}/156/filelists/aarch64/files (100%) rename config/rootfiles/{core => oldcore}/156/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/156/filelists/armv5tel/files (100%) rename config/rootfiles/{core => oldcore}/156/filelists/attr (100%) rename config/rootfiles/{core => oldcore}/156/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/156/filelists/bzip2 (100%) rename config/rootfiles/{core => oldcore}/156/filelists/crda (100%) rename config/rootfiles/{core => oldcore}/156/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/156/filelists/ed (100%) rename config/rootfiles/{core => oldcore}/156/filelists/files (100%) rename config/rootfiles/{core => oldcore}/156/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/156/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/156/filelists/gmp (100%) rename config/rootfiles/{core => oldcore}/156/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/156/filelists/jquery (100%) rename config/rootfiles/{core => oldcore}/156/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/156/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/156/filelists/libmpc (100%) rename config/rootfiles/{core => oldcore}/156/filelists/liboping (100%) rename config/rootfiles/{core => oldcore}/156/filelists/libpcap (100%) rename config/rootfiles/{core => oldcore}/156/filelists/libwww-perl (100%) rename config/rootfiles/{core => oldcore}/156/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/156/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Apache-Htpasswd (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-CGI (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-DBD-SQLite (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-DBI (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Device-Modem (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Device-SerialPort (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Email-Date-Format (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Font-TTF (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-GD (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-IO-String (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-MIME-Lite (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Net-CIDR-Lite (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-NetAddr-IP (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-PDF-API2 (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Sort-Naturally (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Switch (100%) rename config/rootfiles/{core => oldcore}/156/filelists/perl-Text-CSV_XS (100%) create mode 100644 config/rootfiles/oldcore/156/filelists/release-files rename config/rootfiles/{core => oldcore}/156/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/156/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/156/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/156/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/156/filelists/sysvinit (100%) rename config/rootfiles/{core => oldcore}/156/filelists/web-user-interface (100%) rename config/rootfiles/{core => oldcore}/156/filelists/x86_64/files (100%) rename config/rootfiles/{core => oldcore}/156/filelists/zstd (100%) rename config/rootfiles/{core => oldcore}/156/update.sh (100%) diff --git a/config/rootfiles/core/156/exclude b/config/rootfiles/core/157/exclude similarity index 100% rename from config/rootfiles/core/156/exclude rename to config/rootfiles/core/157/exclude diff --git a/config/rootfiles/core/156/filelists/release-files b/config/rootfiles/core/157/filelists/release-files similarity index 100% rename from config/rootfiles/core/156/filelists/release-files rename to config/rootfiles/core/157/filelists/release-files diff --git a/config/rootfiles/core/157/update.sh b/config/rootfiles/core/157/update.sh new file mode 100644 index 0000000000..b5a10b9b39 --- /dev/null +++ b/config/rootfiles/core/157/update.sh @@ -0,0 +1,136 @@ +#!/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) 2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=157 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire-kirkwood) + exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1 + ;; + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac +if [ -e /boot/grub/grub.conf ]; then + exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1 +fi + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +# Remove files + +# 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 + +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +# 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/156/exclude b/config/rootfiles/oldcore/156/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/oldcore/156/exclude @@ -0,0 +1,34 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +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 +usr/share/xt_geoip +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/core/156/filelists/Archive-Tar b/config/rootfiles/oldcore/156/filelists/Archive-Tar similarity index 100% rename from config/rootfiles/core/156/filelists/Archive-Tar rename to config/rootfiles/oldcore/156/filelists/Archive-Tar diff --git a/config/rootfiles/core/156/filelists/Archive-Zip b/config/rootfiles/oldcore/156/filelists/Archive-Zip similarity index 100% rename from config/rootfiles/core/156/filelists/Archive-Zip rename to config/rootfiles/oldcore/156/filelists/Archive-Zip diff --git a/config/rootfiles/core/156/filelists/BerkeleyDB b/config/rootfiles/oldcore/156/filelists/BerkeleyDB similarity index 100% rename from config/rootfiles/core/156/filelists/BerkeleyDB rename to config/rootfiles/oldcore/156/filelists/BerkeleyDB diff --git a/config/rootfiles/core/156/filelists/Compress-Zlib b/config/rootfiles/oldcore/156/filelists/Compress-Zlib similarity index 100% rename from config/rootfiles/core/156/filelists/Compress-Zlib rename to config/rootfiles/oldcore/156/filelists/Compress-Zlib diff --git a/config/rootfiles/core/156/filelists/Convert-TNEF b/config/rootfiles/oldcore/156/filelists/Convert-TNEF similarity index 100% rename from config/rootfiles/core/156/filelists/Convert-TNEF rename to config/rootfiles/oldcore/156/filelists/Convert-TNEF diff --git a/config/rootfiles/core/156/filelists/Convert-UUlib b/config/rootfiles/oldcore/156/filelists/Convert-UUlib similarity index 100% rename from config/rootfiles/core/156/filelists/Convert-UUlib rename to config/rootfiles/oldcore/156/filelists/Convert-UUlib diff --git a/config/rootfiles/core/156/filelists/Crypt-PasswdMD5 b/config/rootfiles/oldcore/156/filelists/Crypt-PasswdMD5 similarity index 100% rename from config/rootfiles/core/156/filelists/Crypt-PasswdMD5 rename to config/rootfiles/oldcore/156/filelists/Crypt-PasswdMD5 diff --git a/config/rootfiles/core/156/filelists/Digest-HMAC b/config/rootfiles/oldcore/156/filelists/Digest-HMAC similarity index 100% rename from config/rootfiles/core/156/filelists/Digest-HMAC rename to config/rootfiles/oldcore/156/filelists/Digest-HMAC diff --git a/config/rootfiles/core/156/filelists/Digest-SHA1 b/config/rootfiles/oldcore/156/filelists/Digest-SHA1 similarity index 100% rename from config/rootfiles/core/156/filelists/Digest-SHA1 rename to config/rootfiles/oldcore/156/filelists/Digest-SHA1 diff --git a/config/rootfiles/core/156/filelists/GD-Graph b/config/rootfiles/oldcore/156/filelists/GD-Graph similarity index 100% rename from config/rootfiles/core/156/filelists/GD-Graph rename to config/rootfiles/oldcore/156/filelists/GD-Graph diff --git a/config/rootfiles/core/156/filelists/GD-TextUtil b/config/rootfiles/oldcore/156/filelists/GD-TextUtil similarity index 100% rename from config/rootfiles/core/156/filelists/GD-TextUtil rename to config/rootfiles/oldcore/156/filelists/GD-TextUtil diff --git a/config/rootfiles/core/156/filelists/HTML-Parser b/config/rootfiles/oldcore/156/filelists/HTML-Parser similarity index 100% rename from config/rootfiles/core/156/filelists/HTML-Parser rename to config/rootfiles/oldcore/156/filelists/HTML-Parser diff --git a/config/rootfiles/core/156/filelists/HTML-Tagset b/config/rootfiles/oldcore/156/filelists/HTML-Tagset similarity index 100% rename from config/rootfiles/core/156/filelists/HTML-Tagset rename to config/rootfiles/oldcore/156/filelists/HTML-Tagset diff --git a/config/rootfiles/core/156/filelists/HTML-Template b/config/rootfiles/oldcore/156/filelists/HTML-Template similarity index 100% rename from config/rootfiles/core/156/filelists/HTML-Template rename to config/rootfiles/oldcore/156/filelists/HTML-Template diff --git a/config/rootfiles/core/156/filelists/IO-Socket-SSL b/config/rootfiles/oldcore/156/filelists/IO-Socket-SSL similarity index 100% rename from config/rootfiles/core/156/filelists/IO-Socket-SSL rename to config/rootfiles/oldcore/156/filelists/IO-Socket-SSL diff --git a/config/rootfiles/core/156/filelists/IO-Stringy b/config/rootfiles/oldcore/156/filelists/IO-Stringy similarity index 100% rename from config/rootfiles/core/156/filelists/IO-Stringy rename to config/rootfiles/oldcore/156/filelists/IO-Stringy diff --git a/config/rootfiles/core/156/filelists/MIME-Tools b/config/rootfiles/oldcore/156/filelists/MIME-Tools similarity index 100% rename from config/rootfiles/core/156/filelists/MIME-Tools rename to config/rootfiles/oldcore/156/filelists/MIME-Tools diff --git a/config/rootfiles/core/156/filelists/Mail-Tools b/config/rootfiles/oldcore/156/filelists/Mail-Tools similarity index 100% rename from config/rootfiles/core/156/filelists/Mail-Tools rename to config/rootfiles/oldcore/156/filelists/Mail-Tools diff --git a/config/rootfiles/core/156/filelists/Net-DNS b/config/rootfiles/oldcore/156/filelists/Net-DNS similarity index 100% rename from config/rootfiles/core/156/filelists/Net-DNS rename to config/rootfiles/oldcore/156/filelists/Net-DNS diff --git a/config/rootfiles/core/156/filelists/Net-IPv4Addr b/config/rootfiles/oldcore/156/filelists/Net-IPv4Addr similarity index 100% rename from config/rootfiles/core/156/filelists/Net-IPv4Addr rename to config/rootfiles/oldcore/156/filelists/Net-IPv4Addr diff --git a/config/rootfiles/core/156/filelists/Net-Server b/config/rootfiles/oldcore/156/filelists/Net-Server similarity index 100% rename from config/rootfiles/core/156/filelists/Net-Server rename to config/rootfiles/oldcore/156/filelists/Net-Server diff --git a/config/rootfiles/core/156/filelists/Net-Telnet b/config/rootfiles/oldcore/156/filelists/Net-Telnet similarity index 100% rename from config/rootfiles/core/156/filelists/Net-Telnet rename to config/rootfiles/oldcore/156/filelists/Net-Telnet diff --git a/config/rootfiles/core/156/filelists/Net_SSLeay b/config/rootfiles/oldcore/156/filelists/Net_SSLeay similarity index 100% rename from config/rootfiles/core/156/filelists/Net_SSLeay rename to config/rootfiles/oldcore/156/filelists/Net_SSLeay diff --git a/config/rootfiles/core/156/filelists/Text-Tabs+Wrap b/config/rootfiles/oldcore/156/filelists/Text-Tabs+Wrap similarity index 100% rename from config/rootfiles/core/156/filelists/Text-Tabs+Wrap rename to config/rootfiles/oldcore/156/filelists/Text-Tabs+Wrap diff --git a/config/rootfiles/core/156/filelists/URI b/config/rootfiles/oldcore/156/filelists/URI similarity index 100% rename from config/rootfiles/core/156/filelists/URI rename to config/rootfiles/oldcore/156/filelists/URI diff --git a/config/rootfiles/core/156/filelists/Unix-Syslog b/config/rootfiles/oldcore/156/filelists/Unix-Syslog similarity index 100% rename from config/rootfiles/core/156/filelists/Unix-Syslog rename to config/rootfiles/oldcore/156/filelists/Unix-Syslog diff --git a/config/rootfiles/core/156/filelists/XML-Parser b/config/rootfiles/oldcore/156/filelists/XML-Parser similarity index 100% rename from config/rootfiles/core/156/filelists/XML-Parser rename to config/rootfiles/oldcore/156/filelists/XML-Parser diff --git a/config/rootfiles/core/156/filelists/aarch64/files b/config/rootfiles/oldcore/156/filelists/aarch64/files similarity index 100% rename from config/rootfiles/core/156/filelists/aarch64/files rename to config/rootfiles/oldcore/156/filelists/aarch64/files diff --git a/config/rootfiles/core/156/filelists/acl b/config/rootfiles/oldcore/156/filelists/acl similarity index 100% rename from config/rootfiles/core/156/filelists/acl rename to config/rootfiles/oldcore/156/filelists/acl diff --git a/config/rootfiles/core/156/filelists/armv5tel/files b/config/rootfiles/oldcore/156/filelists/armv5tel/files similarity index 100% rename from config/rootfiles/core/156/filelists/armv5tel/files rename to config/rootfiles/oldcore/156/filelists/armv5tel/files diff --git a/config/rootfiles/core/156/filelists/attr b/config/rootfiles/oldcore/156/filelists/attr similarity index 100% rename from config/rootfiles/core/156/filelists/attr rename to config/rootfiles/oldcore/156/filelists/attr diff --git a/config/rootfiles/core/156/filelists/bind b/config/rootfiles/oldcore/156/filelists/bind similarity index 100% rename from config/rootfiles/core/156/filelists/bind rename to config/rootfiles/oldcore/156/filelists/bind diff --git a/config/rootfiles/core/156/filelists/bzip2 b/config/rootfiles/oldcore/156/filelists/bzip2 similarity index 100% rename from config/rootfiles/core/156/filelists/bzip2 rename to config/rootfiles/oldcore/156/filelists/bzip2 diff --git a/config/rootfiles/core/156/filelists/crda b/config/rootfiles/oldcore/156/filelists/crda similarity index 100% rename from config/rootfiles/core/156/filelists/crda rename to config/rootfiles/oldcore/156/filelists/crda diff --git a/config/rootfiles/core/156/filelists/diffutils b/config/rootfiles/oldcore/156/filelists/diffutils similarity index 100% rename from config/rootfiles/core/156/filelists/diffutils rename to config/rootfiles/oldcore/156/filelists/diffutils diff --git a/config/rootfiles/core/156/filelists/ed b/config/rootfiles/oldcore/156/filelists/ed similarity index 100% rename from config/rootfiles/core/156/filelists/ed rename to config/rootfiles/oldcore/156/filelists/ed diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/oldcore/156/filelists/files similarity index 100% rename from config/rootfiles/core/156/filelists/files rename to config/rootfiles/oldcore/156/filelists/files diff --git a/config/rootfiles/core/156/filelists/gawk b/config/rootfiles/oldcore/156/filelists/gawk similarity index 100% rename from config/rootfiles/core/156/filelists/gawk rename to config/rootfiles/oldcore/156/filelists/gawk diff --git a/config/rootfiles/core/156/filelists/gettext b/config/rootfiles/oldcore/156/filelists/gettext similarity index 100% rename from config/rootfiles/core/156/filelists/gettext rename to config/rootfiles/oldcore/156/filelists/gettext diff --git a/config/rootfiles/core/156/filelists/gmp b/config/rootfiles/oldcore/156/filelists/gmp similarity index 100% rename from config/rootfiles/core/156/filelists/gmp rename to config/rootfiles/oldcore/156/filelists/gmp diff --git a/config/rootfiles/core/156/filelists/grep b/config/rootfiles/oldcore/156/filelists/grep similarity index 100% rename from config/rootfiles/core/156/filelists/grep rename to config/rootfiles/oldcore/156/filelists/grep diff --git a/config/rootfiles/core/156/filelists/jquery b/config/rootfiles/oldcore/156/filelists/jquery similarity index 100% rename from config/rootfiles/core/156/filelists/jquery rename to config/rootfiles/oldcore/156/filelists/jquery diff --git a/config/rootfiles/core/156/filelists/libcap b/config/rootfiles/oldcore/156/filelists/libcap similarity index 100% rename from config/rootfiles/core/156/filelists/libcap rename to config/rootfiles/oldcore/156/filelists/libcap diff --git a/config/rootfiles/core/156/filelists/libloc b/config/rootfiles/oldcore/156/filelists/libloc similarity index 100% rename from config/rootfiles/core/156/filelists/libloc rename to config/rootfiles/oldcore/156/filelists/libloc diff --git a/config/rootfiles/core/156/filelists/libmpc b/config/rootfiles/oldcore/156/filelists/libmpc similarity index 100% rename from config/rootfiles/core/156/filelists/libmpc rename to config/rootfiles/oldcore/156/filelists/libmpc diff --git a/config/rootfiles/core/156/filelists/liboping b/config/rootfiles/oldcore/156/filelists/liboping similarity index 100% rename from config/rootfiles/core/156/filelists/liboping rename to config/rootfiles/oldcore/156/filelists/liboping diff --git a/config/rootfiles/core/156/filelists/libpcap b/config/rootfiles/oldcore/156/filelists/libpcap similarity index 100% rename from config/rootfiles/core/156/filelists/libpcap rename to config/rootfiles/oldcore/156/filelists/libpcap diff --git a/config/rootfiles/core/156/filelists/libwww-perl b/config/rootfiles/oldcore/156/filelists/libwww-perl similarity index 100% rename from config/rootfiles/core/156/filelists/libwww-perl rename to config/rootfiles/oldcore/156/filelists/libwww-perl diff --git a/config/rootfiles/core/156/filelists/nettle b/config/rootfiles/oldcore/156/filelists/nettle similarity index 100% rename from config/rootfiles/core/156/filelists/nettle rename to config/rootfiles/oldcore/156/filelists/nettle diff --git a/config/rootfiles/core/156/filelists/openssl b/config/rootfiles/oldcore/156/filelists/openssl similarity index 100% rename from config/rootfiles/core/156/filelists/openssl rename to config/rootfiles/oldcore/156/filelists/openssl diff --git a/config/rootfiles/core/156/filelists/perl b/config/rootfiles/oldcore/156/filelists/perl similarity index 100% rename from config/rootfiles/core/156/filelists/perl rename to config/rootfiles/oldcore/156/filelists/perl diff --git a/config/rootfiles/core/156/filelists/perl-Apache-Htpasswd b/config/rootfiles/oldcore/156/filelists/perl-Apache-Htpasswd similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Apache-Htpasswd rename to config/rootfiles/oldcore/156/filelists/perl-Apache-Htpasswd diff --git a/config/rootfiles/core/156/filelists/perl-CGI b/config/rootfiles/oldcore/156/filelists/perl-CGI similarity index 100% rename from config/rootfiles/core/156/filelists/perl-CGI rename to config/rootfiles/oldcore/156/filelists/perl-CGI diff --git a/config/rootfiles/core/156/filelists/perl-DBD-SQLite b/config/rootfiles/oldcore/156/filelists/perl-DBD-SQLite similarity index 100% rename from config/rootfiles/core/156/filelists/perl-DBD-SQLite rename to config/rootfiles/oldcore/156/filelists/perl-DBD-SQLite diff --git a/config/rootfiles/core/156/filelists/perl-DBI b/config/rootfiles/oldcore/156/filelists/perl-DBI similarity index 100% rename from config/rootfiles/core/156/filelists/perl-DBI rename to config/rootfiles/oldcore/156/filelists/perl-DBI diff --git a/config/rootfiles/core/156/filelists/perl-Device-Modem b/config/rootfiles/oldcore/156/filelists/perl-Device-Modem similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Device-Modem rename to config/rootfiles/oldcore/156/filelists/perl-Device-Modem diff --git a/config/rootfiles/core/156/filelists/perl-Device-SerialPort b/config/rootfiles/oldcore/156/filelists/perl-Device-SerialPort similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Device-SerialPort rename to config/rootfiles/oldcore/156/filelists/perl-Device-SerialPort diff --git a/config/rootfiles/core/156/filelists/perl-Email-Date-Format b/config/rootfiles/oldcore/156/filelists/perl-Email-Date-Format similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Email-Date-Format rename to config/rootfiles/oldcore/156/filelists/perl-Email-Date-Format diff --git a/config/rootfiles/core/156/filelists/perl-Font-TTF b/config/rootfiles/oldcore/156/filelists/perl-Font-TTF similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Font-TTF rename to config/rootfiles/oldcore/156/filelists/perl-Font-TTF diff --git a/config/rootfiles/core/156/filelists/perl-GD b/config/rootfiles/oldcore/156/filelists/perl-GD similarity index 100% rename from config/rootfiles/core/156/filelists/perl-GD rename to config/rootfiles/oldcore/156/filelists/perl-GD diff --git a/config/rootfiles/core/156/filelists/perl-IO-String b/config/rootfiles/oldcore/156/filelists/perl-IO-String similarity index 100% rename from config/rootfiles/core/156/filelists/perl-IO-String rename to config/rootfiles/oldcore/156/filelists/perl-IO-String diff --git a/config/rootfiles/core/156/filelists/perl-MIME-Lite b/config/rootfiles/oldcore/156/filelists/perl-MIME-Lite similarity index 100% rename from config/rootfiles/core/156/filelists/perl-MIME-Lite rename to config/rootfiles/oldcore/156/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/156/filelists/perl-Net-CIDR-Lite b/config/rootfiles/oldcore/156/filelists/perl-Net-CIDR-Lite similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Net-CIDR-Lite rename to config/rootfiles/oldcore/156/filelists/perl-Net-CIDR-Lite diff --git a/config/rootfiles/core/156/filelists/perl-NetAddr-IP b/config/rootfiles/oldcore/156/filelists/perl-NetAddr-IP similarity index 100% rename from config/rootfiles/core/156/filelists/perl-NetAddr-IP rename to config/rootfiles/oldcore/156/filelists/perl-NetAddr-IP diff --git a/config/rootfiles/core/156/filelists/perl-PDF-API2 b/config/rootfiles/oldcore/156/filelists/perl-PDF-API2 similarity index 100% rename from config/rootfiles/core/156/filelists/perl-PDF-API2 rename to config/rootfiles/oldcore/156/filelists/perl-PDF-API2 diff --git a/config/rootfiles/core/156/filelists/perl-Sort-Naturally b/config/rootfiles/oldcore/156/filelists/perl-Sort-Naturally similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Sort-Naturally rename to config/rootfiles/oldcore/156/filelists/perl-Sort-Naturally diff --git a/config/rootfiles/core/156/filelists/perl-Switch b/config/rootfiles/oldcore/156/filelists/perl-Switch similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Switch rename to config/rootfiles/oldcore/156/filelists/perl-Switch diff --git a/config/rootfiles/core/156/filelists/perl-Text-CSV_XS b/config/rootfiles/oldcore/156/filelists/perl-Text-CSV_XS similarity index 100% rename from config/rootfiles/core/156/filelists/perl-Text-CSV_XS rename to config/rootfiles/oldcore/156/filelists/perl-Text-CSV_XS diff --git a/config/rootfiles/oldcore/156/filelists/release-files b/config/rootfiles/oldcore/156/filelists/release-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/156/filelists/release-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/156/filelists/rrdtool b/config/rootfiles/oldcore/156/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/156/filelists/rrdtool rename to config/rootfiles/oldcore/156/filelists/rrdtool diff --git a/config/rootfiles/core/156/filelists/strongswan b/config/rootfiles/oldcore/156/filelists/strongswan similarity index 100% rename from config/rootfiles/core/156/filelists/strongswan rename to config/rootfiles/oldcore/156/filelists/strongswan diff --git a/config/rootfiles/core/156/filelists/sudo b/config/rootfiles/oldcore/156/filelists/sudo similarity index 100% rename from config/rootfiles/core/156/filelists/sudo rename to config/rootfiles/oldcore/156/filelists/sudo diff --git a/config/rootfiles/core/156/filelists/suricata b/config/rootfiles/oldcore/156/filelists/suricata similarity index 100% rename from config/rootfiles/core/156/filelists/suricata rename to config/rootfiles/oldcore/156/filelists/suricata diff --git a/config/rootfiles/core/156/filelists/sysvinit b/config/rootfiles/oldcore/156/filelists/sysvinit similarity index 100% rename from config/rootfiles/core/156/filelists/sysvinit rename to config/rootfiles/oldcore/156/filelists/sysvinit diff --git a/config/rootfiles/core/156/filelists/web-user-interface b/config/rootfiles/oldcore/156/filelists/web-user-interface similarity index 100% rename from config/rootfiles/core/156/filelists/web-user-interface rename to config/rootfiles/oldcore/156/filelists/web-user-interface diff --git a/config/rootfiles/core/156/filelists/x86_64/files b/config/rootfiles/oldcore/156/filelists/x86_64/files similarity index 100% rename from config/rootfiles/core/156/filelists/x86_64/files rename to config/rootfiles/oldcore/156/filelists/x86_64/files diff --git a/config/rootfiles/core/156/filelists/zstd b/config/rootfiles/oldcore/156/filelists/zstd similarity index 100% rename from config/rootfiles/core/156/filelists/zstd rename to config/rootfiles/oldcore/156/filelists/zstd diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/oldcore/156/update.sh similarity index 100% rename from config/rootfiles/core/156/update.sh rename to config/rootfiles/oldcore/156/update.sh diff --git a/make.sh b/make.sh index 2da3aca214..86bf182ee5 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,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.25" # Version number -CORE="156" # Core Level (Filename) +CORE="157" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.2