- work around gcc-4 lack of ssp by default support while +hardened is enabled

Package-Manager: portage-2.1.4.5

4 files changed, 25 insertions, 31 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 0fd2f0b7907f..a1a05b4702d9 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/uclibc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.41 2008/11/28 20:09:45 solar Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.42 2009/01/02 19:50:47 solar Exp $
+
+  02 Jan 2009; <solar@gentoo.org> metadata.xml, uclibc-0.9.30.ebuild:
+  work around gcc-4 lack of ssp by default support while +hardened is enabled
 
 *uclibc-0.9.30 (28 Nov 2008)
 
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 626706cbac33..d771d46d0107 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -5,12 +5,13 @@ DIST uClibc-0.9.28.3-patches-1.0.tar.bz2 16079 RMD160 2224a7b826932fcd5c96a0bddb
 DIST uClibc-0.9.28.3-patches-1.3.tar.bz2 21241 RMD160 c78dda0bdbc751721559d91bdd60a29e5260007b SHA1 f89a0bd18fbda1101ad419c3abc06068dd237776 SHA256 b3a3a98798861e38525082884b4a5be1ab42d281c2680db3ddc0085d031aa397
 DIST uClibc-0.9.28.3-patches-1.8.tar.bz2 27909 RMD160 7c936749075162939c76489aa5a88278f235b48f SHA1 5bb582cb8f95407bd9fa938a9dd09027dcf0db0b SHA256 9496394de9de241551497c496b7fb8ece32b23536485bd81bd20128c2e104790
 DIST uClibc-0.9.28.3.tar.bz2 1795383 RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 SHA1 77c5220697a1772d0d9da4bda0d866e4f4b68540 SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1
+DIST uClibc-0.9.30-patches-1.0.tar.bz2 7017 RMD160 548b43fc8f3d3637eccef5c5df13b84380ec8631 SHA1 bfb64d3bdc0d067e78b050fe899021849a47f091 SHA256 e8f36766c8b6cb37bab69af09e7ff2c5108719c74b83fc145893198b87f8e73e
 DIST uClibc-0.9.30.tar.bz2 2291882 RMD160 08270ef742a2167ae660c5440bc5f78775a10ab0 SHA1 e96665237968fb2e4aa027bde9d56c4fe599eb1b SHA256 67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
 DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57
 EBUILD uclibc-0.9.27-r1.ebuild 12349 RMD160 1907241e5b159e8e6dfe5758254e78529508da5c SHA1 6ccc353679842a15cec02e67370a53468b813c25 SHA256 ef45378f6dfbe838b5985c727e09f751dc099f8d61d22abdb347131cf51afc2e
 EBUILD uclibc-0.9.28.3-r3.ebuild 14519 RMD160 196cf32e0f8d9af1b8a4590ddce8a80fd847a709 SHA1 9e11b057d9bf475eabc1dc0bb9fded4eaf7d0ae7 SHA256 582e5eb25110ad74638a1ad0fa70f865e2668e127695a46a8fdbf2909a49073b
 EBUILD uclibc-0.9.28.3-r7.ebuild 14522 RMD160 c951654646c8d3d6ec5559d70678092d256c1257 SHA1 d6ee1ff5ead3f338c5d6b3a0378ce82c471811b4 SHA256 6dfaa8c2fa10ffe2f0a93737e9045829a4922b12f0c70cfd7457e124a9e9d9a7
 EBUILD uclibc-0.9.28.3.ebuild 14513 RMD160 f0b09ee89ca6ab4255b06fb4a5d89d8363cde623 SHA1 11a32313695999f0d0b874e90a13add4cbb911a1 SHA256 cd1defc5347cf8bdadd6a04c1742c877b69f745afb7941f87621ee53a0763c69
-EBUILD uclibc-0.9.30.ebuild 14437 RMD160 dfe03f05625ac0da2903ccf318af0ca01f93b1b6 SHA1 bc35f7524f46c840bf9ebf2db2f8c98448dfe633 SHA256 6a8f734e42ee0d970e729f883d4b2cdd33532b9bdf0d1919b24a685fad8f04a7
-MISC ChangeLog 14877 RMD160 8b4ee423260b30a8abd30b533b20ff3bdcf7dc63 SHA1 3c97075de67a04233bdc8e96969f4562239a8aca SHA256 3082a9e26bc107865449e6ea64b4483672d6f44291f40a2cb4fa445f2c9db548
-MISC metadata.xml 1382 RMD160 aec15535239f8395eb53ba3f0d1730f9e02693e3 SHA1 1ade2f09631f7c0bfe424dc775f6787928e21e5a SHA256 503af91d433a322b80e8ed4c9c1606c7be47dd5feecd46a07fd57eb5e5a3813f
+EBUILD uclibc-0.9.30.ebuild 13893 RMD160 0dd6ab25b02451321814d4a65dc252336321a678 SHA1 823f0873f266d4b52aa3bcd6a1f77bbc1cbcb5ba SHA256 b0dd78d58a327d2745143d75af3ae990b509f62e38c246141b53481180f9be37
+MISC ChangeLog 15026 RMD160 e3287b6f3cfbd6cd844640582e444203e1f09527 SHA1 f3d8e4854e7cf97d83f01e44710204e0f8e0b44a SHA256 ac624bacdace80560079e1864e7ec9847ce9516007fb4a0148bc04e70691b903
+MISC metadata.xml 1469 RMD160 0c3640cb24a93c003e59cd0f9fd99587881ac63e SHA1 6be5e573878f88438a0121ff49841d52f07dedcd SHA256 e2f9e4727e826e87f735157c170a4e1f5f3ff572a2a2875f6a8889dfa5c648a3
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index 444fc358b34e..7d7faccbef8c 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -20,6 +20,7 @@ systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel,
 SH, SPARC, and v850 processors.
 </longdescription>
 <use>
