[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.13-prelink.patch)

[Allan McRae]

    Date: Thursday, February 17, 2011 @ 23:46:54
  Author: allan
Revision: 110236

upgpkg: glibc 2.13-4
fix prelink issue (FS#22656)

Added:
  glibc/trunk/glibc-2.13-prelink.patch
Modified:
  glibc/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    8 +++++++-
 glibc-2.13-prelink.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-17 23:32:13 UTC (rev 110235)
+++ PKGBUILD	2011-02-18 04:46:54 UTC (rev 110236)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=3
+pkgrel=4
 _glibcdate=20110117
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -25,6 +25,7 @@
         glibc-__i686.patch
         glibc-2.12.1-static-shared-getpagesize.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
+        glibc-2.13-prelink.patch
         nscd
         locale.gen.txt
         locale-gen)
@@ -34,6 +35,7 @@
          '40cd342e21f71f5e49e32622b25acc52'
          'a3ac6f318d680347bb6e2805d42b73b2'
          'b042647ea7d6f22ad319e12e796bd13e'
+         '24dfab6fd244f3773523412588ecc52c'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -67,6 +69,10 @@
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12489
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
+
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
   if [[ $CARCH == "x86_64" ]]; then
     sed -i '/__ASSUME_PRIVATE_FUTEX/d'  $srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h

Added: glibc-2.13-prelink.patch
===================================================================
--- glibc-2.13-prelink.patch	                        (rev 0)
+++ glibc-2.13-prelink.patch	2011-02-18 04:46:54 UTC (rev 110236)
@@ -0,0 +1,26 @@
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 9a560b3..201c9cf 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+      we need it in the memory handling later.  */
+   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ 
++  /* Remember the last search directory added at startup, now that
++     malloc will no longer be the one from dl-minimal.c.  */
++  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
++
+   if (prelinked)
+     {
+       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
+@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ 			  lossage);
+     }
+ 
+-  /* Remember the last search directory added at startup, now that
+-     malloc will no longer be the one from dl-minimal.c.  */
+-  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+-
+   if (! prelinked && rtld_multiple_ref)
+     {
+       /* There was an explicit ref to the dynamic linker as a shared lib.