updated to the latest fedora-branch snapshot. among other things, this fixes the NPTL pthread_mutex_timedwait bug detailed at http://sources.redhat.com/bugzilla/show_bug.cgi?id=417

4 files changed, 18 insertions, 8 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 0607efd6f25a..af6d5bde90ce 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.263 2004/10/01 22:39:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.264 2004/10/04 11:29:35 lv Exp $
+
+*glibc-2.3.4.20041002 (04 Oct 2004)
+
+  04 Oct 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040928.ebuild,
+  +glibc-2.3.4.20041002.ebuild:
+  updated to the latest fedora-branch snapshot. among other things, this fixes
+  the NPTL pthread_mutex_timedwait bug detailed at
+  http://sources.redhat.com/bugzilla/show_bug.cgi?id=417
 
   01 Oct 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.4.20040808.ebuild:
   Added ~mips to keywords. Only n32 users should see this upgrade, but ONLY if
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 42638798728b..5f5cf8c696fa 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -3,9 +3,10 @@ MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915
 MD5 69d5deb42d1f5687791ceaa46ef56215 glibc-2.3.2-r11.ebuild 20433
 MD5 0def963a028a28e5da9ee21a22c5f3b6 glibc-2.3.3.20040420-r1.ebuild 21667
 MD5 5ddcb90cbbcf07775bcaade32c13602e glibc-2.3.4.20040619-r1.ebuild 20900
-MD5 8a3cfe23218f1ddeb48e23024d787957 glibc-2.3.4.20040808.ebuild 21705
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 e363afe778d8aa809d4ecafb8cd3e4f7 glibc-2.3.4.20040928.ebuild 25626
+MD5 8a3cfe23218f1ddeb48e23024d787957 glibc-2.3.4.20040808.ebuild 21705
+MD5 2dbe36a8e57474d4cad079c3fcedb5a5 glibc-2.3.4.20041002.ebuild 25626
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r11 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r1 312
@@ -25,6 +26,7 @@ MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
 MD5 e62388bbadcb815956d5889a3509a8c8 files/digest-glibc-2.3.4.20040928 382
+MD5 c549158f070bb029a4775c00af300a87 files/digest-glibc-2.3.4.20041002 382
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -105,17 +107,17 @@ MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166
 MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
 MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
 MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602
-MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
+MD5 89d11970ae8137662bcbfdb23f1ef43a files/2.3.3/ssp.c 4049
 MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
 MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
 MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
 MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
 MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
 MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
-MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
 MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
-MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
 MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
+MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
 MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040928 b/sys-libs/glibc/files/digest-glibc-2.3.4.20041002
index 6699c01bac1d..419cdbfa0b60 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20040928
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20041002
@@ -2,4 +2,4 @@ MD5 84dabbf0b9b5370793a416687d7b5252 glibc-2.3.3.tar.bz2 13298567
 MD5 2a138a32ffdb52fc1be54088d5d49420 glibc-manpages-2.3.4.tar.bz2 14759
 MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
 MD5 dc09b4c1a29f69232441f7f5abbcc7b9 glibc-hppa-patches-2004-08-24.tar.gz 9739
-MD5 93a175fb22d31dda3001b0d4a8e9b273 glibc-2.3.4-branch-update-20040928.patch.bz2 2696643
+MD5 c07db2292aa1ac0a0fdf8a64838ad3e6 glibc-2.3.4-branch-update-20041002.patch.bz2 2715046
diff --git a/sys-libs/glibc/glibc-2.3.4.20040928.ebuild b/sys-libs/glibc/glibc-2.3.4.20041002.ebuild
index 1ddf9bba88fc..777ad0b0ff9a 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041002.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040928.ebuild,v 1.3 2004/09/29 05:24:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041002.ebuild,v 1.1 2004/10/04 11:29:35 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
-BRANCH_UPDATE="20040928"
+BRANCH_UPDATE="20041002"
 
 # Minimum kernel version we support
 # (Recent snapshots fails with 2.6.5 and earlier)