Added glibc patch which fixes an ld.so.preload bug and thus sometimes

prevented the sandbox from working successfully. This closes bug #501

4 files changed, 163 insertions, 1 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 6bf6d34af7e8..768e5ed79799 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.3 2002/02/16 00:52:07 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.4 2002/04/03 21:20:29 gbevin Exp $
 
+*glibc-2.2.5-r3 (03 Apr 2002)
+
+  03 Apr 2002; Geert Bevin <gbevin@gentoo.org> glibc-2.2.5-r3.ebuild,
+  files/digest-glibc-2.2.5-r3, files/glibc-2.2.5-sandbox.diff :
+  
+  Added patch that fixes an ld.so.preload bug which made calls after freopen()
+  segfault. This now works correctly. This closes bug #501
+   
 *glibc-2.2.5-r1 (15 Feb 2002)
 
   15 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added tweaked version of
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.5-r3 b/sys-libs/glibc/files/digest-glibc-2.2.5-r3
new file mode 100644
index 000000000000..acc05c85ba28
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.2.5-r3
@@ -0,0 +1,2 @@
+MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
+MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
diff --git a/sys-libs/glibc/files/glibc-2.2.5-sandbox.diff b/sys-libs/glibc/files/glibc-2.2.5-sandbox.diff
new file mode 100644
index 000000000000..a963a5f8831e
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.2.5-sandbox.diff
@@ -0,0 +1,11 @@
+--- libc/elf/do-lookup.h	2001/08/26 22:24:08	1.16
++++ libc/elf/do-lookup.h	2002/04/03 04:03:39	1.16.2.1
+@@ -128,7 +128,7 @@
+ 	  if (verstab != NULL)
+ 	    {
+ 	      ElfW(Half) ndx = verstab[symidx] & 0x7fff;
+-	      if (ndx > 2) /* map->l_versions[ndx].hash != 0) */
++	      if (ndx >= 2) /* map->l_versions[ndx].hash != 0) */
+ 		{
+ 		  /* Don't accept hidden symbols.  */
+ 		  if ((verstab[symidx] & 0x8000) == 0 && num_versions++ == 0)
diff --git a/sys-libs/glibc/glibc-2.2.5-r3.ebuild b/sys-libs/glibc/glibc-2.2.5-r3.ebuild
new file mode 100644
index 000000000000..264d0a84da26
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.2.5-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r3.ebuild,v 1.1 2002/04/03 21:20:29 gbevin Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
+	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+#portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
+#drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
+DEPEND="sys-kernel/linux-headers nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
+RDEPEND="sys-kernel/linux-headers"
+
+if [ -z "`use build`" ]
+then
+	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
+else
+	RDEPEND="$RDEPEND >=sys-apps/portage-1.8.9_pre1 sys-apps/baselayout"
+fi
+
+PROVIDE="virtual/glibc"
+
+#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+export CFLAGS="$CFLAGS -O2"
+export CXXFLAGS="$CFLAGS"
+
+src_unpack() {
+	unpack glibc-${PV}.tar.bz2 || die
+	cd ${S}
+	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
+	mkdir man; cd man
+	tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
+	cd ${S}
+	unpack glibc-linuxthreads-${PV}.tar.bz2 || die
+	
+	# This patch apparently eliminates compiler warnings for some versions of gcc.
+	# For information about the string2 patch, see: 
+	# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
+	patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
+
+	# This next one is a new patch to fix thread signal handling.  See:
+	# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
+	# (Added by drobbins on 05 Mar 2002)
+	patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
+
+	# patch to fix a bug in the ld_preload handling
+	patch -p1 < ${FILESDIR}/glibc-2.2.5-sandbox.diff || die
+
+	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
+	cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
+
+	# The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
+	# shouldn't be necessary.  The solution is to add -O2.  According to Andreas Jaeger of SuSE, "glibc
+	# *needs* to be compiled with optimization" (emphasis mine).  So let's fix the optimization settings,
+	# not tweak glibc.
+	# (drobbins, 10 Feb 2002)
+	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
+	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
+	# cd ${S}/linuxthreads
+	# cp spinlock.c spinlock.c.orig
+	# sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
+	
+	# The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
+	# http://lwn.net/2001/1220/a/glibc-vulnerability.php3
+	# cd ${S}
+	# patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
+}
+
+src_compile() {
+	local myconf
+	# If we build for the build system we use the kernel headers from the target
+	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
+	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
+	then
+		myconf="${myconf} --with-gd=yes"
+	else
+		myconf="${myconf} --with-gd=no"
+	fi
+	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
+	rm -rf buildhere
+	mkdir buildhere
+	cd buildhere
+	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
+		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
+	
+	#This next option breaks the Sun JDK and the IBM JDK
+	#We should really keep compatibility with older kernels, anyway
+	#--enable-kernel=2.4.0
+	make PARALLELMFLAGS="${MAKEOPTS}" || die
+	make check
+}
+
+
+src_install() {
+	export LC_ALL=C
+	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
+	if [ -z "`use build`" ]
+	then
+		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
+		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
+		#install linuxthreads man pages
+		dodir /usr/share/man/man3
+		doman ${S}/man/*.3thr	
+		install -m 644 nscd/nscd.conf ${D}/etc
+		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
+	else
+		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
+	fi
+	if [ "`use pic`" ] 
+	then
+		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
+		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
+		for i in ${D}/lib/*.map
+		do
+			mv ${i} ${i%.map}_pic.map
+		done
+	fi
+	#is this next line actually needed or does the makefile get it right?
+	#It previously has 0755 perms which was killing things.
+	chmod 4755 ${D}/usr/lib/misc/pt_chown
+	rm -f ${D}/etc/ld.so.cache
+
+	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	#creation of the "factory" symlink in pkg_postinst().
+	rm -f ${D}/etc/localtime
+
+	#some things want this, notably ash.
+	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
+}
+
+pkg_postinst()
+{
+	if [ ! -L ${ROOT}etc/localtime ]
+	then
+		echo "Please remember to set your timezone using the zic command."
+		rm -f ${ROOT}/etc/localtime
+		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
+	fi	
+}