From eb53b56d3a61be12f474c5d426e6fe70ca3a1515 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 5 Feb 2021 16:48:59 +0000 Subject: [PATCH] Start Core Update 155 Signed-off-by: Michael Tremer --- config/rootfiles/core/{154 => 155}/exclude | 0 config/rootfiles/core/155/filelists/files | 0 .../core/155/filelists/release-files | 4 ++ config/rootfiles/core/155/update.sh | 67 +++++++++++++++++++ config/rootfiles/oldcore/154/exclude | 34 ++++++++++ .../{core => oldcore}/154/filelists/acl | 0 .../{core => oldcore}/154/filelists/arping | 0 .../{core => oldcore}/154/filelists/bind | 0 .../154/filelists/ca-certificates | 0 .../{core => oldcore}/154/filelists/curl | 0 .../{core => oldcore}/154/filelists/ddns | 0 .../{core => oldcore}/154/filelists/dhcpcd | 0 .../{core => oldcore}/154/filelists/dma | 0 .../{core => oldcore}/154/filelists/etherwake | 0 .../{core => oldcore}/154/filelists/fcron | 0 .../{core => oldcore}/154/filelists/files | 0 .../{core => oldcore}/154/filelists/findutils | 0 .../{core => oldcore}/154/filelists/fuse | 0 .../154/filelists/i586/hyperscan | 0 .../{core => oldcore}/154/filelists/iproute2 | 0 .../{core => oldcore}/154/filelists/ipset | 0 .../{core => oldcore}/154/filelists/iptables | 0 .../{core => oldcore}/154/filelists/iw | 0 .../{core => oldcore}/154/filelists/kmod | 0 .../{core => oldcore}/154/filelists/knot | 0 .../{core => oldcore}/154/filelists/less | 0 .../{core => oldcore}/154/filelists/libgcrypt | 0 .../154/filelists/libgpg-error | 0 .../{core => oldcore}/154/filelists/libhtp | 0 .../{core => oldcore}/154/filelists/libloc | 0 .../{core => oldcore}/154/filelists/logrotate | 0 .../{core => oldcore}/154/filelists/logwatch | 0 .../{core => oldcore}/154/filelists/lvm2 | 0 .../{core => oldcore}/154/filelists/lzip | 0 .../{core => oldcore}/154/filelists/newt | 0 .../{core => oldcore}/154/filelists/pam | 0 .../{core => oldcore}/154/filelists/pptp | 0 .../{core => oldcore}/154/filelists/procps | 0 .../{core => oldcore}/154/filelists/sed | 0 .../{core => oldcore}/154/filelists/setup | 0 .../{core => oldcore}/154/filelists/sqlite | 0 .../{core => oldcore}/154/filelists/sudo | 0 .../{core => oldcore}/154/filelists/tar | 0 .../{core => oldcore}/154/filelists/tzdata | 0 .../{core => oldcore}/154/filelists/unbound | 0 .../154/filelists/wpa_supplicant | 0 .../154/filelists/x86_64/hyperscan | 0 .../rootfiles/{core => oldcore}/154/update.sh | 0 make.sh | 2 +- 49 files changed, 106 insertions(+), 1 deletion(-) rename config/rootfiles/core/{154 => 155}/exclude (100%) create mode 100644 config/rootfiles/core/155/filelists/files create mode 100644 config/rootfiles/core/155/filelists/release-files create mode 100644 config/rootfiles/core/155/update.sh create mode 100644 config/rootfiles/oldcore/154/exclude rename config/rootfiles/{core => oldcore}/154/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/arping (100%) rename config/rootfiles/{core => oldcore}/154/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/154/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/154/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/154/filelists/etherwake (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fcron (100%) rename config/rootfiles/{core => oldcore}/154/filelists/files (100%) rename config/rootfiles/{core => oldcore}/154/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/154/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/154/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/154/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/154/filelists/kmod (100%) rename config/rootfiles/{core => oldcore}/154/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/154/filelists/less (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/154/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/154/filelists/lzip (100%) rename config/rootfiles/{core => oldcore}/154/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/154/filelists/pptp (100%) rename config/rootfiles/{core => oldcore}/154/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/154/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/154/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tar (100%) rename config/rootfiles/{core => oldcore}/154/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/154/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/154/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/154/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/154/update.sh (100%) diff --git a/config/rootfiles/core/154/exclude b/config/rootfiles/core/155/exclude similarity index 100% rename from config/rootfiles/core/154/exclude rename to config/rootfiles/core/155/exclude diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/155/filelists/release-files b/config/rootfiles/core/155/filelists/release-files new file mode 100644 index 0000000000..3a700fab4a --- /dev/null +++ b/config/rootfiles/core/155/filelists/release-files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/os-release +var/ipfire/langs diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh new file mode 100644 index 0000000000..c2d92fd217 --- /dev/null +++ b/config/rootfiles/core/155/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=155 + +# 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/154/exclude b/config/rootfiles/oldcore/154/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/oldcore/154/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/154/filelists/acl b/config/rootfiles/oldcore/154/filelists/acl similarity index 100% rename from config/rootfiles/core/154/filelists/acl rename to config/rootfiles/oldcore/154/filelists/acl diff --git a/config/rootfiles/core/154/filelists/arping b/config/rootfiles/oldcore/154/filelists/arping similarity index 100% rename from config/rootfiles/core/154/filelists/arping rename to config/rootfiles/oldcore/154/filelists/arping diff --git a/config/rootfiles/core/154/filelists/bind b/config/rootfiles/oldcore/154/filelists/bind similarity index 100% rename from config/rootfiles/core/154/filelists/bind rename to config/rootfiles/oldcore/154/filelists/bind diff --git a/config/rootfiles/core/154/filelists/ca-certificates b/config/rootfiles/oldcore/154/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/154/filelists/ca-certificates rename to config/rootfiles/oldcore/154/filelists/ca-certificates diff --git a/config/rootfiles/core/154/filelists/curl b/config/rootfiles/oldcore/154/filelists/curl similarity index 100% rename from config/rootfiles/core/154/filelists/curl rename to config/rootfiles/oldcore/154/filelists/curl diff --git a/config/rootfiles/core/154/filelists/ddns b/config/rootfiles/oldcore/154/filelists/ddns similarity index 100% rename from config/rootfiles/core/154/filelists/ddns rename to config/rootfiles/oldcore/154/filelists/ddns diff --git a/config/rootfiles/core/154/filelists/dhcpcd b/config/rootfiles/oldcore/154/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/154/filelists/dhcpcd rename to config/rootfiles/oldcore/154/filelists/dhcpcd diff --git a/config/rootfiles/core/154/filelists/dma b/config/rootfiles/oldcore/154/filelists/dma similarity index 100% rename from config/rootfiles/core/154/filelists/dma rename to config/rootfiles/oldcore/154/filelists/dma diff --git a/config/rootfiles/core/154/filelists/etherwake b/config/rootfiles/oldcore/154/filelists/etherwake similarity index 100% rename from config/rootfiles/core/154/filelists/etherwake rename to config/rootfiles/oldcore/154/filelists/etherwake diff --git a/config/rootfiles/core/154/filelists/fcron b/config/rootfiles/oldcore/154/filelists/fcron similarity index 100% rename from config/rootfiles/core/154/filelists/fcron rename to config/rootfiles/oldcore/154/filelists/fcron diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/oldcore/154/filelists/files similarity index 100% rename from config/rootfiles/core/154/filelists/files rename to config/rootfiles/oldcore/154/filelists/files diff --git a/config/rootfiles/core/154/filelists/findutils b/config/rootfiles/oldcore/154/filelists/findutils similarity index 100% rename from config/rootfiles/core/154/filelists/findutils rename to config/rootfiles/oldcore/154/filelists/findutils diff --git a/config/rootfiles/core/154/filelists/fuse b/config/rootfiles/oldcore/154/filelists/fuse similarity index 100% rename from config/rootfiles/core/154/filelists/fuse rename to config/rootfiles/oldcore/154/filelists/fuse diff --git a/config/rootfiles/core/154/filelists/i586/hyperscan b/config/rootfiles/oldcore/154/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/i586/hyperscan rename to config/rootfiles/oldcore/154/filelists/i586/hyperscan diff --git a/config/rootfiles/core/154/filelists/iproute2 b/config/rootfiles/oldcore/154/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/154/filelists/iproute2 rename to config/rootfiles/oldcore/154/filelists/iproute2 diff --git a/config/rootfiles/core/154/filelists/ipset b/config/rootfiles/oldcore/154/filelists/ipset similarity index 100% rename from config/rootfiles/core/154/filelists/ipset rename to config/rootfiles/oldcore/154/filelists/ipset diff --git a/config/rootfiles/core/154/filelists/iptables b/config/rootfiles/oldcore/154/filelists/iptables similarity index 100% rename from config/rootfiles/core/154/filelists/iptables rename to config/rootfiles/oldcore/154/filelists/iptables diff --git a/config/rootfiles/core/154/filelists/iw b/config/rootfiles/oldcore/154/filelists/iw similarity index 100% rename from config/rootfiles/core/154/filelists/iw rename to config/rootfiles/oldcore/154/filelists/iw diff --git a/config/rootfiles/core/154/filelists/kmod b/config/rootfiles/oldcore/154/filelists/kmod similarity index 100% rename from config/rootfiles/core/154/filelists/kmod rename to config/rootfiles/oldcore/154/filelists/kmod diff --git a/config/rootfiles/core/154/filelists/knot b/config/rootfiles/oldcore/154/filelists/knot similarity index 100% rename from config/rootfiles/core/154/filelists/knot rename to config/rootfiles/oldcore/154/filelists/knot diff --git a/config/rootfiles/core/154/filelists/less b/config/rootfiles/oldcore/154/filelists/less similarity index 100% rename from config/rootfiles/core/154/filelists/less rename to config/rootfiles/oldcore/154/filelists/less diff --git a/config/rootfiles/core/154/filelists/libgcrypt b/config/rootfiles/oldcore/154/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/154/filelists/libgcrypt rename to config/rootfiles/oldcore/154/filelists/libgcrypt diff --git a/config/rootfiles/core/154/filelists/libgpg-error b/config/rootfiles/oldcore/154/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/154/filelists/libgpg-error rename to config/rootfiles/oldcore/154/filelists/libgpg-error diff --git a/config/rootfiles/core/154/filelists/libhtp b/config/rootfiles/oldcore/154/filelists/libhtp similarity index 100% rename from config/rootfiles/core/154/filelists/libhtp rename to config/rootfiles/oldcore/154/filelists/libhtp diff --git a/config/rootfiles/core/154/filelists/libloc b/config/rootfiles/oldcore/154/filelists/libloc similarity index 100% rename from config/rootfiles/core/154/filelists/libloc rename to config/rootfiles/oldcore/154/filelists/libloc diff --git a/config/rootfiles/core/154/filelists/logrotate b/config/rootfiles/oldcore/154/filelists/logrotate similarity index 100% rename from config/rootfiles/core/154/filelists/logrotate rename to config/rootfiles/oldcore/154/filelists/logrotate diff --git a/config/rootfiles/core/154/filelists/logwatch b/config/rootfiles/oldcore/154/filelists/logwatch similarity index 100% rename from config/rootfiles/core/154/filelists/logwatch rename to config/rootfiles/oldcore/154/filelists/logwatch diff --git a/config/rootfiles/core/154/filelists/lvm2 b/config/rootfiles/oldcore/154/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/154/filelists/lvm2 rename to config/rootfiles/oldcore/154/filelists/lvm2 diff --git a/config/rootfiles/core/154/filelists/lzip b/config/rootfiles/oldcore/154/filelists/lzip similarity index 100% rename from config/rootfiles/core/154/filelists/lzip rename to config/rootfiles/oldcore/154/filelists/lzip diff --git a/config/rootfiles/core/154/filelists/newt b/config/rootfiles/oldcore/154/filelists/newt similarity index 100% rename from config/rootfiles/core/154/filelists/newt rename to config/rootfiles/oldcore/154/filelists/newt diff --git a/config/rootfiles/core/154/filelists/pam b/config/rootfiles/oldcore/154/filelists/pam similarity index 100% rename from config/rootfiles/core/154/filelists/pam rename to config/rootfiles/oldcore/154/filelists/pam diff --git a/config/rootfiles/core/154/filelists/pptp b/config/rootfiles/oldcore/154/filelists/pptp similarity index 100% rename from config/rootfiles/core/154/filelists/pptp rename to config/rootfiles/oldcore/154/filelists/pptp diff --git a/config/rootfiles/core/154/filelists/procps b/config/rootfiles/oldcore/154/filelists/procps similarity index 100% rename from config/rootfiles/core/154/filelists/procps rename to config/rootfiles/oldcore/154/filelists/procps diff --git a/config/rootfiles/core/154/filelists/sed b/config/rootfiles/oldcore/154/filelists/sed similarity index 100% rename from config/rootfiles/core/154/filelists/sed rename to config/rootfiles/oldcore/154/filelists/sed diff --git a/config/rootfiles/core/154/filelists/setup b/config/rootfiles/oldcore/154/filelists/setup similarity index 100% rename from config/rootfiles/core/154/filelists/setup rename to config/rootfiles/oldcore/154/filelists/setup diff --git a/config/rootfiles/core/154/filelists/sqlite b/config/rootfiles/oldcore/154/filelists/sqlite similarity index 100% rename from config/rootfiles/core/154/filelists/sqlite rename to config/rootfiles/oldcore/154/filelists/sqlite diff --git a/config/rootfiles/core/154/filelists/sudo b/config/rootfiles/oldcore/154/filelists/sudo similarity index 100% rename from config/rootfiles/core/154/filelists/sudo rename to config/rootfiles/oldcore/154/filelists/sudo diff --git a/config/rootfiles/core/154/filelists/tar b/config/rootfiles/oldcore/154/filelists/tar similarity index 100% rename from config/rootfiles/core/154/filelists/tar rename to config/rootfiles/oldcore/154/filelists/tar diff --git a/config/rootfiles/core/154/filelists/tzdata b/config/rootfiles/oldcore/154/filelists/tzdata similarity index 100% rename from config/rootfiles/core/154/filelists/tzdata rename to config/rootfiles/oldcore/154/filelists/tzdata diff --git a/config/rootfiles/core/154/filelists/unbound b/config/rootfiles/oldcore/154/filelists/unbound similarity index 100% rename from config/rootfiles/core/154/filelists/unbound rename to config/rootfiles/oldcore/154/filelists/unbound diff --git a/config/rootfiles/core/154/filelists/wpa_supplicant b/config/rootfiles/oldcore/154/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/154/filelists/wpa_supplicant rename to config/rootfiles/oldcore/154/filelists/wpa_supplicant diff --git a/config/rootfiles/core/154/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/154/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/154/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/154/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/oldcore/154/update.sh similarity index 100% rename from config/rootfiles/core/154/update.sh rename to config/rootfiles/oldcore/154/update.sh diff --git a/make.sh b/make.sh index 94bb86d5b9..99f1c41d18 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="154" # Core Level (Filename) +CORE="155" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.5