uclibc updates

4 files changed, 55 insertions, 77 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index 89d65eee3c23..b1a7975653b2 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.41 2004/11/06 07:07:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.42 2004/11/11 01:06:15 solar Exp $
+
+  10 Nov 2004; <solar@gentoo.org> uclibc-0.9.26-r8.ebuild:
+  uclibc updates
 
 *uclibc-0.9.26-r8 (06 Nov 2004)
 
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index c152a20047f4..a8e3a078cad4 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,43 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d98118dbcb77466679b07fd6eb029f9f uclibc-9999.ebuild 5443
+MD5 aa90c52c4802ce061ceb05af0ccf631f uclibc-0.9.26-r8.ebuild 9085
+MD5 7ba6e2f7dbe4f241de617f5ebfa35fa0 uclibc-0.9.26-r5.ebuild 7658
 MD5 6aaadcf07b706c9004528ff9081e3ce0 ChangeLog 7806
-MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096
-MD5 d98118dbcb77466679b07fd6eb029f9f uclibc-9999.ebuild 5443
-MD5 da4fc6c9f7a369ef2b61611c46bd3a8d uclibc-0.9.26-r8.ebuild 9749
+MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
 MD5 59d40f2d78a6bbdb5e3fc3f0efe960ef uclibc-0.9.26-r7.ebuild 7861
-MD5 7ba6e2f7dbe4f241de617f5ebfa35fa0 uclibc-0.9.26-r5.ebuild 7658
 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
-MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
 MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973
-MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r8 231
 MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r5 231
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uclibc-9999 0
 MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r7 231
-MD5 17ecd222df47b5253f35787097440a5a files/0.9.23/uClibc-0.9.23-etdyn.patch 5832
-MD5 298b7b42f80e1f8ae395df81c47eb213 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821
-MD5 4216cdf86d54f45fa04cb44a5425b3ff files/0.9.23/uClibc-0.9.23-pax.patch 3607
+MD5 8ffd115eb23763c99de8a8230f7a7495 files/digest-uclibc-0.9.26-r8 232
+MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uclibc-9999 0
+MD5 df59fcf3a02c17b7dac6999bd9262d05 files/cvs/22_all_uClibc-ld-now.patch 1072
 MD5 7eea15a7a3e8d8a2a222b815e57dc221 files/cvs/13_all_uClibc-enable-ssp.patch 331
 MD5 9cb04f6f038b903868f99d90f81e7e61 files/cvs/21_all_uClibc-ld-relro.patch 1040
-MD5 df59fcf3a02c17b7dac6999bd9262d05 files/cvs/22_all_uClibc-ld-now.patch 1072
+MD5 4216cdf86d54f45fa04cb44a5425b3ff files/0.9.23/uClibc-0.9.23-pax.patch 3607
+MD5 17ecd222df47b5253f35787097440a5a files/0.9.23/uClibc-0.9.23-etdyn.patch 5832
+MD5 298b7b42f80e1f8ae395df81c47eb213 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821
+MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
+MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
 MD5 46d965d8bdfe981f75fb8696799d9d2a files/0.9.26/ssp.c 3937
-MD5 2416f5e954ccb8b39b1c0d6a3cf5e827 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
-MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch 863
+MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
+MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
 MD5 49671ccbdf2c8055efc6cde0003cb6c5 files/0.9.26/arm-fix-missing-syscalls.patch 2264
+MD5 efd96414f3be520f07eabd1c02be1ecb files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
 MD5 874260fc77637deccf7588cfc1c76674 files/0.9.26/uClibc-20040613-do_rem.patch 391
-MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
 MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
-MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
-MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
-MD5 efd96414f3be520f07eabd1c02be1ecb files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
+MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch 863
 MD5 7157f784ba7672c9904d289712131a52 files/0.9.26/uclibc-0.9.26-ldso-cache.patch 410
-MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
-MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBjHhqHTu7gpaalycRAkcdAJ0W9eQvrV4L0CkBDPE5OrFqUNHJKQCeNSrD
-REu6PD6q8mMRzPZpSGWkCto=
-=+x2j
------END PGP SIGNATURE-----
+MD5 2416f5e954ccb8b39b1c0d6a3cf5e827 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
+MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
diff --git a/dev-libs/uclibc/files/digest-uclibc-0.9.26-r8 b/dev-libs/uclibc/files/digest-uclibc-0.9.26-r8
index 355f8d702bae..3f897c835596 100644
--- a/dev-libs/uclibc/files/digest-uclibc-0.9.26-r8
+++ b/dev-libs/uclibc/files/digest-uclibc-0.9.26-r8
@@ -1,3 +1,3 @@
 MD5 7212713c432dd0de6ec2140c2a6212e4 uClibc-0.9.26.tar.bz2 1604543
