Add fix from upstream for getconf writing too many bytes to local buffer #411905 by Ryan Hill.

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

3 files changed, 23 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 01f4d0d63e39..6853d37954e9 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.860 2012/06/14 18:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.861 2012/06/18 04:34:17 vapier Exp $
+
+  18 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild:
+  Add fix from upstream for getconf writing too many bytes to local buffer
+  #411905 by Ryan Hill.
 
   14 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild:
   Fix from upstream to for strtok on x32 #420951.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 36e1f2c32cba..1cc8cec7de90 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,7 +42,7 @@ DIST glibc-2.14.1-patches-5.tar.bz2 159559 RMD160 25b72ae44aab4ec3f7fc516f144353
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
 DIST glibc-2.15-patches-13.tar.bz2 154658 RMD160 bd1f45c349e4021ea00cd9de4c3f3212a50f01d9 SHA1 fbc45542d46790860d671497fec690c2c11578a9 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53
-DIST glibc-2.15-patches-17.tar.bz2 171351 RMD160 90e4f3c0349a3003f9aa7b481eef83d3d3588d37 SHA1 1892907c6fce57e0c554b21c79107a918675227b SHA256 9cb1c1ec9f74a868130864a9c5bd11878f0ec642ba86f9c3b8cf23cfc15dd5dc
+DIST glibc-2.15-patches-18.tar.bz2 173777 RMD160 405ec8cfa29810800fbc2cd768586c177735edc6 SHA1 9534adcc57fe8f3298fdd4fadc213afa30a809af SHA256 1945d4dfbf3be4fc445391f6cedfca6e3f305e277493ddd0ccee020e37a05c28
 DIST glibc-2.15.tar.xz 10280176 RMD160 29afafcb61f5842b6b458e322a004aac06dbf6df SHA1 0a7936be3bd0562b076b95dacb7c9daa3dbc83fc SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
@@ -65,26 +65,26 @@ EBUILD glibc-2.14.1-r2.ebuild 9262 RMD160 1f1b7769060f15ef9b7692feda4ce7f10b06f7
 EBUILD glibc-2.14.1-r3.ebuild 9258 RMD160 a77b359cbb3303695c2f321b65329166b3832efe SHA1 77516a83f2022f5aaed9db405eff152da7eba7f1 SHA256 885edd1a93e6df43243ca20e7494a537d4bd1c1b2da987a4a9e2acb222535903
 EBUILD glibc-2.14.ebuild 9155 RMD160 455f9053123657a7b8c3506025352f75cc987886 SHA1 78bf65d8ddde97b68de0d78a4907ae6d2a4fbbe2 SHA256 2b518e375bbb0ce54764458c1ec91d1557a511946dfe1e3027a5fe1f608002d9
 EBUILD glibc-2.15-r1.ebuild 8890 RMD160 40c87dfa2719b8c7702eccbea3dec658ae72e793 SHA1 f086cd97ac04f683b7452e7d982b8449fab784c7 SHA256 9c357f2e1ddd8b54688f81987add167193cd0ac6d23a719a5961579b392eb4a3
-EBUILD glibc-2.15-r2.ebuild 8682 RMD160 8a2a8b54f66719a13959a5f0175d0c83e94cef37 SHA1 ffe98b94d0a712e1d828346b34ddeae41584d767 SHA256 6f3c64d18bb6d19e4f5f21213e294b31cac27b70c6c0d268d691548e4afaf2b9
+EBUILD glibc-2.15-r2.ebuild 8682 RMD160 7eeec233d82e8c040a939319d00b0f4446bcba6d SHA1 4c60deb242b0e07e65553a91413001c833c2c032 SHA256 95452de783feb941050f256e186c497aadb3ccff28d07fe96a289671f565b63c
 EBUILD glibc-2.9_p20081201-r3.ebuild 7523 RMD160 25f8ef82e0b54582d4037bf530f2f59c9b54980c SHA1 55c9b9157b9af96d37c762e70f7d4f70247550d7 SHA256 11c36a4100ed536bc8573eafcce69cded11e2f5c93b9d88fcb6371049101ffee
 EBUILD glibc-9999.ebuild 8200 RMD160 cefcd5fbd913aff677777ac890f56b3bd8d2b72d SHA1 20e9a1251d010ad8ee327f0b8fb4dd6bdd172f67 SHA256 292103d9f13581893e36eeb61a45e8b22d2d33896541afabf6a48da70ca6116d
