Start Core Update 134

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

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

diff --git a/config/rootfiles/core/134/filelists/files b/config/rootfiles/core/134/filelists/files
new file mode 100644 (file)
index 0000000..25ade17
--- /dev/null
+++ b/config/rootfiles/core/134/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

diff --git a/config/rootfiles/core/134/update.sh b/config/rootfiles/core/134/update.sh
new file mode 100644 (file)
index 0000000..30fe9c5
--- /dev/null
+++ b/config/rootfiles/core/134/update.sh
@@ -0,0 +1,60 @@
+#!/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=134
+
+# 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
+/etc/init.d/unbound restart
+
+# 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/133/exclude b/config/rootfiles/oldcore/133/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
+++ b/config/rootfiles/oldcore/133/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/133/filelists/aarch64/binutils b/config/rootfiles/oldcore/133/filelists/aarch64/binutils
similarity index 100%
rename from config/rootfiles/core/133/filelists/aarch64/binutils
rename to config/rootfiles/oldcore/133/filelists/aarch64/binutils

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

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

diff --git a/config/rootfiles/core/133/filelists/armv5tel/binutils b/config/rootfiles/oldcore/133/filelists/armv5tel/binutils
similarity index 100%
rename from config/rootfiles/core/133/filelists/armv5tel/binutils
rename to config/rootfiles/oldcore/133/filelists/armv5tel/binutils

diff --git a/config/rootfiles/core/133/filelists/armv5tel/gcc b/config/rootfiles/oldcore/133/filelists/armv5tel/gcc
similarity index 100%
rename from config/rootfiles/core/133/filelists/armv5tel/gcc
rename to config/rootfiles/oldcore/133/filelists/armv5tel/gcc

diff --git a/config/rootfiles/core/133/filelists/armv5tel/glibc b/config/rootfiles/oldcore/133/filelists/armv5tel/glibc
similarity index 100%
rename from config/rootfiles/core/133/filelists/armv5tel/glibc
rename to config/rootfiles/oldcore/133/filelists/armv5tel/glibc

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/make.sh b/make.sh
index cdf5bbed7eadeea898a46a72aa9c00b538f3a6de..5b1e0ed99c6a5c1fc63604e75e9e296461f7b2d5 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.23"                                                 # Version number
-CORE="133"                                                     # Core Level (Filename)
+CORE="134"                                                     # Core Level (Filename)
 PAKFIRE_CORE="133"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan