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

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

diff --combined config/rootfiles/oldcore/130/exclude
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b221598781717c4568a58f0bfcff78c0c4942563
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/130/exclude
@@@ -1,0 -1,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 --combined config/rootfiles/oldcore/130/filelists/Net_SSLeay
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..13fe0560cfbe0c557b5f5ef5af1e405f7daa3573
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/Net_SSLeay
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/Net_SSLeay

diff --combined config/rootfiles/oldcore/130/filelists/apache2
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eef95efa7298bf4772946054bc7e73985f8f5cbf
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/apache2
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apache2

diff --combined config/rootfiles/oldcore/130/filelists/files
index 0000000000000000000000000000000000000000,98b8fec3968e8f82ef275cde066c068e68e0135a..98b8fec3968e8f82ef275cde066c068e68e0135a
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/oldcore/130/filelists/files
@@@ -1,0 -1,3 +1,3 @@@
+ etc/system-release
+ etc/issue
+ usr/local/bin/ipsec-interfaces

diff --combined config/rootfiles/oldcore/130/filelists/strongswan
index 0000000000000000000000000000000000000000,90c727e265d6d8bc3b0f54897f954a74a0f05ade..90c727e265d6d8bc3b0f54897f954a74a0f05ade
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/129/filelists/strongswan
+++ b/config/rootfiles/oldcore/130/filelists/strongswan
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../common/strongswan

diff --combined config/rootfiles/oldcore/130/filelists/wget
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..fcb57dfec80be999cd45ddd214463ed3debf86d0
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/130/filelists/wget
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/wget

diff --combined config/rootfiles/oldcore/130/update.sh
index 0000000000000000000000000000000000000000,86e42a1d4ee931f3fa5c961ebc6680511c91df57..86e42a1d4ee931f3fa5c961ebc6680511c91df57
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/oldcore/130/update.sh
@@@ -1,0 -1,65 +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 --combined make.sh
index de973c69c6d03b831db3a18017859801167af64a,08cf319014d80c6ec1fdc13edc7499fcd2f43bd5..b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,10 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.21"                                                        # Version number
 -CORE="130"                                                    # Core Level (Filename)
++<<<<<<< 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
@@@ -1084,7 -1084,6 +1085,7 @@@ buildipfire() 
    lfsmake2 openssl
    [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
    lfsmake2 popt
 +  lfsmake2 libedit
    lfsmake2 libusb
    lfsmake2 libusb-compat
    lfsmake2 libpcap
@@@ -1098,7 -1097,6 +1099,7 @@@
    lfsmake2 zd1211-firmware
    lfsmake2 rpi-firmware
    lfsmake2 intel-microcode
 +  lfsmake2 pcengines-apu-firmware
    lfsmake2 bc
    lfsmake2 u-boot MKIMAGE=1
    lfsmake2 cpio
@@@ -1218,7 -1216,6 +1219,7 @@@
    lfsmake2 attr
    lfsmake2 acl
    lfsmake2 libcap
 +  lfsmake2 libcap-ng
    lfsmake2 pciutils
    lfsmake2 usbutils
    lfsmake2 libxml2
@@@ -1317,11 -1314,9 +1318,11 @@@
    lfsmake2 setserial
    lfsmake2 setup
    lfsmake2 libdnet
 -  lfsmake2 daq
 -  lfsmake2 snort
 +  lfsmake2 yaml
 +  lfsmake2 libhtp
 +  lfsmake2 suricata
    lfsmake2 oinkmaster
 +  lfsmake2 ids-ruleset-sources
    lfsmake2 squid
    lfsmake2 squidguard
    lfsmake2 calamaris
@@@ -1589,11 -1584,10 +1590,11 @@@
    lfsmake2 dehydrated
    lfsmake2 shairport-sync
    lfsmake2 borgbackup
 -  lfsmake2 libedit
    lfsmake2 knot
    lfsmake2 spectre-meltdown-checker
    lfsmake2 zabbix_agentd
 +  lfsmake2 flashrom
 +  lfsmake2 firmware-update
  }
  
  buildinstaller() {