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

Conflicts:
	config/rootfiles/core/70/exclude
	config/rootfiles/core/70/meta
	config/rootfiles/core/71/exclude
	config/rootfiles/core/71/meta
	config/rootfiles/core/72/filelists/strongswan
	config/rootfiles/core/72/meta
	config/rootfiles/core/73/exclude
	config/rootfiles/core/73/meta
	config/rootfiles/core/fifteen/exclude
	config/rootfiles/core/fifteen/filelists/strongswan
	config/rootfiles/core/fifteen/meta
	config/rootfiles/oldcore/70/exclude
	config/rootfiles/oldcore/70/meta
	config/rootfiles/oldcore/71/exclude
	config/rootfiles/oldcore/71/meta
	config/rootfiles/oldcore/72/filelists/strongswan
	config/rootfiles/oldcore/72/meta
	config/rootfiles/oldcore/73/exclude
	config/rootfiles/oldcore/73/filelists/GeoIP
	config/rootfiles/oldcore/73/filelists/hwdata
	config/rootfiles/oldcore/73/filelists/openssh
	config/rootfiles/oldcore/73/filelists/php
	config/rootfiles/oldcore/73/meta

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

diff --git a/config/rootfiles/oldcore/73/filelists/GeoIP b/config/rootfiles/oldcore/73/filelists/GeoIP
new file mode 100644 (file)
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat

diff --git a/config/rootfiles/oldcore/73/filelists/hwdata b/config/rootfiles/oldcore/73/filelists/hwdata
new file mode 100644 (file)
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids

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

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

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

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

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

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

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

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

diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/oldcore/74/meta
similarity index 100%
rename from config/rootfiles/core/74/meta
rename to config/rootfiles/oldcore/74/meta

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

diff --git a/make.sh b/make.sh
index e6285eec6c45a0d9649a33998b71193c6d34a2c1..40177c897aa796bca7ad1d0e8560e1866ff229f6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="75"                                                      # Core Level (Filename)
-PAKFIRE_CORE="74"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="75"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir