Add fix from upstream for x32 malloc failures #394175.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

3 files changed, 22 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 15d0e060d522..99af7cf7ece8 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.890 2012/09/15 23:13:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.891 2012/09/25 01:03:18 vapier Exp $
+
+  25 Sep 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild:
+  Add fix from upstream for x32 malloc failures #394175.
 
   15 Sep 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild:
   Drop PaX patch as it doesn't seem to be needed anymore #431810.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 793efcfe8012..420db166a9e0 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,7 +44,7 @@ DIST glibc-2.14.tar.bz2 15630590 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250
 DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53 SHA512 ceec0506e10cff25ec9acce3d4e3f174d56a7cbb00993cb8edbf532f303c48e3b2d5e965e4470f537dbed23d14a29bae4ac4c834b4c11fcd27d8e66d8500e4c6 WHIRLPOOL 9dadbcd8626df9938b6b215a0618cbc605405bf56bb143f25e029c0aa00d5d6ac75877c7b2fd2a2c22291f62587cf8011c30d32baafb5ed0dd2bb539895f1c54
 DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441
 DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
-DIST glibc-2.16.0-patches-4.tar.bz2 83474 SHA256 ebb2571936481593c21bbc1a38c1a5b2f8346e54904914dd4c7d42743bad5b05 SHA512 f3f3ff1d3790644f8d085261f3339bef1fa00f51b4a36d6ca62f1c823a17e18dab3eb03d409fcc0d60b62a833d6a327d32c5b9407caba5841a9dcb12fd75cfe0 WHIRLPOOL ec43e2765e60e47b42e7870136800e2fef0adf5ec48b4990195f691f7e9877274efde91c0c9294b40becd86c8c064d6258523a3f265f6ce5a66cf45494e66bb7
+DIST glibc-2.16.0-patches-5.tar.bz2 84169 SHA256 f843b50d94ec9e5bc28a1a8bb1b647e9aac69a374998f79886f66710ed800031 SHA512 21fa17d03b473ad7e4c4bc6792b857ee28433f596c35de91f61b40f6b478bbccc4f0bb9ddb84fd49549a8a3968c68f798542b4a4bf1cb7ca9b49cfb93561722b WHIRLPOOL 051f46689835318e1e86c78a60cdf3fc304eda88fa9d76c23bf3cfacc5d45f527810e3dd22dae013320e104f0ae90a4c9b18f72e72dc8b15b1370393aca58976
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
 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
@@ -69,26 +69,26 @@ EBUILD glibc-2.14.1-r3.ebuild 8800 SHA256 11223e8580f0a5e2d8165052f2383301b52404
 EBUILD glibc-2.14.ebuild 8697 SHA256 2ee2530c8d5d2e1740c74f1f4451ab5dd496d22189939932d7bd2cd88a8828b6 SHA512 7047e2e7468a9d6665f0c69bcfee9ae9230cc8a3b9d8a3be1c8c687ea5fc60d8300565a4422c39118821a275d54e6958b7db421eb9987def0e278e5e714b9d4f WHIRLPOOL 696e79918caaa989f19a6edbb5d19f8e463e3f6606b53deea3fe8a8a69e0c60f9dd75d0dd984d666a7e5ea7d58bbab95a5f71af1a8b128c9cc0f6a4275c9ccbb
 EBUILD glibc-2.15-r1.ebuild 8432 SHA256 a340303d7010a810403edacc97119110c3a0dca97e938f6b8459899aa6b79c18 SHA512 75b7bfcf488845fe3467fad65bd273e96f0e2933401ec37583066f0590c1fa15001d1046b031e227d2a72dfe3e019066f4380f66a82516b9dc1eb23ed4b626cd WHIRLPOOL 628f24edd2285f31f250047ac657acee76bf7f036db19519d290aa0bf057f31968cd534e9d7b0290f6b81d578529874a5ba537e6701fbf8c99190f4094dc92cc
 EBUILD glibc-2.15-r2.ebuild 7984 SHA256 4ea6615a88c108a79e3b9eb3aa68bd43290f37dfd2e79f2664422fb2200a0758 SHA512 7ce61550dce3ca86befe59fe14da1b7c58a8b7e9bb25342eaff74bf78c235d8cd1ff651f4e503b6859da0bba4681d004003aba938680a1d41241efa5d00d8b3c WHIRLPOOL d9a136a48db617e27d0209b4e0e7d3ec116f1d45b2f5cdaa0e477d08ccab16caefefff1579b54f0196446ffa45b3b1d7a9658239f1bba67529ebe5fbee3739a4
