Version bump.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 232 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 8d23aca0cd0d..5f93519ccf34 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,11 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.909 2012/12/25 20:08:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.910 2012/12/25 21:48:13 vapier Exp $
+
+*glibc-2.17 (25 Dec 2012)
+
+  25 Dec 2012; Mike Frysinger <vapier@gentoo.org> +glibc-2.17.ebuild,
+  glibc-9999.ebuild:
+  Version bump.
 
   25 Dec 2012; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_compile.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f17ce63ca894..2659e4a81865 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -48,6 +48,8 @@ DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38
 DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
 DIST glibc-2.16.0-patches-8.tar.bz2 88635 SHA256 3dc60b033be747320e06d2cbe938beccfe5a781636d2285642066e42757475fa SHA512 c0d772492bd491633a6c84735f8efb4d0f3a3cc54a3eebe38cc7c75179fc69f9355ebe2b12746ece4db688980388a8df26c4bf9f814e4a598a1c5de1ce31670d WHIRLPOOL 3dae9f63fece0046becdf7044b6a2b39857363eb96fc31d6d239b664b0f03ea2d4903dabd6a2b6f671e9ff98fb65be67ddea29c8e69e56f4eea6dc3694433f86
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
+DIST glibc-2.17-patches-1.tar.bz2 72925 SHA256 c8997b0c2b9b0a4c54614ead03681a6607b66ff9a35077b139dae66af92bbd7e SHA512 99b11717fa309f7b215c8a7c4e397910585ad4627c4605da031742de600d7f16eef17ff1fd81b5bca03ae450c131bdeb3a38e6c8a367ef836c4cd66fb34591b9 WHIRLPOOL 8a0e20f74cad80c2f97b155cb98649cbe898d09e455b55f569eea5c29159f3cf6cdc2d97854231bfba7bf43f1a4fd09131a24c5525164583e838dde293850fe9
+DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
 DIST glibc-2.9-20081201.tar.bz2 16430489 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6 SHA512 bdd3f5b61f741f09da21020ceef95e8e4f22574d11f8f2341f573ab2225baaf68698446ec26cbc4a63a21a8a400eaf5820fce4bd89c3e1dcf52172a62df561f4 WHIRLPOOL 37e4875e450e8a4067f657b4d71be184844cd45c0d7dbd9242e8f998aab4e15c732fc64ba148c5782078873182d4b132c911da9242b0513eea96a2338aa04722
 DIST glibc-2.9-patches-8.tar.bz2 106638 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c SHA512 f5070bf45c28bcf455f53bee85414e6efa1da3cdbc51425a1bc67fb92ff793d1416d5743a48e69080e636d80e41463c5897d437190d496c0b34f7dcf158e8d9c WHIRLPOOL f15b98a7bd6a8cbfaa9c6e1ad7204de875876bf1640c2a008532537cf65b811b42c45446dba846f6e572e9d763cb6afbe878920a51f772c7367cc7a6f615f4b7
 DIST glibc-2.9-ports-20081201.tar.bz2 487663 SHA256 19bb6e89855171d7ae01aef92054dfe4524521fbc13c67bfaa3ee81944210744 SHA512 8bc400fe1f8213908c96fa8c1060a360c4ed83fdb21ba6ffb7b6dc0232216ea23217d0c165336603a8969cca89e8b3edc7d32a38516f2c27114368682d06e6b6 WHIRLPOOL 917d6b77a3d999cb7eca7c9b8bb8d6838a109c609ef8bd3aabb3afa04755c142e4dde352c5c62561a8b39581295eb48b23192b52d1d9f1916454c4cf39db702d
