Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/oldcore/130/exclude b/config/rootfiles/oldcore/130/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
+++ b/config/rootfiles/oldcore/130/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/oldcore/130/filelists/Net_SSLeay b/config/rootfiles/oldcore/130/filelists/Net_SSLeay
new file mode 120000 (symlink)
index 0000000..13fe056
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/Net_SSLeay
@@ -0,0 +1 @@
+../../../common/Net_SSLeay
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/130/filelists/apache2 b/config/rootfiles/oldcore/130/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/130/filelists/files b/config/rootfiles/oldcore/130/filelists/files
new file mode 100644 (file)
index 0000000..98b8fec
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+usr/local/bin/ipsec-interfaces

diff --git a/config/rootfiles/oldcore/130/filelists/strongswan b/config/rootfiles/oldcore/130/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/130/filelists/wget b/config/rootfiles/oldcore/130/filelists/wget
new file mode 120000 (symlink)
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/130/update.sh b/config/rootfiles/oldcore/130/update.sh
new file mode 100644 (file)
index 0000000..86e42a1
--- /dev/null
+++ b/config/rootfiles/oldcore/130/update.sh
@@ -0,0 +1,65 @@
+#!/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=130
+
+# 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
+/usr/local/bin/ipsecctrl D
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/apache restart
+/usr/local/bin/ipsecctrl S
+
+# 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/make.sh b/make.sh
index de973c69c6d03b831db3a18017859801167af64a..b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,10 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
+<<<<<<< HEAD
 VERSION="2.23"                                                 # Version number
-CORE="130"                                                     # Core Level (Filename)
-PAKFIRE_CORE="129"                                             # Core Level (PAKFIRE)
+CORE="131"                                                     # Core Level (Filename)
+PAKFIRE_CORE="130"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir