Start Core Update 132

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/131/exclude b/config/rootfiles/core/132/exclude
similarity index 100%
rename from config/rootfiles/core/131/exclude
rename to config/rootfiles/core/132/exclude

diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/132/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

diff --git a/config/rootfiles/core/132/update.sh b/config/rootfiles/core/132/update.sh
new file mode 100644 (file)
index 0000000..f5ec228
--- /dev/null
+++ b/config/rootfiles/core/132/update.sh
@@ -0,0 +1,62 @@
+#!/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) 2019 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=131
+
+# 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
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# 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/131/exclude b/config/rootfiles/oldcore/131/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
+++ b/config/rootfiles/oldcore/131/exclude
@@ -0,0 +1,28 @@
+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/ovpn
+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/131/filelists/Net_SSLeay b/config/rootfiles/oldcore/131/filelists/Net_SSLeay
similarity index 100%
rename from config/rootfiles/core/131/filelists/Net_SSLeay
rename to config/rootfiles/oldcore/131/filelists/Net_SSLeay

diff --git a/config/rootfiles/core/131/filelists/aarch64/linux b/config/rootfiles/oldcore/131/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/131/filelists/aarch64/linux
rename to config/rootfiles/oldcore/131/filelists/aarch64/linux

diff --git a/config/rootfiles/core/131/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/131/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/131/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/131/filelists/aarch64/linux-initrd

diff --git a/config/rootfiles/core/131/filelists/apache2 b/config/rootfiles/oldcore/131/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/131/filelists/apache2
rename to config/rootfiles/oldcore/131/filelists/apache2

diff --git a/config/rootfiles/core/131/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/131/filelists/armv5tel/linux-initrd-kirkwood
similarity index 100%
rename from config/rootfiles/core/131/filelists/armv5tel/linux-initrd-kirkwood
rename to config/rootfiles/oldcore/131/filelists/armv5tel/linux-initrd-kirkwood

diff --git a/config/rootfiles/core/131/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/131/filelists/armv5tel/linux-initrd-multi
similarity index 100%
rename from config/rootfiles/core/131/filelists/armv5tel/linux-initrd-multi
rename to config/rootfiles/oldcore/131/filelists/armv5tel/linux-initrd-multi

diff --git a/config/rootfiles/core/131/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/131/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/131/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/131/filelists/armv5tel/linux-kirkwood

diff --git a/config/rootfiles/core/131/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/131/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/131/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/131/filelists/armv5tel/linux-multi

diff --git a/config/rootfiles/core/131/filelists/collectd b/config/rootfiles/oldcore/131/filelists/collectd
similarity index 100%
rename from config/rootfiles/core/131/filelists/collectd
rename to config/rootfiles/oldcore/131/filelists/collectd

diff --git a/config/rootfiles/core/131/filelists/files b/config/rootfiles/oldcore/131/filelists/files
similarity index 100%
rename from config/rootfiles/core/131/filelists/files
rename to config/rootfiles/oldcore/131/filelists/files

diff --git a/config/rootfiles/core/131/filelists/gnutls b/config/rootfiles/oldcore/131/filelists/gnutls
similarity index 100%
rename from config/rootfiles/core/131/filelists/gnutls
rename to config/rootfiles/oldcore/131/filelists/gnutls

diff --git a/config/rootfiles/core/131/filelists/i586/linux b/config/rootfiles/oldcore/131/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/131/filelists/i586/linux
rename to config/rootfiles/oldcore/131/filelists/i586/linux

diff --git a/config/rootfiles/core/131/filelists/i586/linux-initrd b/config/rootfiles/oldcore/131/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/131/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/131/filelists/i586/linux-initrd

diff --git a/config/rootfiles/core/131/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/131/filelists/ids-ruleset-sources
similarity index 100%
rename from config/rootfiles/core/131/filelists/ids-ruleset-sources
rename to config/rootfiles/oldcore/131/filelists/ids-ruleset-sources

diff --git a/config/rootfiles/core/131/filelists/libcap-ng b/config/rootfiles/oldcore/131/filelists/libcap-ng
similarity index 100%
rename from config/rootfiles/core/131/filelists/libcap-ng
rename to config/rootfiles/oldcore/131/filelists/libcap-ng

