Version bump.

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

3 files changed, 231 insertions, 15 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 0176103320ea..9b480333472a 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.946 2013/08/16 21:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.947 2013/08/16 21:33:12 vapier Exp $
+
+*glibc-2.18 (16 Aug 2013)
+
+  16 Aug 2013; Mike Frysinger <vapier@gentoo.org> +glibc-2.18.ebuild:
+  Version bump.
 
   16 Aug 2013; Mike Frysinger <vapier@gentoo.org> glibc-2.17.ebuild:
   Mark as -alpha so that we know it missing is expected.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ac21b1e88d50..fb6367697790 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -51,6 +51,8 @@ DIST glibc-2.16.0-patches-11.tar.bz2 90997 SHA256 4a1abb359e6e73b36eeb21286780fc
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
 DIST glibc-2.17-patches-7.tar.bz2 79288 SHA256 8000409d072571d2d5119d4dd538e3a3ea39213407e202ea10033bf6aed516af SHA512 c6de4d7754cec6e7a9e36d56eadc6605ba6fcfac116eb50553503738873659977beb935112d361620c35e7b15e86f845a49fd13269ffbf98c72f54dffade19f7 WHIRLPOOL 259e938e8f4ca6b7296db4982748429f00135f80cd03965da589e4318134aeddb5acdfa0f8f61871e46330a0c96eb8e734a3c2f50d564882ba37f13f722b78c5
 DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
+DIST glibc-2.18-patches-1.tar.bz2 75764 SHA256 b09dd2c721f98592b45cb1ab0d5e0508f7b73353ea7e12a36a36eeccfffb00db SHA512 e1d059f1e8d2f26b5fb47b0f57b5eede90e31a67a250f3bfb5e56224eebf8837127121573e2b575ce845e891627a898a6e6c501e1536f9d5578c827f95322333 WHIRLPOOL 5f5b0a53167b53e3d74fe9761c4798b013f33d9f2fb3e04b6cd2477ab9c935057613d316f7c004003d0720c6faa44994addde76dc83a6d3e01a68766b1df5dc4
+DIST glibc-2.18.tar.xz 11150148 SHA256 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3 SHA512 27218d2e7dd3bf3908d7af171c490933680e958c579ebd27b43b661e223fd5de2219cc1cf699170405280808c84de476d0ad86dbba35a488ef404e9438552327 WHIRLPOOL 89b877c7db602ffd4374c7fb84db17397b91f889a7de6259f79374cc3fcd00613114cbb93feb518ef25fb2e579fb03843df15d17235c1fe1b6a7e0e64aa8e8fa
 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
@@ -77,25 +79,26 @@ EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a741
 EBUILD glibc-2.15-r3.ebuild 7696 SHA256 35f0d18bc55a9dc99208c7863e106964b12d3d5dac296f68abc021cb8ab53bb4 SHA512 7da5f054a6838937eaf442414379f2ec73527bd4d24b81d31f292eed3b38ed0f6eb34508da4c3b3ede53688f96d7cf87eef029e3650f8f4df3a5554e6ca93733 WHIRLPOOL 47a0f1ca3b6ae7ab0e2600110e003bba9aa5507b922f3a5a32e9e5f50d05c92a3e4b56d01e18fd71a03c9651d63ceee80a9ac89b3ecf8ffbfe0356ad8f84aaba
 EBUILD glibc-2.16.0.ebuild 7495 SHA256 d498eb21c832602c2711b4fd8607bbb36cbbbcd701405c5f84e2dbbe9ac81774 SHA512 caa429992f3510b4a530fb7d700ba8e67664d5df406ecd198bb7481009e4413cbf9a8f366b77f0e4949670f56dd5e21d7fccee13aa4d13684cfdb8ccf6054aa9 WHIRLPOOL 1f3a56785e164b4d2f8f258bc44b6a324dee3cecd8231b030ac68efdcc007c7cc906519d4f3f3585ed327bc572b8a2ded827afdeed9aaad1b81aeeca915571f7
 EBUILD glibc-2.17.ebuild 6705 SHA256 11738f77464ce530f9e73418047c3ad87ba6c543eb7469c781f0bfb623025107 SHA512 128d6254e7a231a506cd040986974286a5145b68292e4b818d9a85ee381473d40d91a6f4cae1b4d4ae9aefc1b233d66dac0b82a627f472baf715a3beaee66f21 WHIRLPOOL 6a4fcf553ea615050df0e9f20ade9f6fb405cb87b352b3493356a32778df8be485c413158beb59b69874f0d4a22587b3b7bbe1522dae66a87043017825f316c3
+EBUILD glibc-2.18.ebuild 6706 SHA256 8c95d98502b9d750db343788aa81142db566774ce0b7b1623fa33aba785ed573 SHA512 1f0020b6950250acb0c4aecb3fa6147ad5184e0138ed688eb85aa1261f0ac690e971f878489f8a6f568fe071a961139eeadd74a2e5c945a861b8011f1cec90c8 WHIRLPOOL f96fa17ed1e935782725fb18bd53074c6ab0ecab5ef9db95990f690355c840e604a04551e25b0ded9d0516a4373e61b5a046a852a606ffc7877f53ba728649ab
 EBUILD glibc-2.9_p20081201-r3.ebuild 6770 SHA256 87e75b306b69d170c7fd6083c7a40303ea292616a810c3e5302eb13ff72932b8 SHA512 3dc0d6f0b99a1e83caa8a152bb7752b8b504324876bed83657b683c73f8a3432150cb5d3b42aea11d064ee9d1a4d1788dab6c9da11cfc5cf716c214ec145e177 WHIRLPOOL 9fec37815cd88eab81f4452e02e13b96e13b1ad8284b1be7f77213280da54a9de85275cf665307d3920e36c3bc02f6005acd5316f6f2ed3dac5b3b60a80690b0
 EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9