-EBUILD glibc-2.16.0.ebuild 7773 SHA256 39750e8f0371f5296661a821f2157d69ebdf92432ef1ca326f0a70b2d3f3fdd9 SHA512 f78efefbadb1b3f72a8a5b7a2ded16572e99f5b36b5a0cc5835bb6ea7153ee18c9a4412885f25b85e7a84ca5a0f829c8e35d249750295084f9135d655216a9a5 WHIRLPOOL 44193a3e5d75c4c0254295d489a722750d6cc590b5fcee9913e9029f2601ca1fafc80584556830b183e4eab637a1c2fe43f4628765f373fb4e56da4a9c43bbd0
+EBUILD glibc-2.16.0.ebuild 7774 SHA256 a235772cb8ea9447ebd8980b79082654168a46ba54ef65ea7b0a025dc2200473 SHA512 18ff0218185ea867fc31a90133a3f240b5ff3d9c4767bd2ddd02e1f5a520c5e6b8012d68c37d4e24066cb66757f55411c93d2966cdbd832850c28b8ccd6af23b WHIRLPOOL a87ed7a708ed9d5f7d26694f29e57a9786ec256dfc1f5806b19ef413a3c01da13fa31f17617f03ef24775eedd446d8c953f4718157af674de463151b64ca5990
 EBUILD glibc-2.9_p20081201-r3.ebuild 7065 SHA256 72f88d32a5a6046bd14c98c927f21dd736f6aea400f3be4b0ef1aed98dda4ed4 SHA512 486a0bb8f6a255b5ec343f30190b08ae43316ea5baa0b16b133092457f86419e41076ccedea0dc60b27aaefde7c166db4e1a499e73c098f4ba18287633b6f6a0 WHIRLPOOL 0aa9955a865d1d2a5a6c54f9eb50fee4e352a8a9de50fc9c33e3cf25a0c5e3c6c7ddd078f76803f4df1af87217274458cec47e3697a2bdd5dbfe450b88f1ad48
 EBUILD glibc-9999.ebuild 6563 SHA256 a9b81ef5e8bfe3e1fcff66126aef1fa99eaa7b3f4b5c73eab6d1ed4758804ef8 SHA512 6f05f2f5941a4f66079f0470a91fb8fd95ae444a60991f2baf4c34afe1d648ab7be820bf8e26e36e66f42b072898c7afe5025640fb9efbb78d83c9d5f9ce95ae WHIRLPOOL 906562f43794e92329c3b793608b23ee307853e222063a321de629ccce0fbdb75f6ca8ee3d2dab60e242a7b723e2c4d6b86d2f1a3926103a3e49ad538ea34013
-MISC ChangeLog 49957 SHA256 7cb108af40df117744f219ca0e8a0bce507d4c3c015f85af5824f539c3869975 SHA512 fce34a01d890424d177c393d33fc774a41532a225ccb1e3eba3e5402583ea9b928d4ad1a0ce2d3b7cde3934163485e2640a94b453645d016759105965f559cc2 WHIRLPOOL 0862a4470063d6493b81157ed218afbaedb9fca72183c028df39ad5cf091e8049f084939085d4dc17c505e0b658299bfdfcd31ff6593e3956dead8abafc94eb4
+MISC ChangeLog 50086 SHA256 cf9de1d78a2d7f3b3317451c1d02bd440329712971ad56fbd04fcbc260eede59 SHA512 00b8b71c1223e9f0c41ad133fba46985159867ff10c8e46db26fb874e8e26daceb18e2fedffffe347edbd8ea790b1efdc4f070515ef63e540fb4ad836f5136f1 WHIRLPOOL fb89f9fc453b0710da7a3ac4d6f2dbab8651715dbd2c724d34aa6d0c0fb003419f9b8b19e36ee9c021c0bcc6daf7dc4b5a9310f8f7d51bf3af2c490d8a2fb8e9
 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)
 
