Added a patch from Debian to fix a build error in sysdeps/unix/sysv/linux/getcwd.c where the MAX macro is undefined and bumped patchver to 1.14.

Package-Manager: portage-2.1

4 files changed, 23 insertions, 28 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index fd7292df81a5..d87be7b8b593 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.459 2006/06/18 22:14:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.460 2006/06/19 01:36:47 kumba Exp $
+
+  19 Jun 2006; Joshua Kinard <kumba@gentoo.org> glibc-2.3.6-r4.ebuild:
+  Added a patch from Debian to fix a build error in
+  sysdeps/unix/sysv/linux/getcwd.c where the MAX macro is undefined and bumped
+  patchver to 1.14.
 
   18 Jun 2006; Andrej Kacian <ticho@gentoo.org> glibc-2.3.6-r4.ebuild:
   Stable on x86. Bug #137121.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9fdc6a9ff974..cf742a6d063f 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -447,7 +444,7 @@ DIST glibc-2.3.4.tar.bz2 13213560 RMD160 bb2bc1669de7c7b08903be5767753f75709e98c
 DIST glibc-2.3.5-patches-1.13.tar.bz2 24793 RMD160 1940f068e05222738a95baa566a0da78ca8eb3ab SHA256 167da2eba108780b54e6f6ec8e9c2f4caf30eb65121e916c6d8813bbb46a2216
 DIST glibc-2.3.5-patches-1.16.tar.bz2 28401 RMD160 ef56df1c2ed60df01b027f805755463a834f3760 SHA1 bf72729c0b2c7deda2314e88d3b619d28a3d3b95 SHA256 371dfd8f8dfc90be4fdd8057fb58090119db95d26aa550ac1a7b3bcc828e754b
 DIST glibc-2.3.5.tar.bz2 13583139 RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 SHA1 465cb1f4708dfa88606379cc1ebecb724c65f027 SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5
-DIST glibc-2.3.6-patches-1.13.tar.bz2 154397 RMD160 6e9acce08b4de3a353e7483b19fc5c7eb99b2db2 SHA1 36cbad545c558b5cc659b8b0774885fe78e078b2 SHA256 4ec39d275f73fe7cfb44be99b8abd69bcd0017df4a587548b0c4c2ae25578c35
+DIST glibc-2.3.6-patches-1.14.tar.bz2 154606 RMD160 991aa08663d3a23a3a4ce78f799926a633c91995 SHA1 7153c187644e3807e57fd2cc207803de36ad1073 SHA256 deaa952c3dd1e862c121b9bf36650b9e3fcbbec850b76fddb65e1d03f13d3ed1
 DIST glibc-2.3.6-patches-1.8.tar.bz2 132799 RMD160 fe94d79a0cd6ca8e860924fc3daafe550faa4244 SHA1 06e2242274a338821f327b4921b94988006685a6 SHA256 8a96a2fcd6800ab47f23d669fc9752978e0bfc0ff5f634351ae49a33c7a0060e
 DIST glibc-2.3.6.tar.bz2 14014977 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 SHA1 82d0487419f1bdbf2dee439c344e89d6af47e558 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
 DIST glibc-2.4-patches-1.15.tar.bz2 121247 RMD160 dfb7e90ee02a8162393c3d3c0ddbae81a1e56ff8 SHA256 fca9951f5fb10ac85507f1b636a15549c00aebc1af7342887c183d843cc8f670
@@ -521,18 +518,18 @@ EBUILD glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b6
 MD5 c2e89fc966f597b9a2fc19e0168e28f4 glibc-2.3.6-r3.ebuild 42710
 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 glibc-2.3.6-r3.ebuild 42710
 SHA256 8965552b0fe2b092bb26ea191c89c8704ca3943a5c523377befb69f9a4c9d2e5 glibc-2.3.6-r3.ebuild 42710
-EBUILD glibc-2.3.6-r4.ebuild 37075 RMD160 f013e6eea0a05579eac2d390b6a1aa5f53e9db1f SHA1 2ab0137a244e6f58d59ced462250c86d28cb2a25 SHA256 8b8c3fe888d78c205cebce708eee8cd7ffd97f20342403e9de89abdeb5364439
-MD5 ba14119333f22f0e17ed1a7a36e8ddea glibc-2.3.6-r4.ebuild 37075
-RMD160 f013e6eea0a05579eac2d390b6a1aa5f53e9db1f glibc-2.3.6-r4.ebuild 37075
-SHA256 8b8c3fe888d78c205cebce708eee8cd7ffd97f20342403e9de89abdeb5364439 glibc-2.3.6-r4.ebuild 37075
+EBUILD glibc-2.3.6-r4.ebuild 37075 RMD160 dbf27650cad926c07c2d481d5a3129acde690374 SHA1 912f54d1fa4bd46888539523ad6dd56eff880d63 SHA256 ff1e2701a9ebb3fd4f182e280cf6fb898d589766bc41193b144f40969618d246
+MD5 1f917ffe0b48f2503e1aa33eb663fbf8 glibc-2.3.6-r4.ebuild 37075
+RMD160 dbf27650cad926c07c2d481d5a3129acde690374 glibc-2.3.6-r4.ebuild 37075
+SHA256 ff1e2701a9ebb3fd4f182e280cf6fb898d589766bc41193b144f40969618d246 glibc-2.3.6-r4.ebuild 37075
 EBUILD glibc-2.4-r3.ebuild 38578 RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 SHA1 755749d0d70d93fa67545ff22b154219f6da5ecb SHA256 49300f7b832ff77a48de2c3d5fd229580df05ec106bfba2be0b434a863270389
 MD5 2fd02d9f0101a90f5557da55e35a2d88 glibc-2.4-r3.ebuild 38578
 RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 glibc-2.4-r3.ebuild 38578
 SHA256 49300f7b832ff77a48de2c3d5fd229580df05ec106bfba2be0b434a863270389 glibc-2.4-r3.ebuild 38578
-MISC ChangeLog 93854 RMD160 3241d9c0ceab1582edc6b08e6c8ef9e56a6b21a6 SHA1 9e30e6859ac552d82c0181fe805282921c7d5724 SHA256 f31dece0a8715e1ea975e4ef4209f6aec252f7faae6a993bffafc2667d57f164
-MD5 04d35fb799fb0f1397e3c5e65d0820db ChangeLog 93854
-RMD160 3241d9c0ceab1582edc6b08e6c8ef9e56a6b21a6 ChangeLog 93854
-SHA256 f31dece0a8715e1ea975e4ef4209f6aec252f7faae6a993bffafc2667d57f164 ChangeLog 93854
+MISC ChangeLog 94077 RMD160 a88bc48cbb6634f4877ed6ae7c55122203785405 SHA1 c45151dbbdd01e905ae3249170db5e528b50a544 SHA256 9db8a7b12cdb71896c4efdfd61b0aff6320b5c6c226c6db8071d2a100358674d
+MD5 e13ec23a802ce1bfaba03804460e0a85 ChangeLog 94077
+RMD160 a88bc48cbb6634f4877ed6ae7c55122203785405 ChangeLog 94077
+SHA256 9db8a7b12cdb71896c4efdfd61b0aff6320b5c6c226c6db8071d2a100358674d ChangeLog 94077
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -570,16 +567,9 @@ SHA256 77ccc09d56cf5a8b4a7c2d847eb28074668e0319777e632be7a1c29e33a7db5c files/di
 MD5 a9b2d44d0396a4996c59e30664cd3643 files/digest-glibc-2.3.6-r3 1876
 RMD160 cc9d6cfcd8541c7dc518560eb50dfd8c61f98ab8 files/digest-glibc-2.3.6-r3 1876
 SHA256 8ec9b852e961654f255e4ae73c2fcc51482fb1b0519834688dba4614f8353216 files/digest-glibc-2.3.6-r3 1876
-MD5 b06ea6fb70360d04b4e6cb974d07c30a files/digest-glibc-2.3.6-r4 1879
-RMD160 08e1af76c26de6e98c890071c7f9bf15fb0dd6c8 files/digest-glibc-2.3.6-r4 1879
-SHA256 c434f8b616864ec0cabb771aab0f7c481ef28a5693932585ee46b435c1e4da0f files/digest-glibc-2.3.6-r4 1879
+MD5 478267edbbcd309d575cdc6a84b5dc0d files/digest-glibc-2.3.6-r4 1879
+RMD160 4c723913d8e7a93d24e1ca668bfe91e6e9e6f2c1 files/digest-glibc-2.3.6-r4 1879
+SHA256 272f07c8422ac623c9e571d21c48e8d68e10a8310a91635cb74e8b15e0f42113 files/digest-glibc-2.3.6-r4 1879
 MD5 5524c1eed817c3bc0c2f372b7d4921f6 files/digest-glibc-2.4-r3 1858
 RMD160 3e86bb0d977e2bae59d448996978e725e34c38e6 files/digest-glibc-2.4-r3 1858
 SHA256 1a332288a00003f21a227e271cfda7c726007fdbe00b5fd66d7ec4fdb73378a8 files/digest-glibc-2.4-r3 1858
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEldBiQlM6RnzZP+IRAs6nAJ4w7UFaBrUyvM0YTVsODEzeGDqWGQCeK1OJ
-Zs31eXVWoozDHHq9YF77Nns=
-=SVCC
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r4 b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
index b13665a9e5ef..0e40049fbdba 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.6-r4
+++ b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
@@ -1,6 +1,6 @@
-MD5 ccf4fa68807607b00eb6f44f50c985c3 glibc-2.3.6-patches-1.13.tar.bz2 154397
-RMD160 6e9acce08b4de3a353e7483b19fc5c7eb99b2db2 glibc-2.3.6-patches-1.13.tar.bz2 154397
-SHA256 4ec39d275f73fe7cfb44be99b8abd69bcd0017df4a587548b0c4c2ae25578c35 glibc-2.3.6-patches-1.13.tar.bz2 154397
+MD5 da8b90206ff0b37d645716cf30d9ce0d glibc-2.3.6-patches-1.14.tar.bz2 154606
+RMD160 991aa08663d3a23a3a4ce78f799926a633c91995 glibc-2.3.6-patches-1.14.tar.bz2 154606
+SHA256 deaa952c3dd1e862c121b9bf36650b9e3fcbbec850b76fddb65e1d03f13d3ed1 glibc-2.3.6-patches-1.14.tar.bz2 154606
 MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977
 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977
 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977
diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
index c9cdbd7738f1..df32d2025098 100644
--- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.10 2006/06/18 22:14:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.11 2006/06/19 01:36:47 kumba Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.6-1"
 GLIBC_INFOPAGE_VERSION="2.3.6"
 
 # Gentoo patchset
-PATCH_VER="1.13"
+PATCH_VER="1.14"
 
 # Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm
 # http://download.fedora.redhat.com/pub/fedora/linux/core/