Add fix from upstream for arm ld.so.cache lib tags #454200.

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

3 files changed, 22 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index ed1156136ae0..7242b8fb09f0 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,8 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.936 2013/04/11 20:42:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.937 2013/04/28 04:00:36 vapier Exp $
+
+  28 Apr 2013; Mike Frysinger <vapier@gentoo.org> glibc-2.17.ebuild:
+  Add fix from upstream for arm ld.so.cache lib tags #454200.
 
   11 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/eblits/src_test.eblit:
   Fix return code checking in src_test for both multilib & non-multilib builds
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 26ccd6efa9e6..8d93305766ef 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -49,7 +49,7 @@ 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-10.tar.bz2 90450 SHA256 e9a9562706374afa9e94ad10231fa850944e4e8fcc19b3a26f3e8ca4fb2a5f3a SHA512 7eaf47f50f100cce752fd1b0d91c9bd2054ab8896554360020f90987e001eab698e694cc1ba6d0a8a139d4e5b1e1957142e2a561953112cae44965c90651663e WHIRLPOOL 8000b269702d8ab6d9c089c8eb0b32adabc66033852d909848b17304fd727cf51c1ada02e626dbe7b04ba159751f3e416eb3d65546a55256a29c086a5270bd29
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
-DIST glibc-2.17-patches-4.tar.bz2 74423 SHA256 1afd742b43b37e4c7ddbec43a30dbe42a89a89f9fdf6d799877701f7e5f17d0d SHA512 daeb27be955dda211c8f2794ddb3621297ee82dc1ead8ec6d477ddf5d86b1a827ce0ad723178fa5fb7bd487cc03e04e199389102da86325658dbaf92a06a78a6 WHIRLPOOL bcc068c3ba4beea8c23cad4f2eb31561f0d8d0ecbbecdc5a5ad172f3a01190ffe187bd2c7d2fbb52b252096b397e841c384458f0b6303850de60d1fe2e99c1a3
+DIST glibc-2.17-patches-5.tar.bz2 75674 SHA256 ad1735cb97c0bb91a59475e564746a0fdb12472f4f5d568de26a8cd304ae100f SHA512 48bb9952cc4ff346383540610fd6617edf0582893c10c11cc70080b8923d820ffda6f68a68595adbf3d67ca4b721720375205878be2d849313d8a82790371ace WHIRLPOOL ff720ed0fe9a740301eb680abbdb74a554a351ae3b41684a644eb6da8592a31c579eb633c269ce6737861d7b888ae62c5334e0e23858653bd2f09a53cbb3a6d2
 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
@@ -76,26 +76,26 @@ EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8
 EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479
 EBUILD glibc-2.15-r3.ebuild 7697 SHA256 09c5b741b986c7cc7bab1dba379452cf069f1d18b32969933f9d0d01d3e04cad SHA512 0c0f5f7eb02dff9180f3c245db1bcbc8f082dc7bf23434557a5b236dd554563586d3cffbadaa4bff915bfd04af772ec051bdf7691a6d843b0e6c4770c6811c87 WHIRLPOOL 44116fd0bad0f2672ab4e22e681e9ad9c5ca2e38a6157365add3ffe61f0d0220c1201d7f57dff356f49b5db2f43ae0cbb60c6d6b253b69aa358a4d8227b5824f
 EBUILD glibc-2.16.0.ebuild 7495 SHA256 3b9bbb21f548a2d53eadbaae9313d67eb324c75489b560726d9bd002da8ecd72 SHA512 6218c4d725afa0f26a6f89e947a54f48c44b48d00c12c390c42fe402dc1ac9bcc221f9bf13f50a6ae1cae40e5101e756ab05795d571f5ec549ea432fb51167fd WHIRLPOOL a84fca43836ddd7b3fb2a1b5cd2674b20c6f5d2012be3e2dd502137da85c35a63fa4c11bce668cb216c002aada79e2a5cdac0791e6c2ae2ddc5fc461e09a16f9
-EBUILD glibc-2.17.ebuild 6706 SHA256 2a1437296f2004bc485ab3aa175bfe1791b6fa123db95be69bdeb4d333243aac SHA512 d89d0811b05e1f4dd19b10057d995a1df9588e0c0bc395d2413cdc98e2a6612b5d0d42c850e2bbc257cc665474f4352e9561c3b8b5077edd555fdf98653d84ed WHIRLPOOL 89b0b87e04e2a525008e471348c83294921b5f13aee4dd62cbebf1c109e9a34727817bccf3f0fc2e6537e12ef760728ee4cd136da96fb84c12853021919bdf6d
+EBUILD glibc-2.17.ebuild 6706 SHA256 bd418c0da24d9c944a68f3f3a5272b0302875c159c499fee480b82168f24118a SHA512 9c29c42cc21a88bc403cab973cc6072976f4af79b3a3b46f7daef99e16469afe27ca727cb9ec58db86ad9961fa50c8e3f6244d8ab4c95b91de05f5f236949056 WHIRLPOOL 156de401156ecf482e462ff0fd94616a4a3df653a3c872e424ddae9dd2db7f5c0e9adf5a529685b06d9f9302de3b779234a56211337517708318874481ffd35b
 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 58263 SHA256 9aaeeaaef867b682e9395ed6198aa664ffb9b63a970f6703775c6a8ef28a03f7 SHA512 66da744d515bd9c96dbc0a8cfb90d6235aa72a0913c4ad40cda0db1846d60b9e85e8d25d590e78631ad2be7b6482adead785cee6d8eefdb95be644cf246193cd WHIRLPOOL fe65869ac0d44073fee90cdffb593899b58b7272572753a9e4454594a99489d7f055c4b93f3448481c7654ba8f6723361a0a1fbc5725b0fe3807e639e3919d52
