Merge remote-tracking branch 'origin/seventeen' into seventeen

Conflicts:
	make.sh

diff --git a/lfs/gcc b/lfs/gcc
index a9f124b8cee0a393baa355d5acec5d44fd53db51..0264d37f8308aa989604c40f15303aa2c69ddbab 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -97,6 +97,9 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
+
+  # Disable stack protection in toolchain.
+  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"

diff --git a/lfs/glibc b/lfs/glibc
index 32c494f24388a06cbb18d45530f3372d148ca564..194f5565ee000d0ab417879a306ef7d7799d6250 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -284,6 +284,9 @@ endif
        #   Makefile:235: *** mixed implicit and normal rules.  Stop.
        cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 
+       # http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
+       cd $(DIR_APP) && sed -e "s/PIC/SHARED/g" -i ports/sysdeps/arm/{,eabi/}{set,__long}jmp.S
+
 ifeq "$(ROOT)" ""
 ifeq "$(MACHINE_TYPE)" "arm"
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
@@ -297,8 +300,21 @@ endif
        cd $(DIR_SRC)/glibc-build && \
                CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
                $(DIR_APP)/configure $(EXTRA_CONFIG)
+
+       sed -i $(DIR_SRC)/glibc-build/config.make \
+               -e "s/^build-pic-default=.*/build-pic-default=yes/"
+
+       # Build the glibc libraries without stack protection (as this is not supported)
+       echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
+       cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
+               CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
+               CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
+
+       # Build the programs with hardening
+       : > $(DIR_SRC)/glibc-build/configparms
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
                CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""

diff --git a/lfs/linux b/lfs/linux
index 501458d19d549110bbf2d638b2a2c1d71b55422a..f11bd5ff01b4a2adaa9c6296411ccae7460dff53 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -297,11 +297,11 @@ endif
        dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-kirkwood"
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 endif
 
 ifeq "$(KCFG)" "-multi"
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-multi.img uInit-ipfire-multi
+       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 endif
 
 ifeq "$(LASTKERNEL)" "1"

diff --git a/lfs/tzdata b/lfs/tzdata
index c36b7a34f64b75720d1a5c71701b9e84191a63d9..afe3124e0a438dca282cf6209f46921685c70da3 100644 (file)
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -94,6 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /usr/share/zoneinfo
 
        rm -vf /usr/share/zoneinfo/localtime
+       rm -vf /etc/localtime
        cp -vf /usr/share/zoneinfo/GMT /etc/localtime
 
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index a91b2da7cf7061be2a8aadb10dbe1ee87db8bf60..bbbaffd2ea3253cc699ae1e262cb058e7fd9a642 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.15"                                                 # Version number
-CORE="85"                                                      # Core Level (Filename)
+VERSION="2.17"                                                 # Version number
+CORE="86"                                                      # Core Level (Filename)
 PAKFIRE_CORE="85"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -36,7 +36,7 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=7
+TOOLCHAINVER=8
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"