@@ -73,25 +75,26 @@ EBUILD glibc-2.15-r1.ebuild 8424 SHA256 edb4f7bc8cd74932b2fac8de0b0bc443f65ac444
 EBUILD glibc-2.15-r2.ebuild 7973 SHA256 a18a1a3912c994995010860a0bcd5e08fb58ad04e04fe0a0c74866fcbd89cf8f SHA512 a4d66311bf59b2568950d4f3a24e215347c7dc0ebc726bb5b3afd0a20c1068f72b1719195d3112c7619bf4e8345a61ecce96eee57832589854b377ad3afd1619 WHIRLPOOL e7106b12d58b1c77e7861addffa46a7c4ce134aa17373dc87f1b806dfa9bca369ffaeffe07b1991d4e4b1fea5307f52ec88077d5dec9e730c8599a8391e4af42
 EBUILD glibc-2.15-r3.ebuild 7978 SHA256 a8b190ff718372c1e0e84dba9cc2131bb7109bb30cf537fc5ce9ea08ba84adc3 SHA512 234eed1321220d0f0b494a436fbd475b8a4e577c1d4c855b0cfee60c092c412f03aac603f12db2b2b473f8f41bdbfd0082ffbc7a22a7bce6e3388352f347dd8c WHIRLPOOL a0f2226bad463249bb0227f8a884f4c9eb7e9d2db9e2604b970f58ba6cf17dae81c9062676f4439e7b1187f50c3a048e7b8f250cd0ec04862eb3514766a4d01d
 EBUILD glibc-2.16.0.ebuild 7777 SHA256 d9a7cf84d0da519e85483efdd922bb23831aaee3189d7db7e8c302be8092fca0 SHA512 214ea5da595cea086b4e8449affcf21a99f5c0c625cebef03b7cc9c41e57e1529663e7e5bfe9b350477a77d562b17db2e1b4fa8fd2367888670eb9a9e5e8c1b5 WHIRLPOOL 177521e88cdf1fa7f583830723033e109892657b8f3c2e2d839994608640a1b8408107da72d20c15fe4505971f0b241584a4cf85dd3374aade291b9b50951e5b
+EBUILD glibc-2.17.ebuild 6578 SHA256 3ea11c6e3bd321dc4ceabb2e6ad34c4676cf45199e111dae087f6b9d37a68fbe SHA512 9fca50721f8cb68c4526aeb8baeecdb17c22b1c1f6e1cf69414871730fa5cecc8bd231d1f59c6fe0254086958872fc51663f1e996bb36f8a4802cd1c61b8b997 WHIRLPOOL 5f74a786fe61bf2d6f306ded4edb87cd4f7c79d1738be0d7db31ba45b87320c5f1e607f1f785556017d38f6d688d93eeb5e89213ea62663df3197bf8671f3ab9
 EBUILD glibc-2.9_p20081201-r3.ebuild 7057 SHA256 f3b5387b76cc73f1af5af72b2b301bfd78774cc352572c1d824d3d9424c39e81 SHA512 d4c9396a6c62c5f76b92120788bff5b74cea5e2750d5e4306fdd1fde2039e8963eee429ad7a2be37681ef4b53b1b30effeab485f506bffc75d549536a7702292 WHIRLPOOL 2d403f60e15c7a508dbe240de1ba7682b5cb104c7d081ffda05eeff4c96877e6a8d291bc6dd9aae39752ac35685c44c09be81854ab1ad1b9a2aaf27685170e06