+MISC ChangeLog 58395 SHA256 eae4abad738983207566c6d3a2bb36d9d7710385e07334c889145a8805c8a682 SHA512 6b0b942374016a1d1952262cc3173bf2816e1139ebc6fd9695af80d31272e26c2b791bd4837227a4e31ca26e8ce9f8779b665bbf3c3b1501021bbfff14f41a96 WHIRLPOOL 134d9c6be418800ee4d187ee89a9587b71e7e81312e6c451375b8425a567a3f08d409f06bb6aa3331416734c9ad30e5605ba0b2d301667947ac3ac5e979e21ac
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 622 SHA256 294041e034f6834a6660836d0863124713976e0f0a961673b3d07dbff3aba3dc SHA512 a86a5725e9ada64444f4c0b157d8b8237c45e3fe9ae1f7bf0a566076b9dd3f442caa41c41c710983d777d0f8f94e601d604d074bbea6d3f79c1cf9d15a623fa5 WHIRLPOOL 348ec1f0dccf48aed897acd9352cc6b933208036e62cec8511d0883bdb18a7ddd2765b1224891b2eb6ae6259d082280b95d3ed7e754347dfd1286f2d94f8d004
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZyClAAoJELEHsLL7fEFWMnoQAJGKRo2bJRLHF9WWRLf/BkpB
-JVH8hee66O4bfBjHlW5QS+XlcsiiZzNdMiEKxY27gLIIBhC0o8UE9R1+nG5JB7QX
-W3+S42bW38I0peYYZCS4YAONxfu6KjNTk7CKxtHQR7GG5hcnb3qoXlJDmOY3mUIp
-7sFOiSkTNhyK+Ip7acEiVZdnqKPgXDfpakItj/UmRS2ciQCGMPqSpoSON6Ws2laH
-QjhGu3aaB6Rkcd6k1tIxYy09hGSSi1mrdSLqLjQbXrScD97Bi5sV21aF2zxnpJQZ
-46KuYpW6wyiLPRdQIUlN/lkMlVMi8cqHR7WiNPoimEYe+gd4BNoZdUEdFf9+cJOF
-4lon+mNh/pkd4G1GduqKkqCv3UhRs610VZgwuHyV6PK5e5BBK/mel/VHJHoDmLbL
-rus9KvsTMyslchKAnB3do56SAkJN/+BpBgn4Ix+0ixOE4Yi2K90MxkCXxQLwmgsR
-QRhs/n3pNTLFr3NZGcmynKO+IehoMjBp7BWRvaaCo7nTkeJoq1l/XdufNN0fbMET
-uyWEJ9lj7eRtdL1nUILiFZrcXsS7377plgel4AzfdCwG9YKbQtOFRcvsygK9XSaX
-oBymioB/q/BL+YBi2bynZ3dZE3g1yYqNYWX72Uk0diqHUsP/ZwXCpxU6YCRQIQde
-wzBWI8U8vFlDbd7+tlja
-=F2Yl
+iQIcBAEBCAAGBQJRfJ7qAAoJELEHsLL7fEFWFqcP/A4YFNFKuEGOEzCei3E/Gyd4
+ALjlkhGoc0IsQVpG3+aHfmaprqPJ6J2uKqrLKIZFJdcepn12zMM8p6cAxigep+iG
+OgifF+uKz48eLVNSCfyaw5SedV4ouV5if9+uJMuWysrx9rjqIKwH+tYFhFj+TcxJ
+uLPQHq8XPbmvIjMNGPjgC+UxWaCpymczcMd8RA7xfcfRG5eNxMzwouPZgEb+HTZ7
+jDVIbHsbIQutwinmvGnDwAoR51Z0bgRjD31hth5vFo8kxbZjgLG1egLaKdgQ1hMo
+zaQQ25ullS8Dj8ksAadMOylSGmvIH9ezOZyz2SpZtmJwpzQ+EBxg81d2jjQMN+ww
+VD2nUTnw+tI9hLsxoSZjul2l9Oq7BemPnDUen+oSR/OFPrcFcVq7R5rLjRprrwCJ
+8yckN0cIMeACjlabj5k80XmIp1aWGFiIYeAp7TEhSfMjvzPHh+nw+Ez8BtwyvTLp
+6E0+cstacHD+sNvNuAZAvrZh1/HOnPFaKTL+9ocYPNs9ZU8E7O+4xmCz3XSgNLIn
+gHsvD7YJFEu19Z6F9Pv+8AZHKB1Ui2kiUN1U4fWjKG0h3dEcvyZtB2pQ+sgIqgK3
+v0veSBm0zZWdmlej72ZWbmeAOGaV6hf0pVRXF9oNjwxJ5Il+spcYDeoFppCOL0DK
+QZGpNcyCBpJvN5IYPGMU
+=j1Vi
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index 36b376d187dd..feeb20180d71 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,6 +1,6 @@
 # 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.17.ebuild,v 1.12 2013/04/10 16:40:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.13 2013/04/28 04:00:36 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -24,7 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
-PATCH_VER="4"                                  # Gentoo patchset
+PATCH_VER="5"                                  # 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"