Add hardened fix for bug #128806.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@371 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_compile.sh b/gen_compile.sh
index 1146700696569a7fedf457d0a1cf647225ccdcda..82701aff1b7eb961f0226d851009c82e51ee1662 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -785,6 +785,12 @@ compile_klibc() {
                        ${GK_SHARE}/pkg/klibc-1.1.16-sparc2.patch \
                        || gen_die "Failed patching klibc"
        fi
+       if [ -f "${GK_SHARE}/pkg/klibc-1.2.1-nostdinc-flags.patch" ]
+       then
+               patch -p1 -i \
+                       ${GK_SHARE}/pkg/klibc-1.2.1-nostdinc-flags.patch \
+                       || gen_die "Failed patching klibc"
+       fi
 
        # Don't install to "//lib" fix
        sed -e 's:SHLIBDIR = /lib:SHLIBDIR = $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib:' -i scripts/Kbuild.install

diff --git a/pkg/klibc-1.2.1-nostdinc-flags.patch b/pkg/klibc-1.2.1-nostdinc-flags.patch
new file mode 100644 (file)
index 0000000..acdbcb6
--- /dev/null
+++ b/pkg/klibc-1.2.1-nostdinc-flags.patch
@@ -0,0 +1,22 @@
+--- klibc-1.2.1/Makefile       2006-02-07 10:14:05.000000000 +0200
++++ klibc-1.2.1.az/Makefile    2006-02-07 10:14:11.000000000 +0200
+@@ -12,7 +12,7 @@
+ include scripts/Kbuild.include
+ 
+ export CC      := gcc
+-NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
++export NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+ 
+ export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ 
+--- klibc-1.2.1/klcc/Kbuild    2006-02-07 10:26:11.000000000 +0200
++++ klibc-1.2.1.az/klcc/Kbuild 2006-02-07 10:28:16.000000000 +0200
+@@ -14,7 +14,7 @@
+       $(Q)echo 'KCROSS=$(KCROSS)' >> $@
+       $(Q)echo 'CC=$(KLIBCCC)' >> $@
+       $(Q)echo 'LD=$(KLIBCLD)' >> $@
+-      $(Q)echo 'REQFLAGS=$(filter-out -I%,$(KLIBCDEFS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS))' >> $@
++      $(Q)echo 'REQFLAGS=$(NOSTDINC_FLAGS) $(filter-out -I%,$(KLIBCDEFS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS))' >> $@
+       $(Q)echo 'OPTFLAGS=$(KLIBCOPTFLAGS)' >> $@
+       $(Q)echo 'LDFLAGS=$(KLIBCLDFLAGS)' >> $@
+       $(Q)echo 'STRIP=$(KLIBCSTRIP)' >> $@