-MISC ChangeLog 59758 SHA256 735edebb481976eea65085ebdbb1793dbf1a36d5b9f82487564b6f0efdcac7cb SHA512 ac8fc84a120e02d2bedb751828868a84f6302296962e70416157187327ae98408ecd1ded73cb2544049a14427722d75a6e4407546231a8e441ac1fbb838afd31 WHIRLPOOL 5f2b16135aff27c75ddfff184ee632ccc55979d5f31fc89ebb702a47c5dc750766a75d37d167146d8dd7f0cb8fa5fd38e8990894fc2268daa6c461f7ed3e904b
+MISC ChangeLog 59872 SHA256 58328697443c3bf0dcb59f43145fd67eca6fe6502e2d2d31f0679dbb377e3289 SHA512 f2250309826d59e4dc84641afdff1424c9340d25459d94910418c22c787d5961ed459e92ba1affb802b73bc0dff113936e408435fb7f0beaafe1b09023342471 WHIRLPOOL 806ecc366fa507715228c3e4cda9a7226b0993784187ae64b2943f09ea6ccdc849bd916ddc58386487272006324b26a0267ae23cf0eb62986d61c55d051a5da8
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSDpn4AAoJELEHsLL7fEFWjgkQALGYmm3NTgeagIYe/qMQH/bG
-aI1MO6OH+25KteRuizd2NwAzXQXhXpm2FW3z2aoF7OtCC9PSO9yT9vKGB3D9IzZn
-riv8VAKF4+kvaEce/F+2icMM5zHQhQdoiXU0/M7qfslhmcY994hdRDku7XBNQaGE
-LjYNXpskMtkcafOvcpSJgjrXrCzlORSwOjmhK507pgfpuayAibV0dINwyZGYb/UV
-qqYT+RRwPthN/rMp+Ka4INVwspatrAvmpB+ZpbLVwjTHWf6kr7VtOJ/YHLkzzpyv
-1QJ2jXufP6PIcP+CCRvWshanCm0BJx6SCIOZNN2Md+Gf7lBN1B/nHyIh9uOqWa0x
-bXTG06W4uA/7saxi5qNoo/tYvwproheteps6yuMamFLCqeRfjXOPT8mLwWrF5JzH
-Dxe1ZPOxJkw5sF1RxrDVAm895CsZmSsq4biEnDtDVfQdD0HLdWxER3fof8fVVFl7
-eThAS0NJXPZbdf9bKT+b4+tExEygRBmqD5d44gfpsPq/ZBI+BCqMb1V3P1QKOKT1
-re+XuYs1TpuT5o59BorZWL2yVL+ziDFKWWIokBCP+s1Ax/wtuV3m7NQ97iU105b0
-Nii5gi4K9oFm2DIwbs4ZUgwShCVlghxEfOg8ni2BDJlJFHBdf0FkBs2MpAy7Tq66
-cmBYqSLy/5i6rqba8kmb
-=sbqW
+iQIcBAEBCAAGBQJSDpqeAAoJELEHsLL7fEFWIDsP/0BWD5yl4rrlb7YApj9y/SC0
+PaqePif0GH5dUHA7RvraGVCnuq5zLYf9ZC26QZPzeaH3LdsJjsGnOtnTwX3Rvnka
+1bztNBjk0XyDatQUkE1Eqab74emSlhfh3PJRltzc78LsDbiYuI8Y2tDCqrzI0em+
+3oSXWwCePs1gKV6nTpxc45QFmyj7bY6afLBAg8jgumPyRp2iTZl6v7Eh6CN6mv8z
+vSu1dpk0uRaecUnf6mS+4Zp2mWXhPdn4yArH0+A6yBbl8TlUhFgih7Gt0UbqL/rh
+eNtUj9xU5A0XFQd6DN/zF/VEhsDs5gm2DJyDnT9rEK/GGCZsu7fWAqaVQRK+fYRO
+F1PIDu13eSuCwpKtVI5W71ctehyoNTnyt2EqG2QeE51k2GjQ8iB7+CS8XeSbGuE3
+Whlq/rA+lmVjlPgxKOWg1gAg6/9tS3DBwjhjU2TR7NQGY8w0KfNH6RYGXOIwIXPb
+GzDS0gB3UhxD5VrTTll2U5/ghvUFfFanMLT8KfetTr60DPveWlRiRiQuAWITZXsd
+RCJ1MItUaUfLZVSFG9bUr82xhdi1WqHsFAW9BjmeOD7iWLRuYxYBsbhk4BvxgTGW
+Mh2xch62Ww8jO0+XvGQz+WBtMuf0xSWhUAka4mXxl3IyngPQZKqnmQsnGVP3BdLD
+As7g9dhIbQqhL7pYd+l/
+=9Ssu
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.18.ebuild b/sys-libs/glibc/glibc-2.18.ebuild
new file mode 100644
index 000000000000..198b31d4787c
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.18.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18.ebuild,v 1.1 2013/08/16 21:33:12 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.1+ BSD HPND ISC inner-net rc PCRE"
+#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 nscd selinux systemtap profile suid 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://sourceware.org/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-pre() {
+	GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912
+}
+
+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.17/glibc-2.17-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
+}