From: Michael Tremer Date: Tue, 16 Mar 2021 11:29:27 +0000 (+0000) Subject: Start Core Update 156 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00facd0112cd34e7844f8d47ae34e5dc7cd2a92f;p=people%2Fstevee%2Fipfire-2.x.git Start Core Update 156 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/155/exclude b/config/rootfiles/core/156/exclude similarity index 100% rename from config/rootfiles/core/155/exclude rename to config/rootfiles/core/156/exclude diff --git a/config/rootfiles/core/155/filelists/release-files b/config/rootfiles/core/156/filelists/release-files similarity index 100% rename from config/rootfiles/core/155/filelists/release-files rename to config/rootfiles/core/156/filelists/release-files diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh new file mode 100644 index 0000000000..449e24b8ea --- /dev/null +++ b/config/rootfiles/core/156/update.sh @@ -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) 2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=156 + +# 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 + +# 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 + +# 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/155/exclude b/config/rootfiles/oldcore/155/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/oldcore/155/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/155/filelists/aarch64/boost b/config/rootfiles/oldcore/155/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/155/filelists/aarch64/boost rename to config/rootfiles/oldcore/155/filelists/aarch64/boost diff --git a/config/rootfiles/core/155/filelists/aarch64/python b/config/rootfiles/oldcore/155/filelists/aarch64/python similarity index 100% rename from config/rootfiles/core/155/filelists/aarch64/python rename to config/rootfiles/oldcore/155/filelists/aarch64/python diff --git a/config/rootfiles/core/155/filelists/aarch64/python3 b/config/rootfiles/oldcore/155/filelists/aarch64/python3 similarity index 100% rename from config/rootfiles/core/155/filelists/aarch64/python3 rename to config/rootfiles/oldcore/155/filelists/aarch64/python3 diff --git a/config/rootfiles/core/155/filelists/aarch64/util-linux b/config/rootfiles/oldcore/155/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/155/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/155/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/155/filelists/armv5tel/boost b/config/rootfiles/oldcore/155/filelists/armv5tel/boost similarity index 100% rename from config/rootfiles/core/155/filelists/armv5tel/boost rename to config/rootfiles/oldcore/155/filelists/armv5tel/boost diff --git a/config/rootfiles/core/155/filelists/armv5tel/python b/config/rootfiles/oldcore/155/filelists/armv5tel/python similarity index 100% rename from config/rootfiles/core/155/filelists/armv5tel/python rename to config/rootfiles/oldcore/155/filelists/armv5tel/python diff --git a/config/rootfiles/core/155/filelists/armv5tel/python3 b/config/rootfiles/oldcore/155/filelists/armv5tel/python3 similarity index 100% rename from config/rootfiles/core/155/filelists/armv5tel/python3 rename to config/rootfiles/oldcore/155/filelists/armv5tel/python3 diff --git a/config/rootfiles/core/155/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/155/filelists/armv5tel/util-linux similarity index 100% rename from config/rootfiles/core/155/filelists/armv5tel/util-linux rename to config/rootfiles/oldcore/155/filelists/armv5tel/util-linux diff --git a/config/rootfiles/core/155/filelists/attr b/config/rootfiles/oldcore/155/filelists/attr similarity index 100% rename from config/rootfiles/core/155/filelists/attr rename to config/rootfiles/oldcore/155/filelists/attr diff --git a/config/rootfiles/core/155/filelists/bind b/config/rootfiles/oldcore/155/filelists/bind similarity index 100% rename from config/rootfiles/core/155/filelists/bind rename to config/rootfiles/oldcore/155/filelists/bind diff --git a/config/rootfiles/core/155/filelists/collectd b/config/rootfiles/oldcore/155/filelists/collectd similarity index 100% rename from config/rootfiles/core/155/filelists/collectd rename to config/rootfiles/oldcore/155/filelists/collectd diff --git a/config/rootfiles/core/155/filelists/dhcp b/config/rootfiles/oldcore/155/filelists/dhcp similarity index 100% rename from config/rootfiles/core/155/filelists/dhcp rename to config/rootfiles/oldcore/155/filelists/dhcp diff --git a/config/rootfiles/core/155/filelists/e2fsprogs b/config/rootfiles/oldcore/155/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/155/filelists/e2fsprogs rename to config/rootfiles/oldcore/155/filelists/e2fsprogs diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/oldcore/155/filelists/files similarity index 100% rename from config/rootfiles/core/155/filelists/files rename to config/rootfiles/oldcore/155/filelists/files diff --git a/config/rootfiles/core/155/filelists/freetype b/config/rootfiles/oldcore/155/filelists/freetype similarity index 100% rename from config/rootfiles/core/155/filelists/freetype rename to config/rootfiles/oldcore/155/filelists/freetype diff --git a/config/rootfiles/core/155/filelists/glib b/config/rootfiles/oldcore/155/filelists/glib similarity index 100% rename from config/rootfiles/core/155/filelists/glib rename to config/rootfiles/oldcore/155/filelists/glib diff --git a/config/rootfiles/core/155/filelists/i586/boost b/config/rootfiles/oldcore/155/filelists/i586/boost similarity index 100% rename from config/rootfiles/core/155/filelists/i586/boost rename to config/rootfiles/oldcore/155/filelists/i586/boost diff --git a/config/rootfiles/core/155/filelists/i586/python b/config/rootfiles/oldcore/155/filelists/i586/python similarity index 100% rename from config/rootfiles/core/155/filelists/i586/python rename to config/rootfiles/oldcore/155/filelists/i586/python diff --git a/config/rootfiles/core/155/filelists/i586/python3 b/config/rootfiles/oldcore/155/filelists/i586/python3 similarity index 100% rename from config/rootfiles/core/155/filelists/i586/python3 rename to config/rootfiles/oldcore/155/filelists/i586/python3 diff --git a/config/rootfiles/core/155/filelists/i586/util-linux b/config/rootfiles/oldcore/155/filelists/i586/util-linux similarity index 100% rename from config/rootfiles/core/155/filelists/i586/util-linux rename to config/rootfiles/oldcore/155/filelists/i586/util-linux diff --git a/config/rootfiles/core/155/filelists/iproute2 b/config/rootfiles/oldcore/155/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/155/filelists/iproute2 rename to config/rootfiles/oldcore/155/filelists/iproute2 diff --git a/config/rootfiles/core/155/filelists/ipset b/config/rootfiles/oldcore/155/filelists/ipset similarity index 100% rename from config/rootfiles/core/155/filelists/ipset rename to config/rootfiles/oldcore/155/filelists/ipset diff --git a/config/rootfiles/core/155/filelists/lcms2 b/config/rootfiles/oldcore/155/filelists/lcms2 similarity index 100% rename from config/rootfiles/core/155/filelists/lcms2 rename to config/rootfiles/oldcore/155/filelists/lcms2 diff --git a/config/rootfiles/core/155/filelists/libffi b/config/rootfiles/oldcore/155/filelists/libffi similarity index 100% rename from config/rootfiles/core/155/filelists/libffi rename to config/rootfiles/oldcore/155/filelists/libffi diff --git a/config/rootfiles/core/155/filelists/libgcrypt b/config/rootfiles/oldcore/155/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/155/filelists/libgcrypt rename to config/rootfiles/oldcore/155/filelists/libgcrypt diff --git a/config/rootfiles/core/155/filelists/libhtp b/config/rootfiles/oldcore/155/filelists/libhtp similarity index 100% rename from config/rootfiles/core/155/filelists/libhtp rename to config/rootfiles/oldcore/155/filelists/libhtp diff --git a/config/rootfiles/core/155/filelists/libxcrypt b/config/rootfiles/oldcore/155/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/155/filelists/libxcrypt rename to config/rootfiles/oldcore/155/filelists/libxcrypt diff --git a/config/rootfiles/core/155/filelists/lz4 b/config/rootfiles/oldcore/155/filelists/lz4 similarity index 100% rename from config/rootfiles/core/155/filelists/lz4 rename to config/rootfiles/oldcore/155/filelists/lz4 diff --git a/config/rootfiles/core/155/filelists/net-tools b/config/rootfiles/oldcore/155/filelists/net-tools similarity index 100% rename from config/rootfiles/core/155/filelists/net-tools rename to config/rootfiles/oldcore/155/filelists/net-tools diff --git a/config/rootfiles/core/155/filelists/nettle b/config/rootfiles/oldcore/155/filelists/nettle similarity index 100% rename from config/rootfiles/core/155/filelists/nettle rename to config/rootfiles/oldcore/155/filelists/nettle diff --git a/config/rootfiles/core/155/filelists/openssh b/config/rootfiles/oldcore/155/filelists/openssh similarity index 100% rename from config/rootfiles/core/155/filelists/openssh rename to config/rootfiles/oldcore/155/filelists/openssh diff --git a/config/rootfiles/core/155/filelists/openssl b/config/rootfiles/oldcore/155/filelists/openssl similarity index 100% rename from config/rootfiles/core/155/filelists/openssl rename to config/rootfiles/oldcore/155/filelists/openssl diff --git a/config/rootfiles/core/155/filelists/pcre2 b/config/rootfiles/oldcore/155/filelists/pcre2 similarity index 100% rename from config/rootfiles/core/155/filelists/pcre2 rename to config/rootfiles/oldcore/155/filelists/pcre2 diff --git a/config/rootfiles/core/155/filelists/qpdf b/config/rootfiles/oldcore/155/filelists/qpdf similarity index 100% rename from config/rootfiles/core/155/filelists/qpdf rename to config/rootfiles/oldcore/155/filelists/qpdf diff --git a/config/rootfiles/oldcore/155/filelists/release-files b/config/rootfiles/oldcore/155/filelists/release-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/155/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/155/filelists/sqlite b/config/rootfiles/oldcore/155/filelists/sqlite similarity index 100% rename from config/rootfiles/core/155/filelists/sqlite rename to config/rootfiles/oldcore/155/filelists/sqlite diff --git a/config/rootfiles/core/155/filelists/squid b/config/rootfiles/oldcore/155/filelists/squid similarity index 100% rename from config/rootfiles/core/155/filelists/squid rename to config/rootfiles/oldcore/155/filelists/squid diff --git a/config/rootfiles/core/155/filelists/suricata b/config/rootfiles/oldcore/155/filelists/suricata similarity index 100% rename from config/rootfiles/core/155/filelists/suricata rename to config/rootfiles/oldcore/155/filelists/suricata diff --git a/config/rootfiles/core/155/filelists/sysvinit b/config/rootfiles/oldcore/155/filelists/sysvinit similarity index 100% rename from config/rootfiles/core/155/filelists/sysvinit rename to config/rootfiles/oldcore/155/filelists/sysvinit diff --git a/config/rootfiles/core/155/filelists/tar b/config/rootfiles/oldcore/155/filelists/tar similarity index 100% rename from config/rootfiles/core/155/filelists/tar rename to config/rootfiles/oldcore/155/filelists/tar diff --git a/config/rootfiles/core/155/filelists/tcl b/config/rootfiles/oldcore/155/filelists/tcl similarity index 100% rename from config/rootfiles/core/155/filelists/tcl rename to config/rootfiles/oldcore/155/filelists/tcl diff --git a/config/rootfiles/core/155/filelists/unbound b/config/rootfiles/oldcore/155/filelists/unbound similarity index 100% rename from config/rootfiles/core/155/filelists/unbound rename to config/rootfiles/oldcore/155/filelists/unbound diff --git a/config/rootfiles/core/155/filelists/wget b/config/rootfiles/oldcore/155/filelists/wget similarity index 100% rename from config/rootfiles/core/155/filelists/wget rename to config/rootfiles/oldcore/155/filelists/wget diff --git a/config/rootfiles/core/155/filelists/x86_64/boost b/config/rootfiles/oldcore/155/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/155/filelists/x86_64/boost rename to config/rootfiles/oldcore/155/filelists/x86_64/boost diff --git a/config/rootfiles/core/155/filelists/x86_64/python b/config/rootfiles/oldcore/155/filelists/x86_64/python similarity index 100% rename from config/rootfiles/core/155/filelists/x86_64/python rename to config/rootfiles/oldcore/155/filelists/x86_64/python diff --git a/config/rootfiles/core/155/filelists/x86_64/python3 b/config/rootfiles/oldcore/155/filelists/x86_64/python3 similarity index 100% rename from config/rootfiles/core/155/filelists/x86_64/python3 rename to config/rootfiles/oldcore/155/filelists/x86_64/python3 diff --git a/config/rootfiles/core/155/filelists/x86_64/util-linux b/config/rootfiles/oldcore/155/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/155/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/155/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/oldcore/155/update.sh similarity index 100% rename from config/rootfiles/core/155/update.sh rename to config/rootfiles/oldcore/155/update.sh diff --git a/make.sh b/make.sh index 98ffee0d1f..0c124ac81a 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="155" # Core Level (Filename) +CORE="156" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop