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

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

diff --cc config/rootfiles/core/99/exclude
Simple merge

diff --cc config/rootfiles/oldcore/98/exclude
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d87f175b5f1f8c4a93a80b64c3cc7fcab0ae3064
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,4c70d724b49e8ac64ea5e1dfce7236f8f0d797c6..4c70d724b49e8ac64ea5e1dfce7236f8f0d797c6
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/98/filelists/armv5tel/glibc
+++ b/config/rootfiles/oldcore/98/filelists/armv5tel/glibc

diff --cc config/rootfiles/oldcore/98/filelists/files
index 0000000000000000000000000000000000000000,409e5fe8ac4e0442392c03e5efbd9d5d44e33c72..409e5fe8ac4e0442392c03e5efbd9d5d44e33c72
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/97/filelists/files
+++ b/config/rootfiles/oldcore/98/filelists/files

diff --cc config/rootfiles/oldcore/98/filelists/i586/glibc
index 0000000000000000000000000000000000000000,943021f19a6f5d6e375715c23c012a808fc7878a..943021f19a6f5d6e375715c23c012a808fc7878a
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/98/filelists/i586/glibc
+++ b/config/rootfiles/oldcore/98/filelists/i586/glibc

diff --cc config/rootfiles/oldcore/98/filelists/x86_64/glibc
index 0000000000000000000000000000000000000000,1119099669c538c8663537cdbb02f61d2a363743..1119099669c538c8663537cdbb02f61d2a363743
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/98/filelists/x86_64/glibc
+++ b/config/rootfiles/oldcore/98/filelists/x86_64/glibc

diff --cc config/rootfiles/oldcore/98/meta
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d547fa86fa8487654281f4d5309d6733f66a323c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/98/meta
@@@ -1,0 -1,0 +1,1 @@@
++DEPS=""

diff --cc config/rootfiles/oldcore/98/update.sh
index 0000000000000000000000000000000000000000,ec9c1aaa691fe8c6c8f92064c0754b590fc20f59..ec9c1aaa691fe8c6c8f92064c0754b590fc20f59
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/98/update.sh
+++ b/config/rootfiles/oldcore/98/update.sh

diff --cc lfs/glibc
index 56a35333914e9b2209660cca23ca02817652e91e,7c8ed5e9a1e37589d67b21396919024691002f64..c0af6fc06cfd7c5b09121208ec21a4dbc7ea1aaf
--- 1/lfs/glibc
--- 2/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 0effba5b31dddf78a7b48dd3e1dfcee0ea3785e9,9f119bf3f0c1e0a007ac005e61532798eb9612f4..189f7d9bf693cd23aba5864bb445eacfdb027955
--- 1/make.sh
--- 2/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