-MISC ChangeLog 45337 RMD160 7ddab6ddcbe65f030553b2c85908ee353c2a3bf7 SHA1 42d3b548a517de448a17852253f521295d552a40 SHA256 da0e60968045c1c87102d5fc7b25c6d7465dadac3c29eb363f06a436488aefe7
+MISC ChangeLog 45509 RMD160 c690a6eaeb396b19e266522c760588b0185c7809 SHA1 6f718283597e493ea289079fa0d5618da34a4822 SHA256 aa218c3dddce01fa8d5562020afb36a5f91f8206db68edf057d3ad068c20efb0
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP2i4DAAoJELEHsLL7fEFWi/EP/3ShkEXisuoO2cmCSPpNeVZ3
-GcQZ2AttJbFfKuMZbN6ZPQIoPEXVgMThZ53d5OSnuWRqjqXPFoWkjUxvENEbizG6
-eEqWtWgOdnPhEyGx2Rmlelesro2t4cCkElC5+cLs6a1xE5MvBpAGuNTAzoSXPSdb
-GZsrDoCeJUl3EZiUoBNAt9Mp+ErFAkX6m/kh0KmoqtTLrZBR7MRsLBQDFMXUbKLq
-z3tuuCsvh2WjUaWrOzsNsYLUvFexHt7lIGWv4lBhd/Oq7J0J4+bPF6KfU43Ubm9D
-g6kTLPCUZ0CmlWTMShWs+ez4cXvcnfH4KpJISnAbB5ZIM3WrU8EFf7KbQ71MkymP
-GhtLFG7uIlk16sc1ZWIwaBEjlnpZkVynB84QvqObSghHH9nGF1K8rqmSCtAYrSng
-BKYTM6hnDlA7k6YRGZb/SEgtG8OU5GaWu5J5IJhzdGUYkfBCgDDrePqXSBBhAplP
-OU4ViTkt/gix7vlNTfI9lXexe30sZ5bjy2iy2Jjo/+6RR+25uOhIaozUDXmrPbiz
-T0rKUmaZRgW8gvYizhr8zFys5fJY1M2V3QO3q/ksSn8fWft9O4V/jXdQiw+vu2UM
-RtW0TFFa9alNycASwYpYUZqpklZNTv1xZsfIk24QNXtPN7fnjxQqrB9HEdCRRFQU
-f6umvaVA35Ai+eJjyrxi
-=i3cU
+iQIcBAEBAgAGBQJP3q/TAAoJELEHsLL7fEFW5N0P/0vM9G8PVaoqvODJeJCNxfz/
+EiMoxA1jce9akUCZMZudQGz1qk8ltqZcdXtjWDjHf8SmmLzjTDqKKV567OYaHrvb
+zwwnWK2LB/edxCRbqbzXXWFAmKkPPsJqKze6X5m5bfTl+riN/6hGExbXoeY808ZN
+yFOEAcK8o81/zD/NqIw77UB3LvEV6u7kEOogGQqI1syXnXuupz6n8WFUurvWk4uo
+Y/0+ostdiyKV8A5tydifVIxWrvQKcm0t1dvZmNUhZBCTksCcVy6LlFDN0JP0iuAh
+N6kGIG5Cz7la+iShajKDncligSpSltgmJNM3nvSv0XLpHFYy6v4GiPRCoJM10/hh
+id8HPl8K5q53q9OokfeeyARKKmZNx+ZY+cmAQyRzzzf/cD9Z8svkQlKt8dUFnS1l
+eni4VO2RQ/rUbCXArNtIECqVhG3TNtdHeM1CFMDUQxDjaHhH2l52cN64KXKBJXzX
+JyjS3H3t3HCKAHOuwkyXIhncTlUgujUcIZGLzxeT7wMKvUuCv2329zXogszrDLz4
+f+FgAk07D0qx4/BIRPWlvvEPQsP3vrvv4t/dQi7A0OnGWN/rq/qXGKgHWMwFnDAX
+oQ/ayXEKQnWl1ZCH5M8pOgPrZeiDYbSUdHtgJ2XUCIlHU2ODatIAVk3T9Z+v6rmd
+Fg3LvywkDN+BHD2+JCIK
+=GDXu
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index 2bdb346e0eb2..e7bd4fd7532b 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.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.15-r2.ebuild,v 1.8 2012/06/14 18:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.9 2012/06/18 04:34:17 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="17"                                 # Gentoo patchset
+PATCH_VER="18"                                 # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires