[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee - IPFire-SCM

19 Feb 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee (commit)
       via  046a3c18d70a649eea8ccaff378c29f95a4e829a (commit)
       via  ea08336ea34fc97ff8c501ad8bbe941dbf222d43 (commit)
       via  60ee2bfaf478cd9e236dbc5a4e9ff169fa1349bd (commit)
       via  5a71f323d7b2dffd80f53b6cac5c946d45d42d89 (commit)
       via  1b231184422d400769902dff5e34890ec0024bb4 (commit)
       via  94b1fa72fa69b81da34dccd8aa04a450f0237a21 (commit)
      from  c5843aabcfc7df42bd3622b3e59509e58956a2e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 161c115fe6d6b831a4a9c92fe1b51b27cdbdaaee
Merge: 046a3c1 c5843aa
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 16:53:31 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 046a3c18d70a649eea8ccaff378c29f95a4e829a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 14:24:57 2011 +0100
Revert "gcc: Update PIE patches."
This reverts commit 1b231184422d400769902dff5e34890ec0024bb4.
Conflicts:
pkgs/core/gcc/gcc.nm
commit ea08336ea34fc97ff8c501ad8bbe941dbf222d43
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 12:56:32 2011 +0100
gcc: Fix CFLAGS that confused the hardening.
There were some options on the CFLAGS that had to be removed
    to make the hardening (SSP, PIC, etc.) working.
Additionally, I fixed the --with-arch flags that did not work,
    lately.
commit 60ee2bfaf478cd9e236dbc5a4e9ff169fa1349bd
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 00:31:21 2011 +0100
binutils: Remove unapplyable patch.
commit 5a71f323d7b2dffd80f53b6cac5c946d45d42d89
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 00:30:28 2011 +0100
glibc: Configure glibc independently from rest of the system.
This fixes a build error that we have been experiencing. Yeah.
commit 1b231184422d400769902dff5e34890ec0024bb4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 19 00:29:50 2011 +0100
gcc: Update PIE patches.
commit 94b1fa72fa69b81da34dccd8aa04a450f0237a21
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Feb 18 23:42:44 2011 +0100
ccache: Fix vendor tuple.
-----------------------------------------------------------------------
Summary of changes:
 .../binutils-2.20.1-gentoo-flexible-tests.patch    |   82 --------------------
 pkgs/core/ccache/ccache.nm                         |    6 +-
 pkgs/core/gcc/gcc.nm                               |   30 +++++--
 pkgs/core/glibc/glibc.nm                           |   34 +++++----
 .../patches/glibc-2.10.1-undefine-__i686.patch     |   44 -----------
 5 files changed, 44 insertions(+), 152 deletions(-)
 delete mode 100644 pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch
 delete mode 100644 pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch
Difference in files:

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch b/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch
deleted file mode 100644
index c95e369..0000000
--- a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-flexible-tests.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-making some of the address matches more flexible fixes tests when using
-pax/relro/hash patches
-
---- binutils/ld/testsuite/ld-i386/hidden2.d
-+++ binutils/ld/testsuite/ld-i386/hidden2.d
-@@ -8,6 +8,6 @@
- Disassembly of section .text:
- 
- [a-f0-9]+ <bar>:
--[ 	]*[a-f0-9]+:	e8 af fe ff ff       	call   0 <bar-0x[a-f0-9]+>
-+[ 	]*[a-f0-9]+:	e8 ([a-f0-9]{2} ){2}ff ff       	call   0 <bar-0x[a-f0-9]+>
- [ 	]*[a-f0-9]+:	c3                   	ret    
- #pass
---- binutils/ld/testsuite/ld-x86-64/hidden2.d
-+++ binutils/ld/testsuite/ld-x86-64/hidden2.d
-@@ -8,6 +8,6 @@
- Disassembly of section .text:
- 
- [a-f0-9]+ <bar>:
--[ 	]*[a-f0-9]+:	e8 33 fe ff ff       	callq  0 <bar-0x[a-f0-9]+>
-+[ 	]*[a-f0-9]+:	e8 ([a-f0-9]{2} ){2}ff ff       	callq  0 <bar-0x[a-f0-9]+>
- [ 	]*[a-f0-9]+:	c3                   	retq   
- #pass
---- binutils/ld/testsuite/ld-x86-64/protected3.d
-+++ binutils/ld/testsuite/ld-x86-64/protected3.d
-@@ -8,6 +8,6 @@
- Disassembly of section .text:
- 
- 0+[a-f0-9]+ <bar>:
--[ 	]*[a-f0-9]+:	8b 05 ce 00 20 00    	mov    0x[a-f0-9]+(%rip),%eax        # [a-f0-9]+ <foo>
-+[ 	]*[a-f0-9]+:	8b 05 ([a-f0-9]{2} ){2}20 00    	mov    0x[a-f0-9]+(%rip),%eax        # [a-f0-9]+ <foo>
- [ 	]*[a-f0-9]+:	c3                   	retq   
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
-@@ -3,5 +3,5 @@
- #target: x86_64-*-* i?86-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x200|)@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x[a-f0-9]+|)@plt>
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-1-x86.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-1-x86.d
-@@ -3,5 +3,5 @@
- #target: x86_64-*-* i?86-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x220|)@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x[a-f0-9]+|)@plt>
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
-@@ -4,6 +4,6 @@
- #target: x86_64-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*+0x220@plt>
--[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*(%rip),%rax.*[ \t0-9a-fq]+<*ABS*+0x220@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*+0x[a-f0-9]+@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*(%rip),%rax.*[ \t0-9a-fq]+<*ABS*+0x[a-f0-9]+@plt>
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
-@@ -4,6 +4,6 @@
- #target: x86_64-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*+0x220@plt>
--[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*(%rip),%rax.*[ \t0-9a-fq]+<*ABS*+0x220@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*+0x[a-f0-9]+@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*(%rip),%rax.*[ \t0-9a-fq]+<*ABS*+0x[a-f0-9]+@plt>
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
-@@ -4,5 +4,5 @@
- #target: x86_64-*-* i?86-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x258|)@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<*ABS*(+0x[a-f0-9]+|)@plt>
- #pass
diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm
index 375d23b..3ebfbc3 100644
--- a/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = ccache
 PKG_VER        = 3.1.4
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUP      = Development/Compilers
@@ -36,6 +36,8 @@ PKG_SUMMARY    = C/C++ compiler cache.
PKG_BUILD_DEPS+= perl zlib-devel
+CCACHE_PLATFORM_TARGET = $(subst -gnu,,$(DISTRO_MACHINE))
+
 define PKG_DESCRIPTION
    ccache is a compiler cache.  It acts as a caching pre-processor to \
    C/C++ compilers, using the -E compiler switch and a hash to detect \
@@ -66,7 +68,7 @@ define STAGE_INSTALL_CMDS
    mkdir -pv $(BUILDROOT)/usr/lib/ccache
    for i in gcc g++ cc c++; do \
    	ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$${i}; \
-		ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$(DISTRO_MACHINE)-$${i}; \
+		ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$(CCACHE_PLATFORM_TARGET)-$${i}; \
    done
-mkdir -pv $(BUILDROOT)/etc/profile.d
diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 3a01b15..145ad4e 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = gcc
 PKG_VER        = 4.5.2
-PKG_REL        = 3
+PKG_REL        = 6
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org
 PKG_GROUP      = Development/Compilers
@@ -40,22 +40,30 @@ define PKG_DESCRIPTION
 endef
PKG_BUILD_DEPS+= autogen cloog-devel dejagnu elfutils-devel expect gmp-devel \
-	libffi-devel mpc-devel mpfr-devel pkg-config ppl-devel zlib-devel
+	libffi-devel mpc-devel mpfr-devel pkg-config ppl-devel texinfo zlib-devel
 PKG_DEPS-gcc  += binutils libgcc-devel
# Make the GCC target platform
 GCC_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE))
-ifeq "$(MACHINE)" "i586"
-	CONFIGURE_ARGS = --disable-decimal-float
+ifeq "$(DISTRO_ARCH)" "x86_64"
+	CONFIGURE_ARGS = --disable-multilib
 endif
-ifeq "$(MACHINE)" "x86_64"
-	CONFIGURE_ARGS = --disable-multilib
-else
-	CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE)
+ifeq "$(DISTRO_ARCH)" "i686"
+	CONFIGURE_ARGS = --with-arch=$(DISTRO_ARCH) --with-tune=generic
 endif
+# Modify CFLAGS
+#  Remove -m32 and -m64
+CFLAGS := $(subst -m32,,$(CFLAGS))
+CFLAGS := $(subst -m64,,$(CFLAGS))
+#  Remove -march=i686
+CFLAGS := $(subst -march=i686,,$(CFLAGS))
+
+export CFLAGS
+export CXXFLAGS = $(subst -Wall,,$(CFLAGS))
+
 PKG_TARBALL   += $(THISAPP).tar.gz
# A package for C++
@@ -141,14 +149,18 @@ define STAGE_PREPARE_CMDS
    # are known to not require fixing, issue the following command to prevent
    # the fixincludes script from running:
    cd $(DIR_APP) && sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in
+
+	cd $(DIR_APP) && sed -i gcc/Makefile.in \
+		-e "s/-fno-exceptions/& -fno-asynchronous-unwind-tables/"
 endef
define STAGE_BUILD
    cd $(DIR_SRC)/gcc-build && \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
    	XCFLAGS="$(CFLAGS)" \
    	TCFLAGS="$(CFLAGS)" \
    	../$(THISAPP)/configure \
-			$(CONFIG_CPU) \
    		--build=$(GCC_TARGET_PLATFORM) \
    		--prefix=/usr \
    		--libexecdir=/usr/lib \
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 271260d..cd51bc3 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -49,11 +49,21 @@ define PKG_DESCRIPTION
    Linux system will not function.
 endef
