From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Feb 2016 18:45:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.19-core100~37
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=802b916d10aa314ae878ec633e7c3bbd2adaba7e

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

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

Conflicts:
	make.sh
---

802b916d10aa314ae878ec633e7c3bbd2adaba7e
diff --cc config/rootfiles/oldcore/98/exclude
index 0000000000,0000000000..d87f175b5f
new file mode 100644
--- /dev/null
+++ b/config/rootfiles/oldcore/98/exclude
@@@ -1,0 -1,0 +1,25 @@@
++boot/config.txt
++etc/alternatives
++etc/collectd.custom
++etc/ipsec.conf
++etc/ipsec.secrets
++etc/ipsec.user.conf
++etc/ipsec.user.secrets
++etc/localtime
++etc/shadow
++etc/snort/snort.conf
++etc/ssh/ssh_config
++etc/ssh/sshd_config
++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/state/dhcp/dhcpd.leases
++var/updatecache
diff --cc config/rootfiles/oldcore/98/filelists/armv5tel/glibc
index 0000000000,4c70d724b4..4c70d724b4
mode 000000,120000..120000
--- a/config/rootfiles/oldcore/98/filelists/armv5tel/glibc
+++ b/config/rootfiles/oldcore/98/filelists/armv5tel/glibc
diff --cc config/rootfiles/oldcore/98/filelists/files
index 0000000000,409e5fe8ac..409e5fe8ac
mode 000000,100644..100644
--- a/config/rootfiles/oldcore/98/filelists/files
+++ b/config/rootfiles/oldcore/98/filelists/files
diff --cc config/rootfiles/oldcore/98/filelists/i586/glibc
index 0000000000,943021f19a..943021f19a
mode 000000,120000..120000
--- a/config/rootfiles/oldcore/98/filelists/i586/glibc
+++ b/config/rootfiles/oldcore/98/filelists/i586/glibc
diff --cc config/rootfiles/oldcore/98/filelists/x86_64/glibc
index 0000000000,1119099669..1119099669
mode 000000,120000..120000
--- a/config/rootfiles/oldcore/98/filelists/x86_64/glibc
+++ b/config/rootfiles/oldcore/98/filelists/x86_64/glibc
diff --cc config/rootfiles/oldcore/98/meta
index 0000000000,0000000000..d547fa86fa
new file mode 100644
--- /dev/null
+++ b/config/rootfiles/oldcore/98/meta
@@@ -1,0 -1,0 +1,1 @@@
++DEPS=""
diff --cc config/rootfiles/oldcore/98/update.sh
index 0000000000,ec9c1aaa69..ec9c1aaa69
mode 000000,100644..100644
--- a/config/rootfiles/oldcore/98/update.sh
+++ b/config/rootfiles/oldcore/98/update.sh
diff --cc lfs/glibc
index 56a3533391,7c8ed5e9a1..c0af6fc06c
--- a/lfs/glibc
+++ b/lfs/glibc
@@@ -291,9 -355,9 +356,10 @@@ endi
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch
+ 
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch
 +	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-mq_open.patch
  
  	# Fixes:
  	#   Makefile:235: *** mixed implicit and normal rules.  Stop.
diff --cc make.sh
index 0effba5b31,9f119bf3f0..189f7d9bf6
--- a/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
  VERSION="2.17"							# Version number
--CORE="98"							# Core Level (Filename)
- PAKFIRE_CORE="97"						# Core Level (PAKFIRE)
++CORE="99"							# Core Level (Filename)
+ PAKFIRE_CORE="98"						# 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