diff --git a/config/rootfiles/core/131/filelists/libhtp b/config/rootfiles/oldcore/131/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/131/filelists/libhtp
rename to config/rootfiles/oldcore/131/filelists/libhtp

diff --git a/config/rootfiles/core/131/filelists/lua b/config/rootfiles/oldcore/131/filelists/lua
similarity index 100%
rename from config/rootfiles/core/131/filelists/lua
rename to config/rootfiles/oldcore/131/filelists/lua

diff --git a/config/rootfiles/core/131/filelists/nettle b/config/rootfiles/oldcore/131/filelists/nettle
similarity index 100%
rename from config/rootfiles/core/131/filelists/nettle
rename to config/rootfiles/oldcore/131/filelists/nettle

diff --git a/config/rootfiles/core/131/filelists/ntp b/config/rootfiles/oldcore/131/filelists/ntp
similarity index 100%
rename from config/rootfiles/core/131/filelists/ntp
rename to config/rootfiles/oldcore/131/filelists/ntp

diff --git a/config/rootfiles/core/131/filelists/oinkmaster b/config/rootfiles/oldcore/131/filelists/oinkmaster
similarity index 100%
rename from config/rootfiles/core/131/filelists/oinkmaster
rename to config/rootfiles/oldcore/131/filelists/oinkmaster

diff --git a/config/rootfiles/core/131/filelists/rrdtool b/config/rootfiles/oldcore/131/filelists/rrdtool
similarity index 100%
rename from config/rootfiles/core/131/filelists/rrdtool
rename to config/rootfiles/oldcore/131/filelists/rrdtool

diff --git a/config/rootfiles/core/131/filelists/setup b/config/rootfiles/oldcore/131/filelists/setup
similarity index 100%
rename from config/rootfiles/core/131/filelists/setup
rename to config/rootfiles/oldcore/131/filelists/setup

diff --git a/config/rootfiles/core/131/filelists/suricata b/config/rootfiles/oldcore/131/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/131/filelists/suricata
rename to config/rootfiles/oldcore/131/filelists/suricata

diff --git a/config/rootfiles/core/131/filelists/unbound b/config/rootfiles/oldcore/131/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/131/filelists/unbound
rename to config/rootfiles/oldcore/131/filelists/unbound

diff --git a/config/rootfiles/core/131/filelists/wget b/config/rootfiles/oldcore/131/filelists/wget
similarity index 100%
rename from config/rootfiles/core/131/filelists/wget
rename to config/rootfiles/oldcore/131/filelists/wget

diff --git a/config/rootfiles/core/131/filelists/wireless-regdb b/config/rootfiles/oldcore/131/filelists/wireless-regdb
similarity index 100%
rename from config/rootfiles/core/131/filelists/wireless-regdb
rename to config/rootfiles/oldcore/131/filelists/wireless-regdb

diff --git a/config/rootfiles/core/131/filelists/x86_64/linux b/config/rootfiles/oldcore/131/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/131/filelists/x86_64/linux
rename to config/rootfiles/oldcore/131/filelists/x86_64/linux

diff --git a/config/rootfiles/core/131/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/131/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/131/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/131/filelists/x86_64/linux-initrd

diff --git a/config/rootfiles/core/131/filelists/yaml b/config/rootfiles/oldcore/131/filelists/yaml
similarity index 100%
rename from config/rootfiles/core/131/filelists/yaml
rename to config/rootfiles/oldcore/131/filelists/yaml

diff --git a/config/rootfiles/core/131/update.sh b/config/rootfiles/oldcore/131/update.sh
similarity index 100%
rename from config/rootfiles/core/131/update.sh
rename to config/rootfiles/oldcore/131/update.sh

diff --git a/make.sh b/make.sh
index 51ddda6a7af3d8d2a059e7378379db6127af147a..ebfd83fb3155a5bd10f62b370379478d6c276fa3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.23"                                                 # Version number
-CORE="131"                                                     # Core Level (Filename)
+CORE="132"                                                     # Core Level (Filename)
 PAKFIRE_CORE="131"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan