glibc: Update to 2.11.1.

Fixes issue #503.

diff --git a/pkgs/core/glibc/glibc-2.10.1-stack_chk_fail.c b/pkgs/core/glibc/glibc-stack_chk_fail.c
similarity index 100%
rename from pkgs/core/glibc/glibc-2.10.1-stack_chk_fail.c
rename to pkgs/core/glibc/glibc-stack_chk_fail.c

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index c8c5d608681e6a67126339488443feb5c6dd9f08..9741527954cbdcefcbaea136397b234a867c070d 100644 (file)
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = glibc
-PKG_VER        = 2.10.1
+PKG_VER        = 2.11.1
 PKG_REL        = 0
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
@@ -153,7 +153,7 @@ define STAGE_PREPARE
        # We don't need to set -march=i?86 in confparams because GCC was built with
        # --with-arch=i?86.
 
-       cat $(DIR_SOURCE)/$(THISAPP)-stack_chk_fail.c \
+       cat $(DIR_SOURCE)/$(PKG_NAME)-stack_chk_fail.c \
                > $(DIR_APP)/debug/stack_chk_fail.c
 
        cd $(DIR_APP) && \

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-binutils-1.patch b/pkgs/core/glibc/patches/glibc-2.10.1-binutils-1.patch
deleted file mode 100644 (file)
index df39f0a..0000000
--- a/pkgs/core/glibc/patches/glibc-2.10.1-binutils-1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2009-10-18
-Initial Package Version: 2.10.1
-Upstream Status:         From upstream
-Origin:                  http://sourceware.org/git/?p=glibc.git;
-Description:             Enable Glibc to build against Binutils-2.20 onwards.
-
-diff -Naur glibc-2.10.1.orig/ChangeLog glibc-2.10.1/ChangeLog
---- glibc-2.10.1.orig/ChangeLog        2009-05-10 19:31:50.000000000 +0000
-+++ glibc-2.10.1/ChangeLog     2009-10-18 21:09:59.000000000 +0000
-@@ -1,3 +1,16 @@
-+2009-09-10  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Exclude binutils 2.X.  Support binutils 2.100
-+      and XX.
-+
-+2009-09-05  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Support binutils 2.100 and 3.0.
-+
-+2009-09-04  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Support binutils 2.20.
-+
- 2009-05-10  Ulrich Drepper  <drepper@redhat.com>
- 
-       * version.h (VERSION): Bump to 2.10.1.
-diff -Naur glibc-2.10.1.orig/configure glibc-2.10.1/configure
---- glibc-2.10.1.orig/configure        2009-05-17 12:19:31.000000000 +0000
-+++ glibc-2.10.1/configure     2009-10-18 20:26:14.000000000 +0000
-@@ -4839,7 +4839,7 @@
-   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -4902,7 +4902,7 @@
-   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-diff -Naur glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in
---- glibc-2.10.1.orig/configure.in     2009-04-03 23:51:47.000000000 +0000
-+++ glibc-2.10.1/configure.in  2009-10-18 21:06:56.000000000 +0000
-@@ -897,10 +897,10 @@
- # Accept binutils 2.13 or newer.
- AC_CHECK_PROG_VER(AS, $AS, --version,
-                 [GNU assembler.* \([0-9]*\.[0-9.]*\)],
--                [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
-+                [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as")
- AC_CHECK_PROG_VER(LD, $LD, --version,
-                 [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
--                [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
-+                [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
- 
- # We need the physical current working directory.  We cannot use the
- # "pwd -P" shell builtin since that's not portable.  Instead we try to

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-hardened-pie.patch b/pkgs/core/glibc/patches/glibc-2.10.1-hardened-pie.patch
deleted file mode 100644 (file)
index 65693d6..0000000
--- a/pkgs/core/glibc/patches/glibc-2.10.1-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Change link commands for glibc executables to build PIEs
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-
---- glibc-2.10.1/Makeconfig
-+++ glibc-2.10.1/Makeconfig
-@@ -415,10 +415,10 @@
- 
- # Command for linking programs with the C library.
- ifndef +link
--+link = $(CC) -nostdlib -nostartfiles -o $@ \
-++link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \
-             $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
-             $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
--            $(addprefix $(csu-objpfx),$(start-installed-name)) \
-+            $(addprefix $(csu-objpfx),S$(start-installed-name)) \
-             $(+preinit) $(+prector) \
-             $(filter-out $(addprefix $(csu-objpfx),start.o \
-                                                    $(start-installed-name))\
-@@ -429,7 +429,7 @@
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
-             $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--            $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+            $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
-             $(+preinit) $(+prector) \
-             $(filter-out $(addprefix $(csu-objpfx),start.o \
-                                                    $(start-installed-name))\
-@@ -528,8 +528,8 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) --print-file-name=crtbegin.o`
--+postctor = `$(CC) --print-file-name=crtend.o`
-++prector = `$(CC) --print-file-name=crtbeginS.o`
-++postctor = `$(CC) --print-file-name=crtendS.o`
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-mktemp_urandom.patch b/pkgs/core/glibc/patches/glibc-2.10.1-mktemp_urandom.patch.off
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-mktemp_urandom.patch
rename to pkgs/core/glibc/patches/glibc-2.10.1-mktemp_urandom.patch.off

diff --git a/pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch b/pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch
new file mode 100644 (file)
index 0000000..5816133
--- /dev/null
+++ b/pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch
@@ -0,0 +1,38 @@
+2009-11-08     Magnus Granberg         <zorry@ume.nu>
+
+               bug #292139
+               * Makeconfig    +link-pie:      set +link to +link-pie
+               +link-static:   change $(static-start-installed-name) to S$(static-start-installed-name)
+               +prector: set +prector to +prectorS             +postctor: set +postctor to +postctorS
+               
+
+--- a/Makeconfig       2009-11-06 16:39:18.000000000 +0100
++++ b/Makeconfig       2009-11-08 03:14:45.000000000 +0100
+@@ -447,11 +447,12 @@
+            $(common-objpfx)libc% $(+postinit),$^) \
+            $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+ endif
+++link = $(+link-pie)
+ # Command for statically linking programs with the C library.
+ ifndef +link-static
+ +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
+             $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
+-            $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
++            $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
+             $(+preinit) $(+prector) \
+             $(filter-out $(addprefix $(csu-objpfx),start.o \
+                                                    $(start-installed-name))\
+@@ -549,11 +550,10 @@
+ ifeq ($(elf),yes)
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
+-+prector = `$(CC) --print-file-name=crtbegin.o`
+-+postctor = `$(CC) --print-file-name=crtend.o`
+-# Variants of the two previous definitions for linking PIE programs.
+ +prectorS = `$(CC) --print-file-name=crtbeginS.o`
+ +postctorS = `$(CC) --print-file-name=crtendS.o`
+++prector = $(+prectorS)
+++postctor = $(+postctorS)
+ +interp = $(addprefix $(elf-objpfx),interp.os)
+ endif
+ csu-objpfx = $(common-objpfx)csu/

diff --git a/pkgs/toolchain/glibc/glibc-2.10.1-stack_chk_fail.c b/pkgs/toolchain/glibc/glibc-2.10.1-stack_chk_fail.c
deleted file mode 120000 (symlink)
index 64f85a7..0000000
--- a/pkgs/toolchain/glibc/glibc-2.10.1-stack_chk_fail.c
+++ /dev/null
@@ -1 +0,0 @@
-../../core/glibc/glibc-2.10.1-stack_chk_fail.c
\ No newline at end of file

diff --git a/pkgs/toolchain/glibc/glibc-stack_chk_fail.c b/pkgs/toolchain/glibc/glibc-stack_chk_fail.c
new file mode 120000 (symlink)
index 0000000..b34b6d9
--- /dev/null
+++ b/pkgs/toolchain/glibc/glibc-stack_chk_fail.c
@@ -0,0 +1 @@
+../../core/glibc/glibc-stack_chk_fail.c
\ No newline at end of file

diff --git a/pkgs/toolchain/glibc/patches/glibc-2.10.1-binutils-1.patch b/pkgs/toolchain/glibc/patches/glibc-2.10.1-binutils-1.patch
deleted file mode 100644 (file)
index df39f0a..0000000
--- a/pkgs/toolchain/glibc/patches/glibc-2.10.1-binutils-1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2009-10-18
-Initial Package Version: 2.10.1
-Upstream Status:         From upstream
-Origin:                  http://sourceware.org/git/?p=glibc.git;
-Description:             Enable Glibc to build against Binutils-2.20 onwards.
-
-diff -Naur glibc-2.10.1.orig/ChangeLog glibc-2.10.1/ChangeLog
---- glibc-2.10.1.orig/ChangeLog        2009-05-10 19:31:50.000000000 +0000
-+++ glibc-2.10.1/ChangeLog     2009-10-18 21:09:59.000000000 +0000
-@@ -1,3 +1,16 @@
-+2009-09-10  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Exclude binutils 2.X.  Support binutils 2.100
-+      and XX.
-+
-+2009-09-05  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Support binutils 2.100 and 3.0.
-+
-+2009-09-04  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+      * configure.in: Support binutils 2.20.
-+
- 2009-05-10  Ulrich Drepper  <drepper@redhat.com>
- 
-       * version.h (VERSION): Bump to 2.10.1.
-diff -Naur glibc-2.10.1.orig/configure glibc-2.10.1/configure
---- glibc-2.10.1.orig/configure        2009-05-17 12:19:31.000000000 +0000
-+++ glibc-2.10.1/configure     2009-10-18 20:26:14.000000000 +0000
-@@ -4839,7 +4839,7 @@
-   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -4902,7 +4902,7 @@
-   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-diff -Naur glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in
---- glibc-2.10.1.orig/configure.in     2009-04-03 23:51:47.000000000 +0000
-+++ glibc-2.10.1/configure.in  2009-10-18 21:06:56.000000000 +0000
-@@ -897,10 +897,10 @@
- # Accept binutils 2.13 or newer.
- AC_CHECK_PROG_VER(AS, $AS, --version,
-                 [GNU assembler.* \([0-9]*\.[0-9.]*\)],
--                [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
-+                [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as")
- AC_CHECK_PROG_VER(LD, $LD, --version,
-                 [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
--                [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
-+                [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
- 
- # We need the physical current working directory.  We cannot use the
- # "pwd -P" shell builtin since that's not portable.  Instead we try to

diff --git a/pkgs/toolchain/glibc/patches/glibc-2.10.1-hardened-pie.patch b/pkgs/toolchain/glibc/patches/glibc-2.10.1-hardened-pie.patch
deleted file mode 100644 (file)
index 65693d6..0000000
--- a/pkgs/toolchain/glibc/patches/glibc-2.10.1-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Change link commands for glibc executables to build PIEs
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-
---- glibc-2.10.1/Makeconfig
-+++ glibc-2.10.1/Makeconfig
-@@ -415,10 +415,10 @@
- 
- # Command for linking programs with the C library.
- ifndef +link
--+link = $(CC) -nostdlib -nostartfiles -o $@ \
-++link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \
-             $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
-             $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
--            $(addprefix $(csu-objpfx),$(start-installed-name)) \
-+            $(addprefix $(csu-objpfx),S$(start-installed-name)) \
-             $(+preinit) $(+prector) \
-             $(filter-out $(addprefix $(csu-objpfx),start.o \
-                                                    $(start-installed-name))\
-@@ -429,7 +429,7 @@
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
-             $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--            $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+            $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
-             $(+preinit) $(+prector) \
-             $(filter-out $(addprefix $(csu-objpfx),start.o \
-                                                    $(start-installed-name))\
-@@ -528,8 +528,8 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) --print-file-name=crtbegin.o`
--+postctor = `$(CC) --print-file-name=crtend.o`
-++prector = `$(CC) --print-file-name=crtbeginS.o`
-++postctor = `$(CC) --print-file-name=crtendS.o`
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/pkgs/toolchain/glibc/patches/glibc-2.10.1-mktemp_urandom.patch b/pkgs/toolchain/glibc/patches/glibc-2.10.1-mktemp_urandom.patch.off
similarity index 100%
rename from pkgs/toolchain/glibc/patches/glibc-2.10.1-mktemp_urandom.patch
rename to pkgs/toolchain/glibc/patches/glibc-2.10.1-mktemp_urandom.patch.off

diff --git a/pkgs/toolchain/glibc/patches/glibc-2.11.1-hardened-pie.patch b/pkgs/toolchain/glibc/patches/glibc-2.11.1-hardened-pie.patch
new file mode 100644 (file)
index 0000000..5816133
--- /dev/null
+++ b/pkgs/toolchain/glibc/patches/glibc-2.11.1-hardened-pie.patch
@@ -0,0 +1,38 @@
+2009-11-08     Magnus Granberg         <zorry@ume.nu>
+
+               bug #292139
+               * Makeconfig    +link-pie:      set +link to +link-pie
+               +link-static:   change $(static-start-installed-name) to S$(static-start-installed-name)
+               +prector: set +prector to +prectorS             +postctor: set +postctor to +postctorS
+               
+
+--- a/Makeconfig       2009-11-06 16:39:18.000000000 +0100
++++ b/Makeconfig       2009-11-08 03:14:45.000000000 +0100
+@@ -447,11 +447,12 @@
+            $(common-objpfx)libc% $(+postinit),$^) \
+            $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+ endif
+++link = $(+link-pie)
+ # Command for statically linking programs with the C library.
+ ifndef +link-static
+ +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
+             $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
+-            $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
++            $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
+             $(+preinit) $(+prector) \
+             $(filter-out $(addprefix $(csu-objpfx),start.o \
+                                                    $(start-installed-name))\
+@@ -549,11 +550,10 @@
+ ifeq ($(elf),yes)
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
+-+prector = `$(CC) --print-file-name=crtbegin.o`
+-+postctor = `$(CC) --print-file-name=crtend.o`
+-# Variants of the two previous definitions for linking PIE programs.
+ +prectorS = `$(CC) --print-file-name=crtbeginS.o`
+ +postctorS = `$(CC) --print-file-name=crtendS.o`
+++prector = $(+prectorS)
+++postctor = $(+postctorS)
+ +interp = $(addprefix $(elf-objpfx),interp.os)
+ endif
+ csu-objpfx = $(common-objpfx)csu/