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

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

diff --cc 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 --cc 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 --cc 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 --cc 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

diff --cc 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

diff --cc 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 --cc 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

diff --cc 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