-EBUILD glibc-9999.ebuild 6555 SHA256 98b8a8e43682c3efd5d9ff6153d23c6d94bd163154a0dc984133d618bfdc037e SHA512 659ac9fa22d214b360cd8124a0af59fa7ad1ab5fecba529e7c0cfc2704de447c56bd7e63856f6d60805c015f86ee467f365c952ae92f7bca402509d1a25f44fc WHIRLPOOL 9cae2e03e5d5c16d99016b4848708f4c5e89934e5cce4268350132d5b94725af6d1d597ccabf156169010e02e42e65c230da4a99f3a64a190f3193e3d92d8512
-MISC ChangeLog 52832 SHA256 621c1b33142374f534f54956d046a5f640413ff97dfe543c0f9308b5e3fb38ec SHA512 453744a22326fbad6cbb241f3221995d16c96e31fd41c866fef69fc735e6503db6e7f57aa734ec0b16beb398caac613dd47af8832bb7d9d7f1d4180513b863e8 WHIRLPOOL 8eb5c4e86b2d90f5fa6dee43fbab2bce16ab4a77293bc26e03bcf1b6346e767ddca7f72c920e49f98341f3fdd87d532ee8b00933682150485364b6003525d5fb
+EBUILD glibc-9999.ebuild 6579 SHA256 dede0348d5973356cb704ac9c5c23c9ccfe9fef3cc873ff031802048ffcf1ebb SHA512 278fdddd26982feb33e053b24ad1daf11f077d2453bf7db98d3620269eae3abe363434041f64b57d22853d67aafdab3de07ee8167a20a7a6ea91d19881d7ec82 WHIRLPOOL 788958819b71524b79995acd6253fdd974463a2bad55bf75cd334619ebe87ba8d5074e86375bc45ae95e8f68f3dd98030b566234a205d560dcfcd1473000db96
+MISC ChangeLog 52967 SHA256 70593019d04b74582c1b7bec4086f4fbf6035b0d963355fa8382719921fcc381 SHA512 b50b9864f46deec234f17f6c5a3b8f9903751550c8e4ee2e77467d54d153506755f24c904b37eb384bb113990513751d92b745b0f21354612f0cbb0f1a6a13c4 WHIRLPOOL 3cfc51172bbaf26923586ea1c077a915a7f6fb34ae86c326e9ddca82815c6c1eff62cc2303d924a7b30048aff89fdc043286035c4e369b86902a4b0d901370cd
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 406 SHA256 e6cbc11651d304035d704081701900a8b373ee3a0ed2f3f4a7e3f3a8d926a731 SHA512 3afe4ea0be7d1707571c23a7aae8490620a83d748ad672a18ce602503f37179cfc12d3bed0c18398c2cc8e74005d2c51ac320fd1722364e5df2cb3599488c164 WHIRLPOOL 1c3f5e0cc851c976259c6749f6a611d6cf415a063b2229e65ae9dea80e623a52514acbf977b3e439009379c4ea9aa491e6c423c7aac70a1c8fd573c4f40816dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ2gf0AAoJELEHsLL7fEFW66AP/1hrIdeFX89U/z79Aguqj+pg
-UHgBuRIiKdFxfeWAC7qwXm0nz+1nJueAtIRcQj1SqTmTssMZswJKiBAsAiLpVzfI
-S2Nq+rYeIsaC9Zk1jsr6Oi8ZHuK6s8RRvj71fp5R2FGewllKEt7oKaJhahAvcWQv
-KEOyTHUoKhBUEEHPzkOTwl1V261pwWtHB7rgHqompIt7ZjtNcNcqdRUm5pGXp97Q
-AD5t9vj6QS4ESvySiWwJGheg7N9Z/IZ0FplCy5F3jtxNqbafMllhkybw2rbEPS59
-XDtewdJCeiEExb+qn8UTNZDjTgqntzaKceOVIZZl6kWWMsGv1qcXEnW59eeLw/7D
-JA3ydjdhrvPiMOrg+eR93dmIAtfFltABni+DZGJEZ3qfWP4pRHdXOb6Yu9bEf9/H
-L0sPSJhpMUBKlw2JqS3vg3FN5nXTJIBHgGU5UkUX5/EypFCmNPEYS8JuWug9OEvo
-7PfTejg8tQUAjwCVg5ySQp1CO3zFmYCpZZwdke6zxrP+8tqGWjSrMqC17PL8tHKP
-f2oro9oUrtqhfzypxUOIEeiCTEardoRj32jSe7YJND/ej6XdNVoDeIp8yvJkMB09
-dLwUdahuSor48lQMrbGxqL3vNpZ23DCMyt2CAkAOWv56iXHQu+bxOy54hne48U1V
-sDwvlmbmfzMdb2qCDza+
-=YkUR
+iQIcBAEBCAAGBQJQ2h9LAAoJELEHsLL7fEFWnnwP/AodsCfro+2P1SI5+TN1nJ+g
+BG+cJTMEfwu8296M+LSZG2oQsRfr9leqRw0+IgwcPrhM4KHm9lZaVQZwD/Wmx/M0
+p8YNqfO0uZY/eT11BK197RRvVK3C8pRAVadm6pGVXujdPGvMJuI2A/Ey4KrnDVXd
+FwIY24eRT4n18LSVgz2cnNdliRTFDKSwupCpRUS4/KkaTrgrDD2VDt4/8NDv1iO9
+d3NC1tPzqk+OqXHFGL/PIWpxd2PCm2sDyPCWACUQX+hCzd3ZIJI3FD4BbvG9EMGs
++ROtOJMHeFrAfnJVierLlJiHyfWwsmHE43AcYXcOhc4/olCGX5nqnBM+9vqKJEqG
+NSSkPFoiPFbvBMqhtqab0y5nMJAF+A5CH16l2XRbny1PninNaOjEbgow8lL4z9jn
+D4C7SmjxzOm9fj4c7GENUvOZ7RrOm4VYyxJ/bdubYu4EVXmWjIB+3pIIIMUzQvXU
+o8Ax1iSrLchyXaMcLduaOjr74HlHB2ss97KOanNi6e9Fh0s3OPpQ8JRAzKltgxY4
+n8q8HAkqkd3MbLTbG5YwJORJbf7Ao0mkfUWC2t5AwbIE5LUQ0yQDVaas1i89s0kQ
+qrOoAm+KcDD7Ev5IpoI6LCpfDB52L7JKh0kOV6Rasem8mYJvgMQ7JpqUlQhEYqmn
+Arl4VCQFZOzDKEYQdcdV
+=D/cM
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
new file mode 100644
index 000000000000..b3504014415c
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.1 2012/12/25 21:48:13 vapier Exp $
+
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2"
+#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+PATCH_VER="1"                                  # Gentoo patchset
+NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.20
+		>=${CATEGORY}/gcc-4.3
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.20
+		>=sys-devel/gcc-4.3
+		virtual/os-headers
+		!vanilla? ( >=sys-libs/timezone-data-2012c )"
+	RDEPEND+="
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
+fi
+
+SRC_URI=$(
+	upstream_uris() {
+		echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+	}
+	gentoo_uris() {
+		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+		devspace=${devspace//HTTP/http://dev.gentoo.org/}
+		echo mirror://gentoo/$1 ${devspace//URI/$1}
+	}
+
+	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
+	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
+)
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()  { eblit-run src_unpack  ; }
+src_compile() { eblit-run src_compile ; }
+src_test()    { eblit-run src_test    ; }
+src_install() { eblit-run src_install ; }
+
+# FILESDIR might not be available during binpkg install
+for x in setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-post() {
+	if use hardened ; then
+		cd "${S}"
+		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
+			debug/stack_chk_fail.c || die
+		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
+			debug/chk_fail.c || die
+
+		if use debug ; then
+			# When using Hardened Gentoo stack handler, have smashes dump core for
+			# analysis - debug only, as core could be an information leak
+			# (paranoia).
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug stack handler"
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug fortify handler"
+		fi
+
+		# Build nscd with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			nscd/Makefile \
+			|| die "Failed to ensure nscd builds with ssp-all"
+	fi
+}
+
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index ba5a8655424d..8ea272aa2872 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.16 2012/11/02 18:25:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.17 2012/12/25 21:48:13 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -155,7 +155,7 @@ eblit-src_unpack-post() {
 	if use hardened ; then
 		cd "${S}"
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
+		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch