Add fix by Fredrik Tolf #86313.

Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501

4 files changed, 14 insertions, 11 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 0775ffdda2e1..256bae8ee47d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.389 2005/09/21 03:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.390 2005/09/28 23:57:58 vapier Exp $
+
+  28 Sep 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Add fix by Fredrik Tolf #86313.
 
   21 Sep 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild:
   Rework ABI handling for cross-compiles so mips n32/n64 works now with mips64
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index aab8f3a4faf8..35494f215398 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -6,7 +6,7 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 eef2df83111a973b4812910197db1569 glibc-2.3.5-r1.ebuild 40354
+MD5 c8392cd03f6f74e56ee5773da168baec glibc-2.3.5-r1.ebuild 40357
 MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 73fc10b9878bccc90533b031bbfb7996 glibc-2.3.5.20050722.ebuild 40400
@@ -14,7 +14,7 @@ MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
 MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
 MD5 65203448f3153faa1943b035e7c18e5f glibc-2.3.5.20050421.ebuild 40178
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
-MD5 9ce86529dbae9cec9b1b3c319255729c ChangeLog 82971
+MD5 cbcf705032b1b005bc22decc963c26ac ChangeLog 83079
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
 MD5 6d49cf08909f89da5748956452bebb03 files/nscd 1339
 MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604
@@ -34,7 +34,7 @@ MD5 2a03ed91154589a9473bac46eacff1e9 files/digest-glibc-2.3.4.20041102-r2 387
 MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102-r1 383
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
-MD5 4d652835c9fb80faefa4edaec68c5427 files/digest-glibc-2.3.5-r1 516
+MD5 508771229b82f5fb74122efa5d34787d files/digest-glibc-2.3.5-r1 516
 MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
 MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
@@ -135,7 +135,7 @@ MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOf2TgIKl8Uu19MoRAlnIAJ48NtQAMeVtjm07gLawx++HPW/97wCeJJMt
-4EPPdYi/SINN6XKpeH/bmPI=
-=Td8z
+iD8DBQFDOy5FgIKl8Uu19MoRAvWeAJ9etXlPUkRMrlb28FjA4whvuBovhACdEhm/
+Bk2mGi3ZXZxKvoApKjlyvOY=
+=mCp+
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r1 b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
index 5dcf7f88c450..ee31af788dd0 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
@@ -1,7 +1,7 @@
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 9644c0a4e0c20474062b2fa4647a03b6 glibc-2.3.5-patches-1.11.tar.bz2 24191
+MD5 abd376b4ff5efc8ee6523a1510149c03 glibc-2.3.5-patches-1.12.tar.bz2 24445
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
 MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index c04dbc3b0d67..af0886f18657 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.37 2005/09/28 02:17:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.38 2005/09/28 23:57:58 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="amd64 arm -hppa ~ia64 m68k ~mips ~ppc ppc64 sh ~sparc x86"
+KEYWORDS="-* amd64 arm -hppa ~ia64 m68k ~mips ~ppc ppc64 sh ~sparc x86"
 
 BRANCH_UPDATE=""
 
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.5"
 GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
-PATCH_VER="1.11"
+PATCH_VER="1.12"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"