-GLIBC_FLAGS += -fno-strict-aliasing -mno-tls-direct-seg-refs -DNDEBUG
+# Build glibc with custom cflags
+GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -DPIC
-CFLAGS   += $(GLIBC_FLAGS)
-CXXFLAGS += $(GLIBC_FLAGS)
+ifeq "$(DISTRO_ARCH)" "i686"
+	GLIBC_FLAGS += -march=i686 -mtune=generic
+endif
+ifeq "$(DISTRO_ARCH)" "x86_64"
+	GLIBC_FLAGS += -mtune=generic
+endif
+
+export CFLAGS    = $(GLIBC_FLAGS)
+export CXXFLAGS  = $(GLIBC_FLAGS)
+
+GLIBC_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE))
 OPTIMIZED_KERNEL = 2.6.32
PKG_OBJECTS   += $(THISAPP).tar.xz
@@ -209,21 +219,17 @@ define STAGE_PREPARE
cd $(DIR_APP) && sed -i signal/Makefile \
    	-e "s/tst-sigset2//g"
+
+	#cd $(DIR_APP) && sed -i configure \
+	#	-e "s/-Werror -fstack-protector/-fstack-protector/"
 endef
define STAGE_BUILD
-	# --enable-stackguard-randomization could be added here, but this is primarily
-	# for attacks by local users, and we shouldn't have those in the rebooted
-	# system. Adding this will empty the /dev/random entropy pool (via
-	# /dev/urandom), unless the system is running a Random Number Gathering Daemon
-	# (rngd). This version of Glibc uses high precision timing with SSP, so the
-	# canary value changes at run-time. This is not as good as /dev/urandom, but
-	# it's better than nothing and has very good performance.
-
    cd $(DIR_SRC)/glibc-build && \
-		CFLAGS= \
-		CXXFLAGS= \
+		CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
    	../$(THISAPP)/configure \
+			--build=$(GLIBC_TARGET_PLATFORM) \
+			--host=$(GLIBC_TARGET_PLATFORM) \
    		--prefix=/usr \
    		--libexecdir=/usr/lib/glibc \
    		--disable-profile \
@@ -232,8 +238,6 @@ define STAGE_BUILD
    		--with-selinux \
    		--disable-werror \
    		--enable-bind-now \
-			--enable-stackguard-randomization \
-			--with-stack-protector=all \
    		--enable-__thread \
    		--enable-tls \
    		--enable-experimental-malloc \
diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch b/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch
deleted file mode 100644
index ce0ebd4..0000000
--- a/pkgs/core/glibc/patches/glibc-2.10.1-undefine-__i686.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-If gcc is configured to generate i686 code or better by default (like 
-when using the --with-arch=pentium3 configure option), then the __i686
-macro will always be defined automatically and thus screw up the
-compilation of some .S files.
-http://bugs.gentoo.org/131108
-
-2006-04-25  Mike Frysinger  vapier@gentoo.org
-
-	* sysdeps/i386/sysdep.h (__i686): Undefine.
-
---- glibc-2.10.1/sysdeps/i386/sysdep.h
-+++ glibc-2.10.1/sysdeps/i386/sysdep.h
-@@ -17,6 +17,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+/*
-+ * When building for i686 targets or better, gcc automatically defines
-+ * '__i686' to '1' for us which causes trouble when using section names
-+ * like '__i686.get_pc_thunk.reg'.  Since we check for __i686__ in the
-+ * code, killing '__i686' shouldn't be a problem.
-+ */
-+#undef __i686
-+
- #include <sysdeps/generic/sysdep.h>
- 
- #ifdef	__ASSEMBLER__
-
-2006-04-25  Mike Frysinger  vapier@gentoo.org
-
-	* sysdeps/pthread/pt-initfini.c: Include sysdep.h.
-
---- glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c
-+++ glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,9 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include "defs.h"");
- 
-+/* Embed an #include to pull in asm settings. */
-+asm ("\n#include <sysdep.h>");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
hooks/post-receive
--
IPFire 3.x development tree

    