]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Start Core Update 157
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2021 13:35:36 +0000 (13:35 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2021 13:35:36 +0000 (13:35 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
83 files changed:
config/rootfiles/core/157/exclude [moved from config/rootfiles/core/156/exclude with 100% similarity]
config/rootfiles/core/157/filelists/release-files [moved from config/rootfiles/core/156/filelists/release-files with 100% similarity]
config/rootfiles/core/157/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/156/exclude [new file with mode: 0644]
config/rootfiles/oldcore/156/filelists/Archive-Tar [moved from config/rootfiles/core/156/filelists/Archive-Tar with 100% similarity]
config/rootfiles/oldcore/156/filelists/Archive-Zip [moved from config/rootfiles/core/156/filelists/Archive-Zip with 100% similarity]
config/rootfiles/oldcore/156/filelists/BerkeleyDB [moved from config/rootfiles/core/156/filelists/BerkeleyDB with 100% similarity]
config/rootfiles/oldcore/156/filelists/Compress-Zlib [moved from config/rootfiles/core/156/filelists/Compress-Zlib with 100% similarity]
config/rootfiles/oldcore/156/filelists/Convert-TNEF [moved from config/rootfiles/core/156/filelists/Convert-TNEF with 100% similarity]
config/rootfiles/oldcore/156/filelists/Convert-UUlib [moved from config/rootfiles/core/156/filelists/Convert-UUlib with 100% similarity]
config/rootfiles/oldcore/156/filelists/Crypt-PasswdMD5 [moved from config/rootfiles/core/156/filelists/Crypt-PasswdMD5 with 100% similarity]
config/rootfiles/oldcore/156/filelists/Digest-HMAC [moved from config/rootfiles/core/156/filelists/Digest-HMAC with 100% similarity]
config/rootfiles/oldcore/156/filelists/Digest-SHA1 [moved from config/rootfiles/core/156/filelists/Digest-SHA1 with 100% similarity]
config/rootfiles/oldcore/156/filelists/GD-Graph [moved from config/rootfiles/core/156/filelists/GD-Graph with 100% similarity]
config/rootfiles/oldcore/156/filelists/GD-TextUtil [moved from config/rootfiles/core/156/filelists/GD-TextUtil with 100% similarity]
config/rootfiles/oldcore/156/filelists/HTML-Parser [moved from config/rootfiles/core/156/filelists/HTML-Parser with 100% similarity]
config/rootfiles/oldcore/156/filelists/HTML-Tagset [moved from config/rootfiles/core/156/filelists/HTML-Tagset with 100% similarity]
config/rootfiles/oldcore/156/filelists/HTML-Template [moved from config/rootfiles/core/156/filelists/HTML-Template with 100% similarity]
config/rootfiles/oldcore/156/filelists/IO-Socket-SSL [moved from config/rootfiles/core/156/filelists/IO-Socket-SSL with 100% similarity]
config/rootfiles/oldcore/156/filelists/IO-Stringy [moved from config/rootfiles/core/156/filelists/IO-Stringy with 100% similarity]
config/rootfiles/oldcore/156/filelists/MIME-Tools [moved from config/rootfiles/core/156/filelists/MIME-Tools with 100% similarity]
config/rootfiles/oldcore/156/filelists/Mail-Tools [moved from config/rootfiles/core/156/filelists/Mail-Tools with 100% similarity]
config/rootfiles/oldcore/156/filelists/Net-DNS [moved from config/rootfiles/core/156/filelists/Net-DNS with 100% similarity]
config/rootfiles/oldcore/156/filelists/Net-IPv4Addr [moved from config/rootfiles/core/156/filelists/Net-IPv4Addr with 100% similarity]
config/rootfiles/oldcore/156/filelists/Net-Server [moved from config/rootfiles/core/156/filelists/Net-Server with 100% similarity]
config/rootfiles/oldcore/156/filelists/Net-Telnet [moved from config/rootfiles/core/156/filelists/Net-Telnet with 100% similarity]
config/rootfiles/oldcore/156/filelists/Net_SSLeay [moved from config/rootfiles/core/156/filelists/Net_SSLeay with 100% similarity]
config/rootfiles/oldcore/156/filelists/Text-Tabs+Wrap [moved from config/rootfiles/core/156/filelists/Text-Tabs+Wrap with 100% similarity]
config/rootfiles/oldcore/156/filelists/URI [moved from config/rootfiles/core/156/filelists/URI with 100% similarity]
config/rootfiles/oldcore/156/filelists/Unix-Syslog [moved from config/rootfiles/core/156/filelists/Unix-Syslog with 100% similarity]
config/rootfiles/oldcore/156/filelists/XML-Parser [moved from config/rootfiles/core/156/filelists/XML-Parser with 100% similarity]
config/rootfiles/oldcore/156/filelists/aarch64/files [moved from config/rootfiles/core/156/filelists/aarch64/files with 100% similarity]
config/rootfiles/oldcore/156/filelists/acl [moved from config/rootfiles/core/156/filelists/acl with 100% similarity]
config/rootfiles/oldcore/156/filelists/armv5tel/files [moved from config/rootfiles/core/156/filelists/armv5tel/files with 100% similarity]
config/rootfiles/oldcore/156/filelists/attr [moved from config/rootfiles/core/156/filelists/attr with 100% similarity]
config/rootfiles/oldcore/156/filelists/bind [moved from config/rootfiles/core/156/filelists/bind with 100% similarity]
config/rootfiles/oldcore/156/filelists/bzip2 [moved from config/rootfiles/core/156/filelists/bzip2 with 100% similarity]
config/rootfiles/oldcore/156/filelists/crda [moved from config/rootfiles/core/156/filelists/crda with 100% similarity]
config/rootfiles/oldcore/156/filelists/diffutils [moved from config/rootfiles/core/156/filelists/diffutils with 100% similarity]
config/rootfiles/oldcore/156/filelists/ed [moved from config/rootfiles/core/156/filelists/ed with 100% similarity]
config/rootfiles/oldcore/156/filelists/files [moved from config/rootfiles/core/156/filelists/files with 100% similarity]
config/rootfiles/oldcore/156/filelists/gawk [moved from config/rootfiles/core/156/filelists/gawk with 100% similarity]
config/rootfiles/oldcore/156/filelists/gettext [moved from config/rootfiles/core/156/filelists/gettext with 100% similarity]
config/rootfiles/oldcore/156/filelists/gmp [moved from config/rootfiles/core/156/filelists/gmp with 100% similarity]
config/rootfiles/oldcore/156/filelists/grep [moved from config/rootfiles/core/156/filelists/grep with 100% similarity]
config/rootfiles/oldcore/156/filelists/jquery [moved from config/rootfiles/core/156/filelists/jquery with 100% similarity]
config/rootfiles/oldcore/156/filelists/libcap [moved from config/rootfiles/core/156/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/156/filelists/libloc [moved from config/rootfiles/core/156/filelists/libloc with 100% similarity]
config/rootfiles/oldcore/156/filelists/libmpc [moved from config/rootfiles/core/156/filelists/libmpc with 100% similarity]
config/rootfiles/oldcore/156/filelists/liboping [moved from config/rootfiles/core/156/filelists/liboping with 100% similarity]
config/rootfiles/oldcore/156/filelists/libpcap [moved from config/rootfiles/core/156/filelists/libpcap with 100% similarity]
config/rootfiles/oldcore/156/filelists/libwww-perl [moved from config/rootfiles/core/156/filelists/libwww-perl with 100% similarity]
config/rootfiles/oldcore/156/filelists/nettle [moved from config/rootfiles/core/156/filelists/nettle with 100% similarity]
config/rootfiles/oldcore/156/filelists/openssl [moved from config/rootfiles/core/156/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl [moved from config/rootfiles/core/156/filelists/perl with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Apache-Htpasswd [moved from config/rootfiles/core/156/filelists/perl-Apache-Htpasswd with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-CGI [moved from config/rootfiles/core/156/filelists/perl-CGI with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-DBD-SQLite [moved from config/rootfiles/core/156/filelists/perl-DBD-SQLite with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-DBI [moved from config/rootfiles/core/156/filelists/perl-DBI with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Device-Modem [moved from config/rootfiles/core/156/filelists/perl-Device-Modem with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Device-SerialPort [moved from config/rootfiles/core/156/filelists/perl-Device-SerialPort with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Email-Date-Format [moved from config/rootfiles/core/156/filelists/perl-Email-Date-Format with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Font-TTF [moved from config/rootfiles/core/156/filelists/perl-Font-TTF with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-GD [moved from config/rootfiles/core/156/filelists/perl-GD with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-IO-String [moved from config/rootfiles/core/156/filelists/perl-IO-String with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-MIME-Lite [moved from config/rootfiles/core/156/filelists/perl-MIME-Lite with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Net-CIDR-Lite [moved from config/rootfiles/core/156/filelists/perl-Net-CIDR-Lite with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-NetAddr-IP [moved from config/rootfiles/core/156/filelists/perl-NetAddr-IP with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-PDF-API2 [moved from config/rootfiles/core/156/filelists/perl-PDF-API2 with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Sort-Naturally [moved from config/rootfiles/core/156/filelists/perl-Sort-Naturally with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Switch [moved from config/rootfiles/core/156/filelists/perl-Switch with 100% similarity]
config/rootfiles/oldcore/156/filelists/perl-Text-CSV_XS [moved from config/rootfiles/core/156/filelists/perl-Text-CSV_XS with 100% similarity]
config/rootfiles/oldcore/156/filelists/release-files [new file with mode: 0644]
config/rootfiles/oldcore/156/filelists/rrdtool [moved from config/rootfiles/core/156/filelists/rrdtool with 100% similarity]
config/rootfiles/oldcore/156/filelists/strongswan [moved from config/rootfiles/core/156/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/156/filelists/sudo [moved from config/rootfiles/core/156/filelists/sudo with 100% similarity]
config/rootfiles/oldcore/156/filelists/suricata [moved from config/rootfiles/core/156/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/156/filelists/sysvinit [moved from config/rootfiles/core/156/filelists/sysvinit with 100% similarity]
config/rootfiles/oldcore/156/filelists/web-user-interface [moved from config/rootfiles/core/156/filelists/web-user-interface with 100% similarity]
config/rootfiles/oldcore/156/filelists/x86_64/files [moved from config/rootfiles/core/156/filelists/x86_64/files with 100% similarity]
config/rootfiles/oldcore/156/filelists/zstd [moved from config/rootfiles/core/156/filelists/zstd with 100% similarity]
config/rootfiles/oldcore/156/update.sh [moved from config/rootfiles/core/156/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/157/update.sh b/config/rootfiles/core/157/update.sh
new file mode 100644 (file)
index 0000000..b5a10b9
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..818039f
--- /dev/null
@@ -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/oldcore/156/filelists/release-files b/config/rootfiles/oldcore/156/filelists/release-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 2da3aca214af778e0bb8b2dde4ca7ae1cdb3497d..86bf182ee55c72262be36ce02636dca58b89ff78 100755 (executable)
--- 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