-MD5 1c082d43f02e7fa199fe724469111d88 uClibc-0.9.26-cvs-update-20040808.patch.bz2 345344
-MD5 b7820c6b79f02d2d07a7ac75abfe90a5 uClibc-0.9.26-patches-1.1.tar.bz2 7162
+MD5 78ed315ff2a414d193366de869fb1490 uClibc-0.9.26-cvs-update-20041110.patch.bz2 399149
+MD5 4c60104636709c2e631aec586842767e uClibc-0.9.26-patches-1.2.tar.bz2 51434
diff --git a/dev-libs/uclibc/uclibc-0.9.26-r8.ebuild b/dev-libs/uclibc/uclibc-0.9.26-r8.ebuild
index 25014d14efd0..2891007f73b2 100644
--- a/dev-libs/uclibc/uclibc-0.9.26-r8.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.26-r8.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/dev-libs/uclibc/uclibc-0.9.26-r8.ebuild,v 1.1 2004/11/06 07:07:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r8.ebuild,v 1.2 2004/11/11 01:06:15 solar Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -11,8 +11,8 @@ inherit eutils flag-o-matic gcc
 # rm -rf uClibc-0.9.26-cvs-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.26
 
 MY_P="${P/ucl/uCl}"
-CVS_VER="20040808"
-PATCH_VER="1.1"
+CVS_VER="20041110"
+PATCH_VER="1.2"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2
@@ -104,37 +104,20 @@ src_unpack() {
 
 	if [ -n "${PATCH_VER}" ] ; then
 		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		# for now we remove relro/now, no support for relro in ldso
-		rm -f ${WORKDIR}/patch/*relro*
-		rm -f ${WORKDIR}/patch/*now*
-		rm -f ${WORKDIR}/patch/11_all_uClibc-0.9.26-socket.patch.bz2
-		# remove default ssp build
-		use hardened || rm -f ${WORKDIR}/patch/*enable-ssp*
+		mv ${WORKDIR}/patch/*frandom* ${WORKDIR}/patch/exclude/
+		# zdefs/main patches, not yet properly tested
+		mv ${WORKDIR}/patch/*{zdefs,main}* ${WORKDIR}/patch/exclude/
+		# needed for gcc-3.4 after frandom
+		mv ${WORKDIR}/patch/*attribute* ${WORKDIR}/patch/exclude/
 		epatch ${WORKDIR}/patch
+		# for math functions (j2sdk/xorg-x11)
+		#epatch ${WORKDIR}/patch/math
 	fi
 
 	# support archs which dont implement all syscalls
 	[ -z "${CVS_VER}" ] \
 		&& epatch ${FILESDIR}/${PV}/arm-fix-missing-syscalls.patch \
 		|| epatch ${FILESDIR}/${PV}/uclibc-0.9.26-arm-dl-sysdep.patch
-	epatch ${FILESDIR}/${PV}/arm-ucontext.patch
-
-	# build all .S files w/ -Wa,--noexecstack
-	if [ "0${CVS_VER}" -ge "20040730" ] ; then
-		einfo "Skipping noexecstack patch. (need update)"
-	else
-		epatch ${FILESDIR}/${PV}/${PN}-${PV}-noexecstack.patch
-	fi
-
-	# fix segfaults when running things like `emerge sync`
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-resolve-segfault.patch
-
-	# allow libs tagged as ELF_LIBC0 in the cache to be loaded
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-ldso-cache.patch
-
-	# Take extra security precaution's for suid handling with environment variables
-	epatch ${FILESDIR}/${PV}/uClibc-20040921-ldso-unsecvars.patch
-	cp ${FILESDIR}/${PV}/unsecvars.h ${S}/ldso/include/ || die
 
 	# fixup for install perms
 	sed -i -e "s:-fa:-dRf:g" Makefile
@@ -146,7 +129,7 @@ src_unpack() {
 		arm)	target="arm";		config_target="GENERIC_ARM";;
 		mips)	target="mips";		config_target="MIPS_ISA_1";;
 		ppc)	target="powerpc";	config_target="no cpu-specific options";;
-		sh)		target="sh";		config_target="SH4";;
+		sh)	target="sh";		config_target="SH4";;
 		x86)	target="i386";		config_target="GENERIC_386";;
 		*)		die "${ARCH} lists no defaults :/";;
 	esac
@@ -182,6 +165,7 @@ src_unpack() {
 	#	echo "UCLIBC_HAS_XLOCALE=n" >> .config
 	#	echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
 	#	echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
+	#	# removed on 20040907 by mjn3
 	#	echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
 	#	# on pax enabled kernels the locale files can't be built
 	#	echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config
@@ -192,17 +176,26 @@ src_unpack() {
 	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
 
 	if use hardened ; then
-		if use x86
-		then
+		sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
+		if has ${ARCH} x86 ppc mips; then
 			einfo "Enable Position Independent Executable support in ${P}"
-			sed -i -e "s:# UCLIBC_PIE_SUPPORT.*:UCLIBC_PIE_SUPPORT=y:" .config
+			echo "UCLIBC_BUILD_PIE=y" >> .config
 		fi
 
 		einfo "Enable Stack Smashing Protections support in ${P}"
-		sed -i -e "s:# UCLIBC_PROPOLICE.*:UCLIBC_PROPOLICE=y:" .config
+		echo "UCLIBC_HAS_SSP=y:" >> .config
 		echo "PROPOLICE_BLOCK_ABRT=n" >> .config
-		echo "PROPOLICE_BLOCK_SEGV=n" >> .config
-		echo "PROPOLICE_BLOCK_KILL=y" >> .config
+		if use debug ; then
+			echo "PROPOLICE_BLOCK_SEGV=y" >> .config
+			echo "PROPOLICE_BLOCK_KILL=n" >> .config
+		else
+			echo "PROPOLICE_BLOCK_SEGV=n" >> .config
+			echo "PROPOLICE_BLOCK_KILL=y" >> .config
+		fi
+		echo "UCLIBC_BUILD_SSP=y" >> .config
+		echo "UCLIBC_BUILD_RELRO=y" >> .config
+		echo "UCLIBC_BUILD_NOW=y" >> .config
+		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
 	fi
 
 	# we are building against system installed kernel headers
@@ -215,7 +208,6 @@ src_unpack() {
 			-e 's:DEVEL_PREFIX=.*:DEVEL_PREFIX="/usr":' \
 			-e 's:RUNTIME_PREFIX=.*:RUNTIME_PREFIX="/":' \
 			.config
-		sed -i '/LIBRARY_CACHE:=/s:#::' Rules.mak
 	fi
 
 	yes "" | make -s oldconfig > /dev/null || die "could not make oldconfig"
@@ -225,11 +217,6 @@ src_unpack() {
 	cp .config myconfig
 
 	emake clean >/dev/null || die "could not clean"
-
-	sed -i 's:-DUCLIBC:$(LIBRARY_CACHE) -DUCLIBC:' ldso/{ldso,libdl}/Makefile
-	sed -i 's:\$(R_PREFIX):\\"$(RUNTIME_PREFIX)\\" $(LIBRARY_CACHE):' utils/Makefile
-	sed -i 's: I\.: -I.:' ldso/libdl/Makefile
-	sed -i 's:sys/user\.h:asm/page.h:' libc/misc/internals/__uClibc_main.c
 }
 
 src_compile() {
@@ -280,13 +267,9 @@ src_install() {
 		emake PREFIX=${D} install_utils || die "install-utils failed"
 		dodir /usr/bin
 		exeinto /usr/bin
-		doexe ${FILESDIR}/getent
+		doexe docs/getent
 	fi
 
-	# shameless plug for mjn3 who gives us so much...
-	# please give back if you can. -solar
-	f=DEDICATION.mjn3 ; [ -e "$f" ] && ( cat $f ; epause 2 )
-
 	if ! use build
 	then
 		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
@@ -298,6 +281,8 @@ src_install() {
 #check_main_libc
 #if [ "${SYS_LIBC}" = "uClibc" ] ; then
 #	if [ "${ROOT}" = "/" ] ; then
+#		# should we create ld.so.conf and/or preload?
+#		# currently the option is not enabled
 #		/sbin/ldconfig
 #		[ ! -e /etc/TZ ] && echo UTC > /etc/TZ
 #		# reload init?