Added hardened stuff for hppa from pappy.

5 files changed, 111 insertions, 46 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 4a8edd492eb6..32f3db503f9d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.212 2004/07/22 00:10:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.213 2004/07/22 12:22:00 gmsoft Exp $
+
+  22 Jul 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040619.ebuild:
+  Added hardened stuff for hppa from pappy.
 
   21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
   glibc-2.3.3.20040420.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8c483ce0a996..26ca558f67a5 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,25 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 37d68681c7b12f34032b86d9bde2a0b9 ChangeLog 44997
 MD5 59ce7c72f4a8bb96806b9dd27c30fed2 glibc-2.2.5-r9.ebuild 10617
-MD5 0079bed118bf09a31941a62a7f6789ec glibc-2.3.2-r2.ebuild 18862
-MD5 6e4abb3a2e06a98265f33f81f7e5fb02 glibc-2.3.3.20040420.ebuild 21637
 MD5 d29a012cae7ec6e30964a9f9785468c8 glibc-2.3.1-r5.ebuild 11641
-MD5 8618c7af4c4f3312979e05485640d7f8 glibc-2.3.3_pre20040207.ebuild 20509
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 20aa16c0c5edfd5ecbb3df50c79f2f3c glibc-2.3.2-r10.ebuild 19920
+MD5 0079bed118bf09a31941a62a7f6789ec glibc-2.3.2-r2.ebuild 18862
 MD5 08e69c3dc67abb9cd1d094cc33245ba3 glibc-2.3.2-r9.ebuild 19571
+MD5 6e4abb3a2e06a98265f33f81f7e5fb02 glibc-2.3.3.20040420.ebuild 21637
+MD5 8618c7af4c4f3312979e05485640d7f8 glibc-2.3.3_pre20040207.ebuild 20509
 MD5 43d7d1ecb89705d0ee195f0a3c943fbe glibc-2.3.3_pre20040420.ebuild 20802
 MD5 d3630025279fee17a15ad9976d4aa031 glibc-2.3.4.20040605.ebuild 17581
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 d45303cb2bf99f3400bf923c13813894 glibc-2.3.4.20040605-r1.ebuild 18020
-MD5 ace97ed6cddd6ac9af797ad94700479b glibc-2.3.4.20040619.ebuild 21100
+MD5 37d68681c7b12f34032b86d9bde2a0b9 ChangeLog 44997
+MD5 1cb8bd61be3c4a53dd1c8aa1b21ac741 glibc-2.3.4.20040619.ebuild 21189
 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 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 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 150
 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
@@ -27,16 +27,13 @@ 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 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 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
-MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
-MD5 e151549cd9a9702d310413543864eca4 files/digest-glibc-2.3.4.20040619 307
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 312
 MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605-r1 150
+MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619 307
 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
@@ -56,9 +53,6 @@ MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.dif
 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 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
-MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
-MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
 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
@@ -91,59 +85,56 @@ 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 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
 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 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 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 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
 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 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 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 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
 MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
-MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
-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 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
-MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
-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 fb13e4f68a567426cba3db7623844610 files/2.3.2/ssp.c 3936
+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 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 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 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 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 7457eb3c81a190278cd991f46a7793f3 files/2.3.3/ssp.c 3941
-MD5 69d86fa55810b4d327d0cb35042c034f files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch 538
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA/1TSHTu7gpaalycRAttUAJ4yqyWBGbkj9c/R25twCsMGVWv6CACePFth
-rbVaOt3R8UpQlm+xOTZoVIc=
-=RjY/
------END PGP SIGNATURE-----
+MD5 7457eb3c81a190278cd991f46a7793f3 files/2.3.3/ssp.c 3941
+MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+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
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
new file mode 100644
index 000000000000..3f00ea2d87ea
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
@@ -0,0 +1,69 @@
+diff -u -r -N glibc-2.3.4-hppa/csu/elf-init.c glibc-2.3.4-hppa-hardened/csu/elf-init.c
+--- glibc-2.3.4-hppa/csu/elf-init.c	2004-07-22 12:13:09.207029032 +0200
++++ glibc-2.3.4-hppa-hardened/csu/elf-init.c	2004-07-22 13:24:02.652407048 +0200
+@@ -19,15 +19,14 @@
+ 
+ #include <stddef.h>
+ 
+-#ifdef HAVE_INITFINI_ARRAY
+-/* These magic symbols are provided by the linker.  */
+-extern void (*__preinit_array_start []) (void) attribute_hidden;
+-extern void (*__preinit_array_end []) (void) attribute_hidden;
+-extern void (*__init_array_start []) (void) attribute_hidden;
+-extern void (*__init_array_end []) (void) attribute_hidden;
+-extern void (*__fini_array_start []) (void) attribute_hidden;
+-extern void (*__fini_array_end []) (void) attribute_hidden;
+-#endif
++/* there is no hppalinux.xd and hppalinux.xdc linker script available */
++/* this is why __init_array_start|__init_array_end cannot be resolved */
++/* if we are using hardened with auto PIE, we need to disable startup */
++/* code for such additional arrays normally found in a PROVIDE script */
++
++/* the hppalinux.xd and .xdc scripts can easily be converted from the */
++/* hppalinux.xc shared linker scripts, using diffs from sparc example */
++/* however, the ld does not even automatically use these scripts then */
+ 
+ /* These function symbols are provided for the .init/.fini section entry
+    points automagically by the linker.  */
+@@ -42,41 +41,11 @@
+ void
+ __libc_csu_init (void)
+ {
+-#ifdef HAVE_INITFINI_ARRAY
+-  /* For dynamically linked executables the preinit array is executed by
+-     the dynamic linker (before initializing any shared object.  */
+-
+-# ifndef LIBC_NONSHARED
+-  /* For static executables, preinit happens rights before init.  */
+-  {
+-    const size_t size = __preinit_array_end - __preinit_array_start;
+-    size_t i;
+-    for (i = 0; i < size; i++)
+-      (*__preinit_array_start [i]) ();
+-  }
+-# endif
+-#endif
+-
+   _init ();
+-
+-#ifdef HAVE_INITFINI_ARRAY
+-  {
+-    const size_t size = __init_array_end - __init_array_start;
+-    size_t i;
+-    for (i = 0; i < size; i++)
+-      (*__init_array_start [i]) ();
+-  }
+-#endif
+ }
+ 
+ void
+ __libc_csu_fini (void)
+ {
+-#ifdef HAVE_INITFINI_ARRAY
+-  size_t i = __fini_array_end - __fini_array_start;
+-  while (i-- > 0)
+-    (*__fini_array_start [i]) ();
+-#endif
+-
+   _fini ();
+ }
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040619 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040619
index 5731d06cbb89..a26412bcbe0b 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20040619
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040619
@@ -1,4 +1,4 @@
 MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170
 MD5 2a138a32ffdb52fc1be54088d5d49420 glibc-manpages-2.3.4.tar.bz2 14759
-MD5 c9c4a17c9b9adb362cb46d9014177197 glibc-2.3.4-branch-update-20040619.patch.bz2 2515781
 MD5 28a88631cf36695dd1149155708beeab glibc-hppa-patches-2004-06-04.tar.gz 9528
+MD5 c9c4a17c9b9adb362cb46d9014177197 glibc-2.3.4-branch-update-20040619.patch.bz2 2515781
diff --git a/sys-libs/glibc/glibc-2.3.4.20040619.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619.ebuild
index eefc14a6c7d0..9f462e45e9ba 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040619.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619.ebuild
@@ -1,6 +1,6 @@
 # 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.20040619.ebuild,v 1.19 2004/07/22 05:46:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619.ebuild,v 1.20 2004/07/22 12:22:00 gmsoft Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -343,6 +343,8 @@ do_arch_hppa_patches() {
 		epatch ${i}
 	done
 
+	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
+
 }