new snapshot. among other things it fixes a bug with pthreads.h being unable to be parsed by any version of GNU C++. To quote Ulrich Drepper: I've some good suggestions what to do with those C++ "designers".

5 files changed, 941 insertions, 84 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 54bedd7db7b0..12f167fc0c5d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.251 2004/09/06 17:48:37 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.252 2004/09/17 03:30:38 lv Exp $
+
+*glibc-2.3.4.20040916 (16 Sep 2004)
+
+  16 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/glibc-sec-hotfix-20040916.patch, +glibc-2.3.4.20040916.ebuild:
+  new snapshot. among other things it fixes a bug with pthreads.h being unable
+  to be parsed by any version of GNU C++.
 
   06 Sep 2004; Travis Tilley <lv@gentoo.org>
   +files/2.3.4/glibc-gentoo-libdir.patch, glibc-2.3.4.20040808.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9ecffc5b04b9..3a96336fedd1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,123 +1,116 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e617c070442c7f1fbf6b7bdc9deeaa35 ChangeLog 51385
-MD5 f3cfb768f888ac432bddfa481c2febce glibc-2.2.5-r9.ebuild 10877
+MD5 5144e9dd5e0bb2bf88a7a9522de0a09e glibc-2.3.4.20040808.ebuild 21202
 MD5 4b47e58e600eebddddb96287bdcc42da glibc-2.3.2-r11.ebuild 20306
+MD5 c773f9c6285fdbeb3565f492f1966aaa glibc-2.3.4.20040916.ebuild 21203
 MD5 c3e722bbae2f66c4ce6ad6a7ca8689b3 glibc-2.3.3.20040420-r1.ebuild 21628
 MD5 abbd99fca75b3d22e618dfc07d848738 glibc-2.3.4.20040619-r1.ebuild 20854
-MD5 5144e9dd5e0bb2bf88a7a9522de0a09e glibc-2.3.4.20040808.ebuild 21202
+MD5 e617c070442c7f1fbf6b7bdc9deeaa35 ChangeLog 51385
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 f3cfb768f888ac432bddfa481c2febce glibc-2.2.5-r9.ebuild 10877
+MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
+MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
+MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
 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
-MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r1 307
+MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808 382
-MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+MD5 a56acbf2ff1ead5ea25415b5db90aa31 files/digest-glibc-2.3.4.20040916 382
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
-MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
 MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
-MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r1 312
 MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
-MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
-MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-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
-MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r11 312
+MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r1 307
 MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
-MD5 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
-MD5 1c3b30834a25149e4738eead113462ad files/2.2.5/glibc-2.2.5-getgrouplist.patch 708
+MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
+MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
+MD5 a12b84b5af2808f5c0223259f7a9610c files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
 MD5 b07a316cbba4ddc1e1bb094a3056f12f files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
+MD5 1c3b30834a25149e4738eead113462ad files/2.2.5/glibc-2.2.5-getgrouplist.patch 708
+MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+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
+MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636
+MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
+MD5 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 MD5 c34a3c6bf21274a506090f05b7ea60ff files/2.2.5/glibc-2.2.5-ppc-sqrtl.diff 715
 MD5 c7783e49497814c3d86bd63bbed2a9b3 files/2.2.5/glibc-2.2.5-sandbox.diff 438
-MD5 a12b84b5af2808f5c0223259f7a9610c files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
 MD5 6bdfb930ffdfdeb6b2ee823fefe42513 files/2.2.5/glibc-2.2.5-sparc-misc.diff 12252
-MD5 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
+MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 6afbd6fe65c0e2034587ba6d1da427a3 files/2.2.5/glibc-2.2.5-sparc64-fixups.diff 1407
-MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
-MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636
-MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
-MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
-MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
-MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+MD5 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
 MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
-MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
+MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
+MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
 MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
 MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
+MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
 MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
+MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
+MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
+MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
 MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
-MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
+MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
+MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
+MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
+MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
+MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
 MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
-MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
-MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
-MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
 MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
-MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
 MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
-MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
 MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
-MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
 MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
+MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
+MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
 MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
-MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
-MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
+MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
 MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
-MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
 MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
-MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
-MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
-MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
-MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
-MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
-MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
-MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
-MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
-MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 1431
-MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
 MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 1431
+MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
 MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
-MD5 69d86fa55810b4d327d0cb35042c034f files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch 538
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
-MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
-MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
-MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
-MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
 MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720
-MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166
+MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
-MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
+MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
 MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602
-MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
-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 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
+MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166
+MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
+MD5 69d86fa55810b4d327d0cb35042c034f files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch 538
+MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
+MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
+MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
 MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
 MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
-MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
-MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBRRymHTu7gpaalycRAk5mAJ4hDwap8xwx82FUV5WCcA/Xuad46gCeLFz/
-LXIapCQAu2yUzZDdWoJid80=
-=wDaV
------END PGP SIGNATURE-----
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040916 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040916
new file mode 100644
index 000000000000..05fff45ea6d2
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040916
@@ -0,0 +1,5 @@
+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 9fb9b812ec225c6508cb22b5558c65cb glibc-2.3.4-branch-update-20040916.patch.bz2 1589304
diff --git a/sys-libs/glibc/files/glibc-sec-hotfix-20040916.patch b/sys-libs/glibc/files/glibc-sec-hotfix-20040916.patch
new file mode 100644
index 000000000000..3858a0f9c9d1
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-sec-hotfix-20040916.patch
@@ -0,0 +1,95 @@
+diff -Nru glibc-2.3.3.old/elf/rtld.c glibc-2.3.3/elf/rtld.c
+--- glibc-2.3.3.old/elf/rtld.c	2004-09-16 15:02:16.000000000 -0400
++++ glibc-2.3.3/elf/rtld.c	2004-09-16 15:04:58.000000000 -0400
+@@ -2041,6 +2041,30 @@
+   GLRO(dl_profile_output)
+     = &"/var/tmp\0/var/profile"[INTUSE(__libc_enable_secure) ? 9 : 0];
+ 
++  /* Extra security for SUID binaries.  Remove all dangerous environment
++     variables.  */
++  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
++    {
++      static const char unsecure_envvars[] =
++#ifdef EXTRA_UNSECURE_ENVVARS
++	EXTRA_UNSECURE_ENVVARS
++#endif
++	UNSECURE_ENVVARS;
++      const char *nextp;
++
++      nextp = unsecure_envvars;
++      do
++	{
++	  unsetenv (nextp);
++	  /* We could use rawmemchr but this need not be fast.  */
++	  nextp = (char *) (strchr) (nextp, '\0') + 1;
++	}
++      while (*nextp != '\0');
++
++      if (__access ("/etc/suid-debug", F_OK) != 0)
++	unsetenv ("MALLOC_CHECK_");
++    }
++
+   while ((envline = _dl_next_ld_env_entry (&runp)) != NULL)
+     {
+       size_t len = 0;
+@@ -2188,33 +2212,10 @@
+   /* The caller wants this information.  */
+   *modep = mode;
+ 
+-  /* Extra security for SUID binaries.  Remove all dangerous environment
+-     variables.  */
+-  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
+-    {
+-      static const char unsecure_envvars[] =
+-#ifdef EXTRA_UNSECURE_ENVVARS
+-	EXTRA_UNSECURE_ENVVARS
+-#endif
+-	UNSECURE_ENVVARS;
+-      const char *nextp;
+-
+-      nextp = unsecure_envvars;
+-      do
+-	{
+-	  unsetenv (nextp);
+-	  /* We could use rawmemchr but this need not be fast.  */
+-	  nextp = (char *) (strchr) (nextp, '\0') + 1;
+-	}
+-      while (*nextp != '\0');
+-
+-      if (__access ("/etc/suid-debug", F_OK) != 0)
+-	unsetenv ("MALLOC_CHECK_");
+-    }
+   /* If we have to run the dynamic linker in debugging mode and the
+      LD_DEBUG_OUTPUT environment variable is given, we write the debug
+      messages to this file.  */
+-  else if (any_debug && debug_output != NULL)
++  if (any_debug && debug_output != NULL)
+     {
+ #ifdef O_NOFOLLOW
+       const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW;
+diff -Nru glibc-2.3.3.old/malloc/malloc.c glibc-2.3.3/malloc/malloc.c
+--- glibc-2.3.3.old/malloc/malloc.c	2004-09-16 15:03:22.000000000 -0400
++++ glibc-2.3.3/malloc/malloc.c	2004-09-16 15:04:58.000000000 -0400
+@@ -321,6 +321,10 @@
+ #define assert(x) ((void)0)
+ #endif
+ 
++#include <abort-instr.h>
++#ifndef ABORT_INSTRUCTION
++#define ABORT_INSTRUCTION
++#endif
+ 
+ /*
+   INTERNAL_SIZE_T is the word-size used for internal bookkeeping
+diff -Nru glibc-2.3.3.old/sysdeps/generic/unsecvars.h glibc-2.3.3/sysdeps/generic/unsecvars.h
+--- glibc-2.3.3.old/sysdeps/generic/unsecvars.h	2004-09-16 15:03:11.000000000 -0400
++++ glibc-2.3.3/sysdeps/generic/unsecvars.h	2004-09-16 15:04:58.000000000 -0400
+@@ -3,6 +3,8 @@
+    with a '\0' explicitly.  */
+ #define UNSECURE_ENVVARS \
+   "LD_PRELOAD\0"							      \
++  "LD_DEBUG\0"								      \
++  "LD_TRACE_PRELINKING\0"							      \
+   "LD_LIBRARY_PATH\0"							      \
+   "LD_ORIGIN_PATH\0"							      \
+   "LD_DEBUG_OUTPUT\0"							      \
diff --git a/sys-libs/glibc/glibc-2.3.4.20040916.ebuild b/sys-libs/glibc/glibc-2.3.4.20040916.ebuild
new file mode 100644
index 000000000000..69e43b9792c3
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.4.20040916.ebuild
@@ -0,0 +1,757 @@
+# 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.20040916.ebuild,v 1.1 2004/09/17 03:30:39 lv Exp $
+
+inherit eutils flag-o-matic gcc
+
+# Branch update support.  Following will disable:
+#  BRANCH_UPDATE=
+BRANCH_UPDATE="20040916"
+
+
+# Minimum kernel version we support
+# (Recent snapshots fails with 2.6.5 and earlier)
+MIN_KERNEL_VERSION="2.6.5"
+
+
+if [ -z "${BRANCH_UPDATE}" ]; then
+	BASE_PV="${NEW_PV}"
+	NEW_PV="${NEW_PV}"
+else
+	BASE_PV="2.3.3"
+	NEW_PV="${PV%.*}"
+fi
+
+
+S="${WORKDIR}/${PN}-${BASE_PV}"
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://sources.redhat.com/glibc/"
+
+HPPA_PATCHES=2004-08-24
+
+SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2
+	http://dev.gentoo.org/~lv/${PN}-manpages-${NEW_PV}.tar.bz2
+	http://dev.gentoo.org/~lv/glibc-infopages-${NEW_PV}.tar.bz2
+	hppa? ( http://parisc-linux.org/~carlos/glibc-work/glibc-hppa-patches-${HPPA_PATCHES}.tar.gz )"
+
+[ ! -z "${BRANCH_UPDATE}" ] && SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~lv/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2.2"
+KEYWORDS="-* ~x86 ~amd64 ~hppa ppc64 ~ppc"
+IUSE="nls pic build nptl erandom hardened makecheck multilib debug userlocales"
+RESTRICT="nostrip" # we'll handle stripping ourself #46186
+
+# We need new cleanup attribute support from gcc for NPTL among things ...
+# We also need linux26-headers if using NPTL. Including kernel headers is
+# incredibly unreliable, and this new linux-headers release from plasmaroo
+# should work with userspace apps, at least on amd64 and ppc64.
+DEPEND=">=sys-devel/gcc-3.2.3-r1
+	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
+	>=sys-devel/binutils-2.14.90.0.6-r1
+	virtual/os-headers
+	nptl? ( >=sys-kernel/linux26-headers-2.6.5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/os-headers
+	sys-apps/baselayout
+	nls? ( sys-devel/gettext )"
+
+PROVIDE="virtual/glibc virtual/libc"
+
+
+# (very) Theoretical cross-compiler support
+[ -z "${CCHOST}" ] && CCHOST="${CHOST}"
+
+# We need to be able to set alternative headers for
+# compiling for non-native platform
+# Will also become useful for testing kernel-headers without screwing up
+# whole system
+[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="${ROOT}/usr/include"
+
+
+setup_flags() {
+	# Over-zealous CFLAGS can often cause problems.  What may work for one person may not
+	# work for another.  To avoid a large influx of bugs relating to failed builds, we
+	# strip most CFLAGS out to ensure as few problems as possible.
+	strip-flags
+	strip-unsupported-flags
+
+	# -freorder-blocks for all but ppc
+	use ppc || append-flags "-freorder-blocks"
+
+	# Sparc/Sparc64 support
+	if use sparc; then
+		# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+		filter-flags "-fcall-used-g7"
+		append-flags "-fcall-used-g6"
+
+		# Sparc64 Only support...
+		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+			# Get rid of -mcpu options (the CHOST will fix this up) and flags known to fail
+			filter-flags "-mcpu=ultrasparc -mcpu=v9 -mvis"
+
+			# Setup the CHOST properly to insure "sparcv9"
+			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
+			if [ "${CHOST}" = "sparc-unknown-linux-gnu" ]; then
+				export CHOST="sparcv9-unknown-linux-gnu"
+				export CCHOST="sparcv9-unknown-linux-gnu"
+			fi
+		fi
+	fi
+
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		# broken in 3.4.x
+		replace-flags -march=pentium-m -mtune=pentium3
+		ewarn "-march=pentium-m seems to be broken in gcc 3.4, changing to -mtune=pentium3"
+	fi
+
+	# We don't want these flags for glibc
+	filter-flags -fomit-frame-pointer -malign-double
+	filter-ldflags -pie
+
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+	append-flags -O2
+	export LDFLAGS="${LDFLAGS//-Wl,--relax}"
+}
+
+
+check_kheader_version() {
+	local header="${ALT_HEADERS}/linux/version.h"
+
+	[ -z "$1" ] && return 1
+
+	if [ -f "${header}" ]; then
+		local version="`grep 'LINUX_VERSION_CODE' ${header} | \
+			sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
+
+		if [ "${version}" -ge "$1" ]; then
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+
+check_nptl_support() {
+	local min_kernel_version="$(KV_to_int "${MIN_KERNEL_VERSION}")"
+
+	echo
+
+	einfon "Checking gcc for __thread support ... "
+	if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
+		echo "no"
+		echo
+		eerror "Could not find a gcc that supports the __thread directive!"
+		eerror "please update to gcc-3.2.2-r1 or later, and try again."
+		die "No __thread support in gcc!"
+	else
+		echo "yes"
+	fi
+
+	# Building fails on an non-supporting kernel
+	einfon "Checking kernel version (>=${MIN_KERNEL_VERSION}) ... "
+	if [ "`get_KV`" -lt "${min_kernel_version}" ]; then
+		echo "no"
+		echo
+		eerror "You need a kernel of at least version ${MIN_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "Kernel version too low!"
+	else
+		echo "yes"
+	fi
+
+	# Building fails with too low linux-headers
+	einfon "Checking linux-headers version (>=${MIN_KERNEL_VERSION}) ... "
+	if ! check_kheader_version "${min_kernel_version}"; then
+		echo "no"
+		echo
+		eerror "You need linux-headers of at least version ${MIN_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "linux-headers version too low!"
+	else
+		echo "yes"
+	fi
+
+	echo
+}
+
+
+want_nptl() {
+	if use nptl; then
+		# Archs that can use NPTL
+		if use amd64 || use alpha || use ia64 || use ppc || \
+		   use ppc64 || use s390 || use sparc; then
+			return 0
+		fi
+
+		# Specific x86 CHOSTS that can use NPTL
+		if use x86; then
+			case "${CHOST/-*}" in
+				i486|i586|i686)	return 0 ;;
+			esac
+		fi
+	fi
+
+	return 1
+}
+
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	if use amd64 || use alpha || use ia64 || use ppc || \
+	   use ppc64 || use s390 || use sparc; then
+		return 0
+	fi
+
+	# Specific x86 CHOSTS that can use TLS
+	if use x86; then
+		case "${CHOST/-*}" in
+			i486|i586|i686)	return 0 ;;
+		esac
+
+	fi
+
+	return 1
+}
+
+
+do_makecheck() {
+	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
+	if [ "$ATIME" = "" ]; then
+		cd ${WORKDIR}/build
+		make check || die
+	else
+		ewarn "remounting / without noatime option so that make check"
+		ewarn "does not fail!"
+		epause 2
+		mount / -o remount,atime
+		cd ${WORKDIR}/build
+		make check || die
+		einfo "remounting / with noatime"
+		mount / -o remount,noatime
+	fi
+}
+
+
+install_locales() {
+	unset LANGUAGE LANG LC_ALL
+	cd ${WORKDIR}/build
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} localedata/install-locales || die
+	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+}
+
+
+setup_locales() {
+	if use !userlocales || use makecheck; then
+		einfo "makecheck in USE or userlocales not enabled, installing -ALL- locales..."
+		install_locales || die
+	elif [ -e /etc/locales.build ]; then
+		einfo "Installing locales in /etc/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	elif [ -e ${FILESDIR}/locales.build ]; then
+		einfo "Installing locales in ${FILESDIR}/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	else
+		einfo "Installing -ALL- locales..."
+		install_locales || die
+	fi
+}
+
+
+pkg_setup() {
+	# We need gcc 3.2 or later ...
+	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]; then
+		echo
+		eerror "As of glibc-2.3, gcc-3.2 or later is needed"
+		eerror "for the build to succeed."
+		die "GCC too old"
+	fi
+	echo
+
+	hasq sandbox $FEATURES && use makecheck && die "sandbox breaks make check. either take makecheck out of USE or set FEATURES=-sandbox"
+}
+
+
+do_arch_amd64_patches() {
+	cd ${S};
+	# CONF_LIBDIR support
+	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+}
+
+
+do_arch_alpha_patches() {
+	cd ${S}
+
+	# Fix compatability with compaq compilers by ifdef'ing out some
+	# 2.3.2 additions.
+	# <taviso@gentoo.org> (14 Jun 2003).
+	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
+
+	# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
+#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
+}
+
+
+do_arch_arm_patches() {
+	cd ${S};
+
+	# Any needed patches for arm go here
+	epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-arm-ioperm.patch
+}
+
+
+do_arch_hppa_patches() {
+	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
+	cd ${T}
+	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
+	cd ${S}
+	export EPATCH_OPTS=-p1
+	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
+	do
+		epatch ${i}
+	done
+
+	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
+
+}
+
+
+do_arch_ia64_patches() {
+	cd ${S};
+
+	# The basically problem is glibc doesn't store information about
+	# what the kernel interface is so that it can't efficiently set up
+	# parameters for system calls.  This patch from H.J. Lu fixes it:
+	#
+	#   http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html
+
+#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
+}
+
+
+do_arch_mips_patches() {
+	cd ${S}
+
+	# A few patches only for the MIPS platform.  Descriptions of what they
+	# do can be found in the patch headers.
+	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
+	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
+	# <iluxa@gentoo.org> add n32/n64 patches, remove pread patch
+	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
+	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
+	epatch ${FILESDIR}/2.3.3/mips-sysify.diff
+
+	# Need to install into /lib for n32-only userland for now.
+	# Propper solution is to make all userland /lib{32|64}-aware.
+	use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff
+}
+
+
+do_arch_ppc_patches() {
+	cd ${S};
+	# Any needed patches for ppc go here
+}
+
+
+do_arch_ppc64_patches() {
+	cd ${S};
+	# Any needed patches for ppc64 go here
+}
+
+
+do_arch_s390_patches() {
+	cd ${S};
+
+	# Any needed patches for s390 go here
+}
+
+
+do_arch_sparc_patches() {
+	cd ${S};
+
+	# Any needed patches for sparc go here
+}
+
+
+do_arch_x86_patches() {
+	cd ${S};
+	# CONF_LIBDIR support
+	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+}
+
+
+do_pax_patches() {
+	cd ${S}
+
+	# localedef contains nested function trampolines, which trigger
+	# segfaults under PaX -solar
+	# Debian Bug (#231438, #198099)
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
+
+	# With latest versions of glibc, a lot of apps failed on a PaX enabled
+	# system with:
+	#
+	#  cannot enable executable stack as shared object requires: Permission denied
+	#
+	# This is due to PaX 'exec-protecting' the stack, and ld.so then trying
+	# to make the stack executable due to some libraries not containing the
+	# PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
+	use mips || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-dl_execstack-PaX-support.patch
+
+	# Program header support for PaX.
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040117-pt_pax.diff
+
+	# Suppress unresolvable relocation against symbol `main' in Scrt1.o
+	# can be reproduced with compiling net-dns/bind-9.2.2-r3 using -pie
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff
+}
+
+
+do_hardened_fixes() {
+	# this patch is needed to compile nptl with a hardened gcc
+	has_hardened && want_nptl && \
+		epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch
+}
+
+
+do_ssp_patches() {
+	# To circumvent problems with propolice __guard and
+	# __guard_setup__stack_smash_handler
+	#
+	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
+	if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ]; then
+		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
+		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
+			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
+	fi
+
+	# patch this regardless of architecture, although it's ssp-related
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-frandom-detect.patch
+}
+
+
+src_unpack() {
+	# Check NPTL support _before_ we unpack things to save some time
+	want_nptl && check_nptl_support
+
+	unpack ${PN}-${BASE_PV}.tar.bz2
+
+	# Extract pre-made man pages.
+	# Otherwise we need perl, which is bad (especially for stage1 bootstrap)
+	mkdir -p ${S}/man
+	cd ${S}/man
+	unpack ${PN}-manpages-${NEW_PV}.tar.bz2
+	cd ${S}
+
+	if [ -n "${BRANCH_UPDATE}" ]; then
+		epatch ${DISTDIR}/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2
+
+		# Snapshot date patch
+		einfo "Patching version to display snapshot date ..."
+		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
+	fi
+	# Version patch
+	sed -i -e "s:\(#define VERSION\).*:\1 \"${NEW_PV}\":" version.h
+
+	# pre-generated info pages
+	unpack glibc-infopages-2.3.4.tar.bz2
+
+	epatch ${FILESDIR}/glibc-sec-hotfix-20040916.patch
+
+	# SSP support in glibc (where it belongs)
+	do_ssp_patches
+
+
+	# PaX-related Patches
+	do_pax_patches
+
+	# disable binutils -as-needed
+	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
+
+	# hardened toolchain/relro/nptl/security/etc fixes
+	do_hardened_fixes
+
+
+	# Arch specific patching
+	use amd64	&& do_arch_amd64_patches
+	use alpha	&& do_arch_alpha_patches
+	use arm		&& do_arch_arm_patches
+	use hppa	&& do_arch_hppa_patches
+	use ia64	&& do_arch_ia64_patches
+	use mips	&& do_arch_mips_patches
+	use ppc		&& do_arch_ppc_patches
+	use ppc64	&& do_arch_ppc64_patches
+	use s390	&& do_arch_s390_patches
+	use sparc	&& do_arch_sparc_patches
+	use x86		&& do_arch_x86_patches
+
+
+	# Remaining patches
+	cd ${S}
+	# fix for http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
+	#epatch ${FILESDIR}/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
+
+	# Fix permissions on some of the scripts
+	chmod u+x ${S}/scripts/*.sh
+}
+
+src_compile() {
+	setup_flags
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	use nls || myconf="${myconf} --disable-nls"
+	use erandom || myconf="${myconf} --disable-dev-erandom"
+
+	if want_nptl && want_tls; then
+		myconf="${myconf} \
+		--enable-add-ons=nptl \
+		--with-tls --with-__thread \
+		--enable-kernel=2.6.0"
+	else
+		myconf="${myconf} --enable-add-ons=linuxthreads --without-__thread"
+	fi
+
+	# this can be tricky sometimes... if it breaks glibc for you, you should
+	# add a block in the want_tls logic. if it breaks linuxthreads, but nptl
+	# works... make sure to add 'use !nptl' to that logic.
+	want_tls || myconf="${myconf} --without-tls"
+	want_tls && myconf="${myconf} --with-tls"
+
+	# some silly people set LD_RUN_PATH and that breaks things.
+	# see bug 19043
+	unset LD_RUN_PATH
+
+	einfo "Configuring GLIBC..."
+	rm -rf ${WORKDIR}/build
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+	${S}/configure \
+		--build=${CHOST} \
+		--host=${CCHOST} \
+		--disable-profile \
+		--without-gd \
+		--without-cvs \
+		--with-headers=${ALT_HEADERS} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--libexecdir=/usr/lib/misc \
+		--enable-bind-now \
+		${myconf} || die
+
+	einfo "Building GLIBC..."
+	make PARALLELMFLAGS="${MAKEOPTS}" || die
+}
+
+src_install() {
+	setup_flags
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	cd ${WORKDIR}/build
+
+	einfo "Installing GLIBC..."
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} \
+		install || die
+	# now, strip everything but the thread libs #46186
+	mkdir ${T}/thread-backup
+	mv ${D}/lib/lib{pthread,thread_db}* ${T}/thread-backup/
+	env -uRESTRICT prepallstrip
+	mv ${T}/thread-backup/* ${D}/lib/
+
+	# If librt.so is a symlink, change it into linker script (Redhat)
+	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
+		local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
+		local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
+
+		rm -f ${D}/usr/lib/librt.so
+		cat > ${D}/usr/lib/librt.so <<EOF
+/* GNU ld script
+	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+	in search scope.  */
+EOF
+		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
+		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
+			>> ${D}/usr/lib/librt.so
+
+		for x in ${D}/usr/lib/librt.so.[1-9]; do
+			[ -L "${x}" ] && rm -f ${x}
+		done
+	fi
+
+	if ! use build; then
+		cd ${WORKDIR}/build
+
+		if ! has noinfo ${FEATURES} ; then
+			einfo "Installing Info pages..."
+			make PARALLELMFLAGS="${MAKEOPTS}" \
+				install_root=${D} \
+				info -i
+		fi
+
+		setup_locales
+
+		einfo "Installing man pages and docs..."
+		# Install linuxthreads man pages even if nptl is enabled
+		dodir /usr/share/man/man3
+		doman ${S}/man/*.3thr
+
+		# Install nscd config file
+		insinto /etc
+		doins ${FILESDIR}/nscd.conf
+
+		cd ${S}
+		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+			NEWS NOTES PROJECTS README*
+	else
+		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
+
+		einfo "Installing Timezone data..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			timezone/install-others -C ${WORKDIR}/build || die
+	fi
+
+	if use pic && ! use amd64 ; then
+		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
+		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
+		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
+		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
+
+		for i in ${D}/lib/*.map; do
+			mv ${i} ${i%.map}_pic.map
+		done
+	fi
+
+	# Is this next line actually needed or does the makefile get it right?
+	# It previously has 0755 perms which was killing things.
+	fperms 4711 /usr/lib/misc/pt_chown
+
+	# Currently libraries in  /usr/lib/gconv do not get loaded if not
+	# in search path ...
+#	insinto /etc/env.d
+#	doins ${FILESDIR}/03glibc
+
+	rm -f ${D}/etc/ld.so.cache
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f ${D}/etc/localtime
+
+	# Some things want this, notably ash.
+	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
+
+	# This is our new config file for building locales
+	insinto /etc
+	doins ${FILESDIR}/locales.build
+
+	# this whole section is useless, it fails if sandbox is LOADED, not if it's
+	# enabled. but forcing sandbox not to load isnt an option...
+	if use makecheck; then
+		local OLD_SANDBOX_ON="${SANDBOX_ON}"
+		# make check will fail if sandbox is enabled.  Do not do it
+		# globally though, else we might fail to find sandbox violations ...
+		SANDBOX_ON="0"
+		do_makecheck
+		SANDBOX_ON="${OLD_SANDBOX_ON}"
+	fi
+}
+
+fix_lib64_symlinks() {
+	# the original Gentoo/AMD64 devs decided that since 64bit is the native
+	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
+	# this ignores the FHS and breaks multilib horribly... especially
+	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
+	# see bug 59710 for more information.
+	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
+	if [ -L ${ROOT}/lib64 ] ; then
+		ewarn "removing /lib64 symlink and moving lib to lib64..."
+		ewarn "dont hit ctrl-c until this is done"
+		addwrite ${ROOT}/
+		rm ${ROOT}/lib64
+		# now that lib64 is gone, nothing will run without calling ld.so
+		# directly. luckily the window of brokenness is almost non-existant
+		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		# all better :)
+		ldconfig
+		ln -s lib64 ${ROOT}/lib
+		einfo "done! :-)"
+		einfo "fixed broken lib64/lib symlink in ${ROOT}"
+	fi
+	if [ -L ${ROOT}/usr/lib64 ] ; then
+		addwrite ${ROOT}/usr
+		rm ${ROOT}/usr/lib64
+		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
+		ln -s lib64 ${ROOT}/usr/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
+	fi
+	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
+		addwrite ${ROOT}/usr/X11R6
+		rm ${ROOT}/usr/X11R6/lib64
+		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
+		ln -s lib64 ${ROOT}/usr/X11R6/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
+	fi
+}
+
+pkg_preinst() {
+	# PPC64+others may want to eventually be added to this logic if they
+	# decide to be multilib compatible and FHS compliant. note that this 
+	# chunk of FHS compliance only applies to 64bit archs where 32bit
+	# compatibility is a major concern (not IA64, for example).
+	use amd64 && [ "$(get_libdir)" == "lib64" ] && fix_lib64_symlinks
+}
+
+pkg_postinst() {
+	# Correct me if I am wrong here, but my /etc/localtime is a file
+	# created by zic ....
+	# I am thinking that it should only be recreated if no /etc/localtime
+	# exists, or if it is an invalid symlink.
+	#
+	# For invalid symlink:
+	#   -f && -e  will fail
+	#   -L will succeed
+	#
+	if [ ! -e "${ROOT}/etc/localtime" ]; then
+		echo "Please remember to set your timezone using the zic command."
+		rm -f ${ROOT}/etc/localtime
+		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
+	fi
+
+	if [ -x "${ROOT}/usr/sbin/iconvconfig" ]; then
+		# Generate fastloading iconv module configuration file.
+		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
+	fi
+
+	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64
+	then
+		pushd ${ROOT}
+		cd ${ROOT}/lib
+		ln -s ld64.so.1 ld.so.1
+		popd
+	fi
+
+	# Reload init ...
+	if [ "${ROOT}" = "/" ]; then
+		/sbin/init U &> /dev/null
+	fi
+}