added ld.so brk patch, which should fix the upstream bug detailed at http://sources.redhat.com/bugzilla/show_bug.cgi?id=227

4 files changed, 72 insertions, 4 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 11e7454710a1..7562601def0c 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.239 2004/08/16 04:57:57 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.240 2004/08/16 18:57:20 lv Exp $
+
+  16 Aug 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch, glibc-2.3.4.20040808.ebuild:
+  added ld.so brk patch, which should fix the upstream bug detailed at
+  http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
 
   15 Aug 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3_pre20040207.ebuild:
   removed ebuild now that alpha and ia64 dont use it
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bf4e5e66d2a0..2205ae188729 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,11 +1,11 @@
-MD5 01b6c58e3a64a87885c1c7d15ddde18e glibc-2.3.4.20040808.ebuild 21619
+MD5 ac6dc16cb220733bb34cf170234a1f26 glibc-2.3.4.20040808.ebuild 21744
 MD5 e929e89d8a94ba13805c79afef1a23e7 glibc-2.3.2-r11.ebuild 20307
 MD5 29da4b0f10b1afbb74d391537ae8c75b glibc-2.3.3.20040420-r1.ebuild 21474
 MD5 d76c190c324bd78acdd50153b087d0aa glibc-2.3.2-r10.ebuild 20217
 MD5 1d6c38dbd7ccc25b49a5b3c835d7542a glibc-2.3.4.20040605.ebuild 17579
 MD5 a801088ffde31871b71fea8919299e08 glibc-2.3.4.20040619-r1.ebuild 21730
 MD5 b7f41b64d13ebb13463afe77a0fab815 glibc-2.3.2-r2.ebuild 18863
-MD5 830614cc8ae020bc14728244e7cd24fe ChangeLog 49111
+MD5 912b0c241994d8f09d6f8616acfeb248 ChangeLog 49362
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 8413392cd26f51d0d0be2ac3493c0687 glibc-2.2.5-r9.ebuild 10874
 MD5 a286fb7deff9b927e5bb9e6e69f98663 glibc-2.3.2-r9.ebuild 19572
@@ -117,3 +117,4 @@ MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch
 MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
 MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
 MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
new file mode 100644
index 000000000000..d1d9a924be8b
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
@@ -0,0 +1,60 @@
+diff -Nru glibc-2.3.3.old/sysdeps/unix/sysv/linux/dl-sysdep.c glibc-2.3.3/sysdeps/unix/sysv/linux/dl-sysdep.c
+--- glibc-2.3.3.old/sysdeps/unix/sysv/linux/dl-sysdep.c	2004-08-16 10:47:10.361264216 -0400
++++ glibc-2.3.3/sysdeps/unix/sysv/linux/dl-sysdep.c	2004-08-16 10:47:55.068467688 -0400
+@@ -1,5 +1,5 @@
+ /* Dynamic linker system dependencies for Linux.
+-   Copyright (C) 1995, 1997, 2001 Free Software Foundation, Inc.
++   Copyright (C) 1995, 1997, 2001, 2004 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -21,6 +21,8 @@
+    the generic dynamic linker system interface code.  */
+ 
+ #include <unistd.h>
++#include <ldsodefs.h>
++#include "kernel-features.h"
+ 
+ #define DL_SYSDEP_INIT frob_brk ()
+ 
+@@ -28,6 +30,27 @@
+ frob_brk (void)
+ {
+   __brk (0);			/* Initialize the break.  */
++
++#if ! __ASSUME_BRK_PAGE_ROUNDED
++  /* If the dynamic linker was executed as a program, then the break may
++     start immediately after our data segment.  However, dl-minimal.c has
++     already stolen the remainder of the page for internal allocations.
++     If we don't adjust the break location recorded by the kernel, the
++     normal program startup will inquire, find the value at our &_end,
++     and start allocating its own data there, clobbering dynamic linker
++     data structures allocated there during startup.
++
++     Later Linux kernels have changed this behavior so that the initial
++     break value is rounded up to the page boundary before we start.  */
++
++  extern void *__curbrk attribute_hidden;
++  extern void _end attribute_hidden;
++  void *const endpage = (void *) 0 + (((__curbrk - (void *) 0)
++				       + GLRO(dl_pagesize) - 1)
++				      & -GLRO(dl_pagesize));
++  if (__builtin_expect (__curbrk >= &_end && __curbrk < endpage, 0))
++    __brk (endpage);
++#endif
+ }
+ 
+ #include <sysdeps/generic/dl-sysdep.c>
+diff -Nru glibc-2.3.3.old/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.3.3/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.3.3.old/sysdeps/unix/sysv/linux/kernel-features.h	2004-08-16 10:47:09.458401472 -0400
++++ glibc-2.3.3/sysdeps/unix/sysv/linux/kernel-features.h	2004-08-16 10:48:02.345361432 -0400
+@@ -400,3 +400,9 @@
+ #if __LINUX_KERNEL_VERSION >= 132612
+ # define __ASSUME_GETDENTS32_D_TYPE	1
+ #endif
++
++/* Starting with version 2.5.3, the initial location returned by `brk'
++   after exec is always rounded up to the next page.  */
++#if __LINUX_KERNEL_VERSION >= 132355
++# define __ASSUME_BRK_PAGE_ROUNDED	1
++#endif
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
index 40fe61c2f4b3..833977fa8ee8 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808.ebuild,v 1.9 2004/08/12 18:11:57 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808.ebuild,v 1.10 2004/08/16 18:57:20 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -513,6 +513,8 @@ src_unpack() {
 
 	# Remaining patches
 	cd ${S}
+	# fix for http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
 
 	# Fix permissions on some of the scripts
 	chmod u+x ${S}/scripts/*.sh