-iQIcBAEBCAAGBQJQVQuFAAoJELEHsLL7fEFWROIP/3ZCo9TXrX+YSdGj0slckMm+
-sF/b+edpbYu14rdQHs/hWkX54s66SZo5qvJSF4SDW0pK//5lQ4kt7pnMZz/jL2pA
-rpBtiouOud785oV8dhJdiT+fluRvqCZewf+LixMyLBEUhj7ngOjyR6pZW3hgRJJT
-QPpmCqCwL6msSepi3dmleHidbRb4/XxTD/HGKxZw8QsaHFJoXeQhR2e3v8lIZJ4S
-43pXZglwD0vM/9OrzXTEOopasKDV0Re/x1v+zJ4m3KRUdR2PVkFXnagSeageoIok
-HHnIepb2N1BElQkXRyGNN2c8dAtOMssVgZgdwUCkgtE3+NmMN6lFWyPncSK1gbcX
-kx4pL7XyrBvnn6Tz+7hkcW/96h+xgZTCF4swBxcoITVgpZk7SBld2+uepyu7oH24
-ksTyYPVRO6o9cA0F2u50dXkByyPEuIp50B5le4ot7tdykBKyOw1G8DqKOlE2o4Q7
-CqtWjoskFytFP7M4geuX8l3PfHI7Sq1Mwnco8+W8tGnUyfPHdkl3q7ztM7aQC0Fb
-k5YB2HY+Eib7YL1UG/r7XQWa9XQW7pJq2pzAXmbv2KqWO3oQFTvE43tzSaF2C9cg
-W9eZNv+VqTolIBf7ct3boPnX/ylwSI/qJaRkKXtaZN3vV5AYkhzAkPvW/+W+nPHK
-RVTA1DuzEHbRNli5Y5fv
-=nnUZ
+iQIcBAEBCAAGBQJQYQLgAAoJELEHsLL7fEFWdP0QAKA/FfC5N5LFGhFR332y6cfG
+alpJvMUx4o5ORe0jvO6JuLWhS0nHPwY990TKurJ2/YdcDyHIRb4e4f3i5fhDaTfT
+EN6n8Dkb0nJmNxa5TvYPTlSZMeqG6ihxXyn4WI/13C70JbjQ41Otf2mKpp/azPIE
+6gCH7L1aOizF99RLUrS38uH4qjTrdDCpJKgZa+/oATEbR/yWB+lhqCcLX9az7EVA
+fEooFbWKfsYmRS2KVWdWZcryKTAJzhrKUSaBz2JcxVj9po8AFHIb61ukKTBQns0M
+n679ykcdAsjCSZbY+SEfM2J8Br6vlOwdvzXZLu3a5AMuKaQ9QsnXyX4STEfZvV1o
+5KvYXTeFRHCEAh7r4dtml3XlLBY5Qt0rS1qYpfCSI7yuG4SA4L/N0SCKC7JomODL
+I2Z3KuLbSkrw/HqLofTGAQtW7jT+AfOmz9v/vf+sCSWQWX56J2kJVEmV8lvgUzCJ
+j3I2bk3bcHX8NoonVRvhU9ggAZAZ2aWNkhRMbiPzKYQQUvcQMgw+H/jevxPDZuvG
+5z81YvmxzOk2UbJ+pBqqCSowh335UnqGdxyiA1q+QhfejH7sGNJVjepEc7vccsLD
+7pkKTk/ajCPNCGZcaMrRed86EZPqWomHMycAEGZfKrjW8SZ3ucJWALO5TvS3ekNZ
+KkxYS+yOoOyVqivngd/2
+=Om1J
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index 77c96ffb5b5b..7640388dd406 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.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-2.16.0.ebuild,v 1.9 2012/09/15 23:13:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.10 2012/09/25 01:03:18 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="4"                                  # Gentoo patchset
+PATCH_VER="5"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires