From 150378eae9b19e04c36392ada2281eb1849a8ae8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 27 Oct 2020 11:50:10 +0000 Subject: [PATCH] Start Core Update 153 Signed-off-by: Michael Tremer --- config/rootfiles/core/{152 => 153}/exclude | 0 config/rootfiles/core/153/filelists/files | 4 ++ config/rootfiles/core/153/update.sh | 67 +++++++++++++++++++ config/rootfiles/oldcore/152/exclude | 32 +++++++++ .../152/filelists/aarch64/python | 0 .../152/filelists/aarch64/python3 | 0 .../152/filelists/armv5tel/python | 0 .../152/filelists/armv5tel/python3 | 0 .../152/filelists/ca-certificates | 0 .../{core => oldcore}/152/filelists/files | 0 .../152/filelists/i586/python | 0 .../152/filelists/i586/python3 | 0 .../{core => oldcore}/152/filelists/knot | 0 .../{core => oldcore}/152/filelists/libhtp | 0 .../{core => oldcore}/152/filelists/setup | 0 .../{core => oldcore}/152/filelists/suricata | 0 .../{core => oldcore}/152/filelists/unbound | 0 .../152/filelists/x86_64/python | 0 .../152/filelists/x86_64/python3 | 0 .../{core => oldcore}/152/filelists/yaml | 0 .../rootfiles/{core => oldcore}/152/update.sh | 0 make.sh | 2 +- 22 files changed, 104 insertions(+), 1 deletion(-) rename config/rootfiles/core/{152 => 153}/exclude (100%) create mode 100644 config/rootfiles/core/153/filelists/files create mode 100644 config/rootfiles/core/153/update.sh create mode 100644 config/rootfiles/oldcore/152/exclude rename config/rootfiles/{core => oldcore}/152/filelists/aarch64/python (100%) rename config/rootfiles/{core => oldcore}/152/filelists/aarch64/python3 (100%) rename config/rootfiles/{core => oldcore}/152/filelists/armv5tel/python (100%) rename config/rootfiles/{core => oldcore}/152/filelists/armv5tel/python3 (100%) rename config/rootfiles/{core => oldcore}/152/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/152/filelists/files (100%) rename config/rootfiles/{core => oldcore}/152/filelists/i586/python (100%) rename config/rootfiles/{core => oldcore}/152/filelists/i586/python3 (100%) rename config/rootfiles/{core => oldcore}/152/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/152/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/152/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/152/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/152/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/152/filelists/x86_64/python (100%) rename config/rootfiles/{core => oldcore}/152/filelists/x86_64/python3 (100%) rename config/rootfiles/{core => oldcore}/152/filelists/yaml (100%) rename config/rootfiles/{core => oldcore}/152/update.sh (100%) diff --git a/config/rootfiles/core/152/exclude b/config/rootfiles/core/153/exclude similarity index 100% rename from config/rootfiles/core/152/exclude rename to config/rootfiles/core/153/exclude diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files new file mode 100644 index 0000000000..b58587e6ae --- /dev/null +++ b/config/rootfiles/core/153/filelists/files @@ -0,0 +1,4 @@ +etc/issue +etc/os-release +etc/system-release +srv/web/ipfire/cgi-bin/credits.cgi diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh new file mode 100644 index 0000000000..3bc953979d --- /dev/null +++ b/config/rootfiles/core/153/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=153 + +# 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/152/exclude b/config/rootfiles/oldcore/152/exclude new file mode 100644 index 0000000000..e7500a03d2 --- /dev/null +++ b/config/rootfiles/oldcore/152/exclude @@ -0,0 +1,32 @@ +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 +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/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/152/filelists/aarch64/python b/config/rootfiles/oldcore/152/filelists/aarch64/python similarity index 100% rename from config/rootfiles/core/152/filelists/aarch64/python rename to config/rootfiles/oldcore/152/filelists/aarch64/python diff --git a/config/rootfiles/core/152/filelists/aarch64/python3 b/config/rootfiles/oldcore/152/filelists/aarch64/python3 similarity index 100% rename from config/rootfiles/core/152/filelists/aarch64/python3 rename to config/rootfiles/oldcore/152/filelists/aarch64/python3 diff --git a/config/rootfiles/core/152/filelists/armv5tel/python b/config/rootfiles/oldcore/152/filelists/armv5tel/python similarity index 100% rename from config/rootfiles/core/152/filelists/armv5tel/python rename to config/rootfiles/oldcore/152/filelists/armv5tel/python diff --git a/config/rootfiles/core/152/filelists/armv5tel/python3 b/config/rootfiles/oldcore/152/filelists/armv5tel/python3 similarity index 100% rename from config/rootfiles/core/152/filelists/armv5tel/python3 rename to config/rootfiles/oldcore/152/filelists/armv5tel/python3 diff --git a/config/rootfiles/core/152/filelists/ca-certificates b/config/rootfiles/oldcore/152/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/152/filelists/ca-certificates rename to config/rootfiles/oldcore/152/filelists/ca-certificates diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/oldcore/152/filelists/files similarity index 100% rename from config/rootfiles/core/152/filelists/files rename to config/rootfiles/oldcore/152/filelists/files diff --git a/config/rootfiles/core/152/filelists/i586/python b/config/rootfiles/oldcore/152/filelists/i586/python similarity index 100% rename from config/rootfiles/core/152/filelists/i586/python rename to config/rootfiles/oldcore/152/filelists/i586/python diff --git a/config/rootfiles/core/152/filelists/i586/python3 b/config/rootfiles/oldcore/152/filelists/i586/python3 similarity index 100% rename from config/rootfiles/core/152/filelists/i586/python3 rename to config/rootfiles/oldcore/152/filelists/i586/python3 diff --git a/config/rootfiles/core/152/filelists/knot b/config/rootfiles/oldcore/152/filelists/knot similarity index 100% rename from config/rootfiles/core/152/filelists/knot rename to config/rootfiles/oldcore/152/filelists/knot diff --git a/config/rootfiles/core/152/filelists/libhtp b/config/rootfiles/oldcore/152/filelists/libhtp similarity index 100% rename from config/rootfiles/core/152/filelists/libhtp rename to config/rootfiles/oldcore/152/filelists/libhtp diff --git a/config/rootfiles/core/152/filelists/setup b/config/rootfiles/oldcore/152/filelists/setup similarity index 100% rename from config/rootfiles/core/152/filelists/setup rename to config/rootfiles/oldcore/152/filelists/setup diff --git a/config/rootfiles/core/152/filelists/suricata b/config/rootfiles/oldcore/152/filelists/suricata similarity index 100% rename from config/rootfiles/core/152/filelists/suricata rename to config/rootfiles/oldcore/152/filelists/suricata diff --git a/config/rootfiles/core/152/filelists/unbound b/config/rootfiles/oldcore/152/filelists/unbound similarity index 100% rename from config/rootfiles/core/152/filelists/unbound rename to config/rootfiles/oldcore/152/filelists/unbound diff --git a/config/rootfiles/core/152/filelists/x86_64/python b/config/rootfiles/oldcore/152/filelists/x86_64/python similarity index 100% rename from config/rootfiles/core/152/filelists/x86_64/python rename to config/rootfiles/oldcore/152/filelists/x86_64/python diff --git a/config/rootfiles/core/152/filelists/x86_64/python3 b/config/rootfiles/oldcore/152/filelists/x86_64/python3 similarity index 100% rename from config/rootfiles/core/152/filelists/x86_64/python3 rename to config/rootfiles/oldcore/152/filelists/x86_64/python3 diff --git a/config/rootfiles/core/152/filelists/yaml b/config/rootfiles/oldcore/152/filelists/yaml similarity index 100% rename from config/rootfiles/core/152/filelists/yaml rename to config/rootfiles/oldcore/152/filelists/yaml diff --git a/config/rootfiles/core/152/update.sh b/config/rootfiles/oldcore/152/update.sh similarity index 100% rename from config/rootfiles/core/152/update.sh rename to config/rootfiles/oldcore/152/update.sh diff --git a/make.sh b/make.sh index 9ddfd4c07b..03361d2377 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="152" # Core Level (Filename) +CORE="153" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level -- 2.39.5