+	<flag name='ssp'>Force the use of ssp to be built into a hardened uclibc setup</flag>
 	<flag name='pregen'>Use pregenerated locales</flag>
 	<flag name='savedconfig'>Adds support for user defined configs</flag>
 	<flag name='uclibc-compat'>Build uclibc with backwards compatible
diff --git a/sys-libs/uclibc/uclibc-0.9.30.ebuild b/sys-libs/uclibc/uclibc-0.9.30.ebuild
index faaae0940d02..8da14fdfac93 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.1 2008/11/28 20:09:45 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.2 2009/01/02 19:50:47 solar Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -21,7 +21,7 @@ fi
 
 MY_P=uClibc-0.9.30
 SVN_VER=""
-#PATCH_VER="0.1"
+PATCH_VER="1.0"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
@@ -33,20 +33,20 @@ SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
 	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
+SLOT="0"
 KEYWORDS="-* ~arm ~m68k -mips ~ppc ~sh ~sparc ~x86 ~amd64"
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp crosscompile_opts_headers-only"
+IUSE="build uclibc-compat debug hardened ssp iconv ipv6 minimal nls pregen userlocales wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
 RDEPEND=""
 if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
 	DEPEND=""
 	PROVIDE=""
+	SLOT="${CTARGET}"
 else
 	DEPEND="virtual/os-headers app-misc/pax-utils"
 	PROVIDE="virtual/libc"
+	SLOT="0"
 fi
 
 S=${WORKDIR}/${MY_P}
@@ -60,6 +60,7 @@ alt_build_kprefix() {
 		echo /usr/${CTARGET}/usr/include
 	fi
 }
+
 just_headers() {
 	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
@@ -186,19 +187,6 @@ src_unpack() {
 		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
 		EPATCH_SUFFIX="patch"
 		epatch "${WORKDIR}"/patch
-		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die
-		epatch "${WORKDIR}"/patch/math
-	fi
-
-	if [[ -d "${FILESDIR}"/patches-${PV} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${FILESDIR}"/patches-${PV}
-		if [[ -d "${FILESDIR}"/patches-${PV}/math/libm ]] ; then
-			# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-			cp "${FILESDIR}"/patches-${PV}/math/libm/* "${S}"/libm/ || die
-			epatch "${FILESDIR}"/patches-${PV}/math
-		fi
 	fi
 
 	########## CPU SELECTION ##########
@@ -248,7 +236,7 @@ src_unpack() {
 	local moredefs="COMPAT_ATEXIT"
 	local compat_sym=atexit
 
-	# We need todo this for a few months. .29 is a major upgrade.
+	# We need todo this for a few months. .30 is a major upgrade.
 	# Don't do it from cross-compiling case though
 	if ! use uclibc-compat ; then
 		if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \
@@ -288,7 +276,7 @@ src_unpack() {
 			set_opt UCLIBC_HAS_GETTEXT_AWARENESS n
 		fi
 
-		if use pregen ; then
+		if use pregen && [[ ${target} != mips ]]; then
 			set_opt UCLIBC_PREGENERATED_LOCALE_DATA y
 			set_opt UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA y
 			if use userlocales ; then
@@ -321,8 +309,7 @@ src_unpack() {
 	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
 	# it will be emitted as RWE, ppc has to be checked, x86 needs it
 	# this option should be used independently of hardened
-	# relro could be also moved out of hardened
-	if has $(tc-arch) x86 ; then
+	if has $(tc-arch) x86 || has $(tc-arch) ppc; then
 		set_opt UCLIBC_BUILD_NOEXECSTACK y
 	else
 		set_opt UCLIBC_BUILD_NOEXECSTACK n
@@ -334,9 +321,11 @@ src_unpack() {
 		else
 			set_opt UCLIBC_BUILD_PIE n
 		fi
-		set_opt SSP_QUICK_CANARY n
-		set_opt UCLIBC_BUILD_SSP y
 		set_opt UCLIBC_BUILD_NOW y
+		use ssp && {
+			set_opt SSP_QUICK_CANARY n
+			set_opt UCLIBC_BUILD_SSP y
+		}
 	else
 		set_opt UCLIBC_BUILD_PIE n
 		set_opt SSP_QUICK_CANARY y