Massive cleanup to glibc-2.3.4.20040605's ebuild. See Changelog for details.

4 files changed, 731 insertions, 95 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 596d1cb13a27..f4eeea9ff655 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.184 2004/06/10 20:58:48 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.185 2004/06/11 07:38:36 kumba Exp $
+
+*glibc-2.3.4.20040605-r1 (11 Jun 2004)
+
+  11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  +glibc-2.3.4.20040605-r1.ebuild:
+  MASSIVE cleanup to glibc's ebuild. Starting with 2.3.4.20040605, the following
+  changes were made:
+  - Moved PaX patches into its own function
+  - Moved all arch-specific patches into their own arch-specific 
+    functions
+  - Archs that lack any patches have empty arch-specific functions 
+    for later use
+  - Hardened/relro/nptl related tweaks moved into its own function
+  - Cleaned up 'if' conditionals and some spacing
+  - Added some missing tweaks that fixed an issue on non-hardened 
+    toolchains w/ nptl where the build would segfault during the 
+    sunrpc subsection of glibc
 
   10 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605.ebuild:
   passes "make check" on ppc64, adding ~ppc64 keyword
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4414481b87eb..c80d276ea7c9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,141 +1,143 @@
+MD5 62384e32807f25cb1f034df6a2d6f118 ChangeLog 38627
+MD5 0fa1291bf0fde4988100d42852d25df6 glibc-2.2.5-r9.ebuild 10001
+MD5 6c9ed0aa642c902139be296250465829 glibc-2.3.1-r5.ebuild 10718
+MD5 aaa34484bbb3516cc6b220d8345a60d7 glibc-2.3.2-r10.ebuild 19417
+MD5 686df5ad46c050c1dddeed661b3917b9 glibc-2.3.2-r2.ebuild 17967
+MD5 fdde279e769f609d445974403c9e5b09 glibc-2.3.2-r9.ebuild 18656
 MD5 5052e9567851d7500bf53412ac5fdf5e glibc-2.3.3.20040420.ebuild 20349
-MD5 22ddf107c3e48edbece07166517dbc7a glibc-2.3.3_pre20040117-r1.ebuild 19231
-MD5 00f71cf6b178a50ca7792b65ebc1f5bc glibc-2.3.3_pre20040207.ebuild 19593
 MD5 488e8b7878e9e8a11be594b3e16ee0f4 glibc-2.3.3_pre20031210.ebuild 19014
-MD5 675c7d0b2383a6e09f765dc23e5cfdec glibc-2.3.3_pre20040529.ebuild 21577
-MD5 aaa34484bbb3516cc6b220d8345a60d7 glibc-2.3.2-r10.ebuild 19417
-MD5 46673e2c9e04bf84be8cdb5fb67bc79c glibc-2.3.4.20040605.ebuild 16307
+MD5 22ddf107c3e48edbece07166517dbc7a glibc-2.3.3_pre20040117-r1.ebuild 19231
 MD5 67753229fcc7169eb9e648263dfda5f4 glibc-2.3.3_pre20040117.ebuild 18525
-MD5 686df5ad46c050c1dddeed661b3917b9 glibc-2.3.2-r2.ebuild 17967
-MD5 6c9ed0aa642c902139be296250465829 glibc-2.3.1-r5.ebuild 10718
-MD5 689f7194188e84bd9bf9ded48477316b ChangeLog 37907
+MD5 00f71cf6b178a50ca7792b65ebc1f5bc glibc-2.3.3_pre20040207.ebuild 19593
+MD5 c23895663336e927a4b2be982d398b08 glibc-2.3.4.20040605-r1.ebuild 17562
 MD5 4a439bb638a3309eb4302b0bdc0153da glibc-2.3.3_pre20040420.ebuild 19886
+MD5 675c7d0b2383a6e09f765dc23e5cfdec glibc-2.3.3_pre20040529.ebuild 21577
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 0fa1291bf0fde4988100d42852d25df6 glibc-2.2.5-r9.ebuild 10001
-MD5 fdde279e769f609d445974403c9e5b09 glibc-2.3.2-r9.ebuild 18656
-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 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 312
+MD5 46673e2c9e04bf84be8cdb5fb67bc79c glibc-2.3.4.20040605.ebuild 16307
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
 MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
-MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
-MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
-MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
-MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
 MD5 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148
 MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312
+MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
 MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
+MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605-r1 150
 MD5 268eda0de40469d19bb7ff5c5cb7ec82 files/digest-glibc-2.3.3_pre20040529 312
-MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
-MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+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 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
+MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
+MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
-MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
-MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
-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 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
+MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 312
+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 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 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+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 b07a316cbba4ddc1e1bb094a3056f12f files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
 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 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 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
-MD5 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
+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 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
+MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
-MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
-MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
 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 035d42c51f2397339c1518baa06e3a81 files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
-MD5 1f715052e230f60a1e5c5f72b193f0bf files/2.3.1/glibc-2.3.1-sscanf.patch 392
+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 4123a64b0004d505d22d811ba4aae451 files/2.3.1/glibc-2.3.1-ftw.patch 4622
 MD5 0da8ef4341ed31232e1c9e0da96f9c79 files/2.3.1/glibc-2.3.1-getgrouplist.patch 1680
-MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
+MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
-MD5 a49946706c7f248294896eeb64308a09 files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
-MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
-MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
+MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
 MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
+MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
+MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
+MD5 1f715052e230f60a1e5c5f72b193f0bf files/2.3.1/glibc-2.3.1-sscanf.patch 392
 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 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
+MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
+MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
+MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
 MD5 b8f6b8b0ed8649fc9af439adef7472f2 files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
-MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
+MD5 7f8ec486f1669036429acc8b272c453e files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
+MD5 a49946706c7f248294896eeb64308a09 files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
+MD5 035d42c51f2397339c1518baa06e3a81 files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
 MD5 a91843899c8ef4b59341313915f177b4 files/2.3.1/glibc23-05-hppa-buildhack.dpatch 1134
-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 2b746db4988cf7f5c6824302561b7eb5 files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
-MD5 4123a64b0004d505d22d811ba4aae451 files/2.3.1/glibc-2.3.1-ftw.patch 4622
-MD5 7f8ec486f1669036429acc8b272c453e files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
-MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
-MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
-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 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
+MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
+MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
 MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
-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 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 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 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 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
-MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
+MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
 MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
-MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
 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 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 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 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
-MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
 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 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
+MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
+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 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
-MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
 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 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720
-MD5 75b0564e75dfe204b729f0fa80481f00 files/2.3.3/ssp.c 3935
-MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
-MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
+MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
 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 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 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 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 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 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 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 75b0564e75dfe204b729f0fa80481f00 files/2.3.3/ssp.c 3935
+MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720
+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
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040605-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040605-r1
new file mode 100644
index 000000000000..0dce5380fd56
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040605-r1
@@ -0,0 +1,2 @@
+MD5 b88086b30c6df8dafb983efed80f5a22 glibc-2.3.4.20040605.tar.bz2 13728433
+MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
diff --git a/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild
new file mode 100644
index 000000000000..f3af25e14856
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild
@@ -0,0 +1,615 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild,v 1.1 2004/06/11 07:38:37 kumba Exp $
+
+IUSE="nls pic build nptl erandom hardened makecheck multilib"
+
+inherit eutils flag-o-matic gcc
+
+# make check will fail if sandbox is enabled
+export SANDBOX_DISABLED="1"
+
+# Recently there has been a lot of stability problem in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from himeself) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
+strip-unsupported-flags
+
+
+# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+export CFLAGS="${CFLAGS//-O?} -O2"
+export CXXFLAGS="${CFLAGS}"
+export LDFLAGS="${LDFLAGS//-Wl,--relax}"
+
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+SRC_URI="http://dev.gentoo.org/~lv/${P}.tar.bz2
+		 http://dev.gentoo.org/~lv/glibc-infopages-2.3.4.tar.bz2"
+HOMEPAGE="http://sources.redhat.com/glibc/"
+SLOT="2.2"
+LICENSE="LGPL-2"
+KEYWORDS="-*"
+
+
+# We need new cleanup attribute support from gcc for NPTL among things ...
+# We also need linux-headers-2.6.6 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/linux-headers-2.6* )
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/os-headers
+	sys-apps/baselayout
+	nls? ( sys-devel/gettext )"
+
+PROVIDE="virtual/glibc"
+
+
+# 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 come useful for testing kernel-headers without screwing up
+# whole system
+[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="/usr/include"
+
+
+setup_flags() {
+	# -freorder-blocks for all but ia64 s390 s390x
+	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.
+		replace-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
+			replace-flags "-mcpu=ultrasparc" ""
+			replace-flags "-mcpu=v9" ""
+
+			# Get rid of flags known to fail
+			replace-flags "-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
+
+
+	# temporary fix for a few gcc 3.4 related problems
+	# note: the problem this fixes should no longer exist as of gcc
+	# 3.4.0-r6. i'll keep this around for a short time longer since not
+	# everyone recompiles their compiler at every upgrade...
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		filter-flags -funit-at-a-time
+		append-flags -fno-unit-at-a-time
+	fi
+
+
+	# We don't want these flags for glibc
+	filter-flags "-fomit-frame-pointer -malign-double"
+	filter-ldflags "-pie"
+}
+
+
+want_nptl() {
+	(use amd64 || use ppc || use ppc64 || use sparc || use s390 || \
+		use ia64 || use alpha) && return 0
+	use x86 && if [ "${CHOST/-*}" = "i486" -o "${CHOST/-*}" = "i586" -o \
+		"${CHOST/-*}" = "i686" ] ; then return 0 ; fi
+	return 1
+}
+
+
+want_tls() {
+	(use amd64 || use ia64 || use s390 || use alpha || use sparc || \
+		use ppc || use ppc64 || use x86) && return 0
+	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!"
+		sleep 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 nls || use makecheck); then
+		einfo "nls or makecheck in USE, installing -ALL- locales..."
+		install_locales
+	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
+
+	if want_nptl; then
+		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
+
+	elif use nptl &> /dev/null; then
+		echo
+		# Just tell the user not to expect too much ...
+		ewarn "You have \"nptl\" in your USE, but your kernel version or"
+		ewarn "architecture does not support it!"
+	fi
+	echo
+}
+
+
+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.3/${PN}-2.3.3_pre20040117-got-fix.diff
+}
+
+
+do_arch_amd64_patches() {
+	cd ${S};
+	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-amd64-nomultilib.patch
+}
+
+
+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
+}
+
+
+do_arch_hppa_patches() {
+	cd ${S};
+
+	# Any needed patches for hppa go here
+}
+
+
+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.1/${PN}-2.3.1-fpu-cw-mips.patch
+	epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff
+	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
+	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
+	epatch ${FILESDIR}/2.3.3/semtimedop.diff
+	epatch ${FILESDIR}/2.3.3/mips-sysify.diff
+	epatch ${FILESDIR}/2.3.4/mips-sysdep-cancel.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};
+
+	# Any needed patches for x86 go here
+}
+
+
+do_hardened_fixes() {
+	# disable binutils -as-needed
+	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
+
+	# mandatory, if binutils supports relro and the kernel is pax/grsecurity enabled
+	# solves almost all segfaults building the locale files on grsecurity enabled kernels
+	use build && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig
+	use build || (use hardened && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig)
+
+	# disables building nscd as pie
+	use hardened || sed -e 's/^have-fpie.*/have-fpie = no/' -i ${S}/config.make.in
+
+	# disable completely relro usage (also for ld.so)
+	use hardened || sed -e 's/^have-z-relro.*/have-z-relro = no/' -i ${S}/config.make.in
+	use hardened || sed -e 's/HAVE_Z_RELRO/USE_Z_RELRO/' -i ${S}/config.h.in
+}
+
+
+src_unpack() {
+	unpack ${A}
+
+	# Version Patch
+	cd ${S}
+	einfo "patching version to display snapshot date"
+	sed -i -e "s/stable/2004-06-05/" -e "s/2\.3\.3/2.3.4/" version.h
+
+	# Extract pre-made man pages.  Otherwise we need perl, which is bad (especially for stage1 bootstrap)
+	mkdir -p ${S}/man
+	cd ${S}/man
+	tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
+	cd ${S};
+	unpack glibc-infopages-2.3.4.tar.bz2
+
+	cd ${S}
+
+	# 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
+
+
+	# PaX-related Patches
+	do_pax_patches
+
+
+	# 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
+
+
+	# hardened toolchain/relro/nptl/etc fixes
+	do_hardened_fixes
+
+
+	# Remaining patches
+	cd ${S}
+
+	# patch this regardless of architecture, although it's ssp-related
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-frandom-detect.patch
+
+	# Sanity check the forward and backward chunk pointers in the
+	# unlink() macro used by Doug Lea's implementation of malloc(3).
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff
+
+	# We do not want name_insert() in iconvconfig.c to be defined inside
+	# write_output() as it causes issues with trampolines/PaX.
+#	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-iconvconfig-name_insert.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"
+	use hardened && myconf="${myconf} --enable-bind-now"
+
+	if (use nptl && 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
+
+	# we dont want to enable tls ourselves, as this can cause catalyst to fail
+	# for some people on some archs.
+	want_tls || myconf="${myconf} --without-tls"
+
+	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 \
+		${myconf} || die
+
+	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
+
+	# 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 [ -z "`use build`" ]; then
+		cd ${WORKDIR}/build
+
+		einfo "Installing Info pages..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			info -i
+
+		setup_locales
+
+		einfo "Installing man pages and docs..."
+		# Install linuxthreads man pages
+		want_nptl || {
+			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
+
+	use makecheck && do_makecheck
+}
+
+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
+
+	# Reload init ...
+	if [ "${ROOT}" = "/" ]; then
+		/sbin/init U &> /dev/null
+	fi
+}
+