Security bump to address CVE-2005-3352. Fixes bug 118875

Package-Manager: portage-2.1_pre4-r1

6 files changed, 729 insertions, 13 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 9a6cf3f43689..120ffbdc31ee 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.456 2006/01/19 08:42:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.457 2006/02/01 01:49:58 vericgar Exp $
+
+*apache-1.3.34-r11 (31 Jan 2006)
+*apache-1.3.34-r2 (31 Jan 2006)
+
+  31 Jan 2006; Michael Stewart <vericgar@gentoo.org>
+  +apache-1.3.34-r2.ebuild, +apache-1.3.34-r11.ebuild:
+  Security bump to address CVE-2005-3352. Fixes bug 118875
 
   19 Jan 2006; Bryan Østergaard <kloeri@gentoo.org
   apache-2.0.54-r16.ebuild, apache-2.0.55-r1.ebuild:
@@ -35,7 +42,7 @@
 
   16 Jan 2006; Michael Stewart <vericgar@gentoo.org>
   +apache-2.0.54-r16.ebuild, +apache-2.0.55-r1.ebuild:
-  Security bump. Fixes bugs 115324 and 118874.
+  Security bump. Fixes bugs 115324 and 118875.
 
   15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> apache-2.0.55.ebuild:
   Stable on amd64, bug 117835.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index b39f5b68e1a9..383eb6fa7001 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,77 +1,213 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f38871ad72290ca72ce6a1890a353381 ChangeLog 75962
+MD5 144a2865c64834538d8fe3e183ff0423 ChangeLog 76198
+RMD160 261fe286e9e31c9432952477668a6f5c64ef2f90 ChangeLog 76198
+SHA256 87cb6d6166d7d027dbb7290188ace4f8744b42bea8eb758a37b775a7ff0e44b4 ChangeLog 76198
 MD5 26a30fcfe2a6fbbf994b64756ed4f604 apache-1.3.32-r1.ebuild 6685
+RMD160 bed06d46549aa916c55c4010abb6200250aab467 apache-1.3.32-r1.ebuild 6685
+SHA256 960a79fc39624020599cb70dde4ed7c460ad924373755cfbffb0359f700f9c4d apache-1.3.32-r1.ebuild 6685
 MD5 f154daabfa5b59d9597f8ede26b839d2 apache-1.3.33-r13.ebuild 8674
+RMD160 2fba1f0d2e56dc0e630df1b36a4fb8dbc551fbba apache-1.3.33-r13.ebuild 8674
+SHA256 0ec97429b258a4e916eca95dd4ba380aea88981d4737bb8c94bc4c9da7b562f5 apache-1.3.33-r13.ebuild 8674
 MD5 17e12318b6dd1cd8bb25cb987490c7fd apache-1.3.33-r6.ebuild 7108
+RMD160 9ec568d6e5ea7bd132cbbcdb47522340ed559c1a apache-1.3.33-r6.ebuild 7108
+SHA256 9ea37ad4884445ca6b40dd7f3a8d59dbb8637c1e5dc0c5289fa330ff3f4478ee apache-1.3.33-r6.ebuild 7108
 MD5 f98b6437e47b471cea336f1cbb6ac240 apache-1.3.34-r1.ebuild 7114
+RMD160 244cc283b19e91009a44ac55d506dbb202a8c3e8 apache-1.3.34-r1.ebuild 7114
+SHA256 d60af100e42506d43c935a6b5d3183ef445b98d83fe190a3d6bf0ba31d2c724a apache-1.3.34-r1.ebuild 7114
 MD5 e02ad2c00da303544c5850938dedde06 apache-1.3.34-r10.ebuild 8672
+RMD160 5bc99feee1c187b7f3753d20f8b190d77d2794f8 apache-1.3.34-r10.ebuild 8672
+SHA256 42c5882c220cc0855c0146c7c4074a9503c3b4a8e0e61c5c71097c18a6bd2069 apache-1.3.34-r10.ebuild 8672
+MD5 43ade1090644e630e907a9826dd16bc6 apache-1.3.34-r11.ebuild 8828
+RMD160 a2c9b5c88d29283411ce71d9b196e3be1542dd98 apache-1.3.34-r11.ebuild 8828
+SHA256 c9e713803d2b533fb8580654410a0192d7d97a1cbc6554476e0575fcc39e13a0 apache-1.3.34-r11.ebuild 8828
+MD5 8b53b5537e731c0e70154a7e92184a47 apache-1.3.34-r2.ebuild 7166
+RMD160 2bbc60e54d3d86c1ce66aa6f670006e9abc78d5b apache-1.3.34-r2.ebuild 7166
+SHA256 abe9ad88cebce0848ce334d1a7ec034a97e75d6b7b7f81d0a75c439611e820af apache-1.3.34-r2.ebuild 7166
 MD5 8dfa3f0fbdc01264e754bd3ebf7b8a5a apache-2.0.54-r15.ebuild 12594
+RMD160 974ba25bceab1954ed83c641f2811989fef74621 apache-2.0.54-r15.ebuild 12594
+SHA256 356004a57895403a62071ab5bad0f2ea0eb8ba0c7f290880336de6ed48b4e597 apache-2.0.54-r15.ebuild 12594
 MD5 8523c2d699f3e179775df99f510ad323 apache-2.0.54-r16.ebuild 13045
+RMD160 02f00b8076a072eae23f96bc405cc5dbd206755e apache-2.0.54-r16.ebuild 13045
+SHA256 e62e402d035f7b2c56508bea278b0d7b512359d349274244804f6208a9d8f33f apache-2.0.54-r16.ebuild 13045
 MD5 be59fbc220730a0212fbf6f34a1a6652 apache-2.0.54-r30.ebuild 12930
+RMD160 39cb147f6db9d7d64207124000c09c89abc85a89 apache-2.0.54-r30.ebuild 12930
+SHA256 01cb3644a174f831ee50e7f0f645678f4275714708be80a81e0876725c10c60b apache-2.0.54-r30.ebuild 12930
 MD5 17f7420f9957d17a514ee70bc4786a25 apache-2.0.54-r31.ebuild 13375
+RMD160 52e207e76c61d66934d886904fbc0090f313c5f6 apache-2.0.54-r31.ebuild 13375
+SHA256 a9c4dc3f5083f17f60ca09f9d50eeff7799272348f1c82dcf537cc2e5cc3efc2 apache-2.0.54-r31.ebuild 13375
 MD5 e1e33b99a1b8f95a419f0e95a6ebb2dc apache-2.0.54-r9.ebuild 12595
+RMD160 f895408b50d3d6ae1eb1203aa1fa62ec7b4963fc apache-2.0.54-r9.ebuild 12595
+SHA256 ead56d4310f2920a7c8b0e57895cde1e1cbebaf14496c17a7a393d29ad0f7d68 apache-2.0.54-r9.ebuild 12595
 MD5 dd51c3afe05262ec8243d43b8f800d98 apache-2.0.55-r1.ebuild 13372
+RMD160 b5c01391ee0a0e7d3e5e9c99b2ad8af3812176f2 apache-2.0.55-r1.ebuild 13372
+SHA256 f2392d16809ced1641b3e4b74fc551e1e4cc24a6db776269ff27d6d7322a4b7c apache-2.0.55-r1.ebuild 13372
 MD5 2eef71adb67bd3ddf3f8c4743a5ebe6a apache-2.0.55.ebuild 13370
+RMD160 621677a89b2efc48a78fab130594d871f8f74e1c apache-2.0.55.ebuild 13370
+SHA256 b9048c96a2f8103c755b9640fb25993eddbb3cf49134ea7703cea0d2a58c4f5e apache-2.0.55.ebuild 13370
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
+RMD160 d2e6224ca1621f7cf29c163c3c04e06aca7b7bde files/00_apache_manual.conf 781
+SHA256 068450680c6fec43b963360e0291f1e47cc1a1c0296efb46a0a4eb75eb891f4b files/00_apache_manual.conf 781
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
+RMD160 f523b051a375b8690431d68eba580829f2aefab6 files/2.0.49/40_mod_ssl.conf 3213
+SHA256 0472863a33a729ac32cfde96ba7203fa9a8ecd8a221c9526824575a9f1bcae41 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+RMD160 4b0e8cbd9fcbb3ef6e7f44b694f9dab8cb5c011c files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+SHA256 ddbbf6566b49bc07d6d7c9f552f93a3cda683779d85574ef0d9fa54cc52631a6 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
+RMD160 914b31676336f47c50cc0e53df7239adf3aacb84 files/2.0.49/45_mod_dav.conf 583
+SHA256 8a3d913b67d3e417475a5add014f8c7e30df0cc804bde9efa7d2251f9e6ef714 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+RMD160 5109eb1fcd2def65089802c11d9f555bb1b2eb58 files/2.0.49/46_mod_ldap.conf 902
+SHA256 1383629d9c9b931878abe5b5ce3fbd1c5e935941cc31963f7607783008857765 files/2.0.49/46_mod_ldap.conf 902
 MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
+RMD160 8caa10fe99459fdde9631bf13a7c665edb096c67 files/2.0.49/apache2-builtin-mods 2215
+SHA256 c9d05ef4035781233997958ceb148ee4e7cf00bdf0d621a2539aa589f3d8b4d3 files/2.0.49/apache2-builtin-mods 2215
 MD5 b4ad5009680a25a5fe68acb6a657bf38 files/2.0.49/apache2.confd 1739
+RMD160 9f314075eb16ab0b919b7e7600cf541bc1d6cbdd files/2.0.49/apache2.confd 1739
+SHA256 39df5e367f91705f75c98b1cddf1a22da6bbc49c59dd106d16eb132bfe619799 files/2.0.49/apache2.confd 1739
 MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
+RMD160 c6d16f46c2a8453d5c87aac72d85e075f3dc65a5 files/2.0.49/apache2.initd 2494
+SHA256 ef09e0929a9cce499115bada0d5311a1c92b4f5befa7e31a223d049f03c052c0 files/2.0.49/apache2.initd 2494
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+RMD160 90e5a41ab9c4e4a6294a2a77aff258849c5f0097 files/2.0.49/apache2logserverstatus 4652
+SHA256 70624f113722c94a43fee5cb5edd476fcc6268dd24b5429ef7116b469b6cbb77 files/2.0.49/apache2logserverstatus 4652
 MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
+RMD160 79610bf8eb401d4c79560e82a73dc995d2f08797 files/2.0.49/apache2splitlogfile 4875
+SHA256 a9065fba8eb264b9ffc41cc3cd9959a972686d95bc2ea73a0c44027882816b8c files/2.0.49/apache2splitlogfile 4875
 MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
+RMD160 b5d2b2e5207d1bd7a7f2fdb807ea547394e53394 files/2.0.49/gentestcrt.sh 8807
+SHA256 b402634a17c5caf9d92ff7131f08b144499625b3958f90645fffb41d176a5e40 files/2.0.49/gentestcrt.sh 8807
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
+RMD160 36cc44f38597ab3d9ab0681f1146e0d7938990f3 files/apache-2.0.48-export.diff 706
+SHA256 59357f09d472285619900c8e60f491024297f8c09a28f65bd151bf773e45b1e6 files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
+RMD160 e30f27531a2dfe6afd67c9a39838fcfd38e6b832 files/apache-2.0.48-gentoo.diff 5905
+SHA256 76ebe2783e912aa3a3f246c7ce93820502d30790a7da5e95a03dccbe9e7b34eb files/apache-2.0.48-gentoo.diff 5905
 MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
+RMD160 63f46ae65ce2f3b86b818ee46745e808f0e793b5 files/apache-2.0.49-gentoo.diff 6316
+SHA256 779d7e902e7ac2edc51ecb2c2b0521b4a6761d8c65248ca6f526c0b7902747b9 files/apache-2.0.49-gentoo.diff 6316
 MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
+RMD160 5bed76f987beee2fe4d9a7710689317c0a279b02 files/apache-builtin-mods 2467
+SHA256 82ffc220a9775757f93c038d01a2d4047e6a659ca4bfe6f133db00e1a4b015b9 files/apache-builtin-mods 2467
 MD5 7cb8706ad248283bac9c01f39b82c1ed files/apache.confd 798
+RMD160 0f5d9b5fa0acd0e061a3b8fc2c258dc203a50221 files/apache.confd 798
+SHA256 e1163c4bf2daf70ec31facd017e3a6974b5df7791aee4375445c8dbc3698418f files/apache.confd 798
 MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078
+RMD160 7119f2b7301cbd1f413ad90be6a7d0cfc8a67aba files/apache.rc6 1078
+SHA256 d724061344fe59e9efb31ea45c7d2cb3c90cc8f4c0602d4f7a338ecd2c60e19f files/apache.rc6 1078
 MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331
+RMD160 3363d75289f38cc4b90f7965e088298bc54bf964 files/apache2 331
+SHA256 3aa139ed4f21342c3c799671343c71747a345c29905dd9ec8698322730a9159c files/apache2 331
 MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
+RMD160 15f1aa1f00627b737e4e0f983c573c0445c2043f files/apacheaddmod 5979
+SHA256 0af0edf3690d91604f23542ed0534b58365dcde19cedcd4ca4d381a64669c4be files/apacheaddmod 5979
 MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
+RMD160 62e5c34a6232ea964f5808ca9194617602e12d38 files/apachedelmod 3187
+SHA256 94932dec1f2d865909b0c047ebd9229433aec6f5b6e666d1731973e1d529aac6 files/apachedelmod 3187
 MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
+RMD160 959a79463dee9d920a1aab95f215a3533317912b files/apachelogserverstatus 4765
+SHA256 6bf7beb97f35acdb47a7fc46c65310cb36eb03c09f851c02c518ca4077e343e6 files/apachelogserverstatus 4765
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
+RMD160 88c201729bd8b0d2c6d7b22cf7b13415d2db0893 files/apachesplitlogfile 5068
+SHA256 2761448943358d5a962f7f3e94974118d04146fc7d9d1b576b578819142dd016 files/apachesplitlogfile 5068
 MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
+RMD160 385751c8277551d73400d25ffca07d31efa73faa files/common/apr-config.layout 434
+SHA256 0829f1bc7279b43a4db68583c1cd545fcec23767342bae46564ce8523cb41d90 files/common/apr-config.layout 434
 MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+RMD160 3082d1005bb848028e2750ee633f09d134b483fd files/common/apr-util-config.layout 437
+SHA256 764669574b71d2793c182b06e5332490bf7e31ee0f9043483e4c77aed66abd1a files/common/apr-util-config.layout 437
 MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+RMD160 b00e5897bae6ebe4f8045dbe77646516af72e1e8 files/common/config.layout 741
+SHA256 7fb1ac9c2cc51625ee86c97909d6af940188dd25f99274ef9309b1d5969333b2 files/common/config.layout 741
 MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
+RMD160 552c81595f4cab589ead57a56e85831b4a550a14 files/conf/DynamicVhosts.conf 965
+SHA256 6cc0ec625849b342540be1e9a64c3f6cb226aebf4b303ca07700e83d98ad0052 files/conf/DynamicVhosts.conf 965
 MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
+RMD160 b82e2399230b950daa8052a01edf7131e3ebbf09 files/conf/Vhosts.conf 1910
+SHA256 f9f89e8fea6ff38345ab82e03aef4600168c0546e5c4880877e2fecea9d7b1a1 files/conf/Vhosts.conf 1910
 MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
+RMD160 1b5b43ba1697294f929e2d36cf705abf8b684be7 files/conf/VirtualHomePages.conf 909
+SHA256 e2a295fda6147311652987a3ab0a7d74efd3d0b6e6af30f29ef0705857bd84f7 files/conf/VirtualHomePages.conf 909
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
+RMD160 fdcb78e04cd5fdb02e98c4d3abc4506d44cf4778 files/conf/apache.conf 8115
+SHA256 390c2f7689ee598b7b66e2955328d0586a7d0d4799b455d774f553fdd16599d4 files/conf/apache.conf 8115
 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
+RMD160 abb82a86fa4bdef199edd09bedd94a2286fb22f6 files/conf/commonapache.conf 22216
+SHA256 1b51dcc085fb84a7c77e25e4546cf4cf5102baa0933b59c40218f03587f97a33 files/conf/commonapache.conf 22216
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
+RMD160 5912b8af05eac83e53fdc7c5c2c6c0842c9cad35 files/digest-apache-1.3.32-r1 215
+SHA256 44d761485da2a8c55a0810e06b9ada7e805e30c349d370a56d2e6ab3c773be45 files/digest-apache-1.3.32-r1 215
 MD5 66e608b207d3ee040c7ba712f97f675d files/digest-apache-1.3.33-r13 287
+RMD160 3094b9d71a1a06fcc161ec749638e3c03a82af4d files/digest-apache-1.3.33-r13 287
+SHA256 27cb8a72179f0df232140e42866dd61d01e541799961b67c3aa1e7d262e3ac26 files/digest-apache-1.3.33-r13 287
 MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
+RMD160 46adab4d96c6ab10e296da0926de6f09c48e9334 files/digest-apache-1.3.33-r6 221
+SHA256 73c903a6e45e304d9f8171cd9f768c57f6218724487847d6d12f000664fbcb7c files/digest-apache-1.3.33-r6 221
 MD5 33b6746d8bc97e23fd7f4420ad437b8c files/digest-apache-1.3.34-r1 221
+RMD160 7a66ebeba8403a446619c48920a5b332a0bcce95 files/digest-apache-1.3.34-r1 221
+SHA256 293b3b54ffe2fbbf273954a3e33ae2e21eebe77a77ffd3e1a65ae91edd88761f files/digest-apache-1.3.34-r1 221
 MD5 947bc1e2e4792fd492a8d90f7abe9e78 files/digest-apache-1.3.34-r10 287
+RMD160 8a20b5e5d2bac6a97a2611da33218352e33618e1 files/digest-apache-1.3.34-r10 287
+SHA256 c0436c24dd434ae303ef55deecc2f8b0f9c35593f93dcfad7863bf561e65ed2c files/digest-apache-1.3.34-r10 287
+MD5 28f84009f98e91a8c9404b699ac1a866 files/digest-apache-1.3.34-r11 287
+RMD160 45b16af81aa6a795892b4e257d40b6dacaa4d15f files/digest-apache-1.3.34-r11 287
+SHA256 e5f56d131b8d7c9bc65a0339719be5ef60da0e09c36519cd79c517ddcb6ebef8 files/digest-apache-1.3.34-r11 287
+MD5 7c1e50fb29722c9a4a33ae08ca6647c4 files/digest-apache-1.3.34-r2 801
+RMD160 f40358306caffff99efda1a8d432513bcf4fbac3 files/digest-apache-1.3.34-r2 801
+SHA256 187063455d10b24f7b18c80364ae43637e5c0ef30a99d14b5b797f16d10a2f05 files/digest-apache-1.3.34-r2 801
 MD5 282e8f0ae737d778a643251ad4f21122 files/digest-apache-2.0.54-r15 217
+RMD160 a1813690dab735cf6c491efab3077d1115b33bd7 files/digest-apache-2.0.54-r15 217
+SHA256 f9f1e3b6bc9265cbbea1f27c892d686c031fe29237e7c3b2f27b78a7961ba202 files/digest-apache-2.0.54-r15 217
 MD5 548fdbc1f64f79b0bcda8af19d1c1f8c files/digest-apache-2.0.54-r16 217
+RMD160 e088695340beff7956770514dfebfe82fcb8e91f files/digest-apache-2.0.54-r16 217
+SHA256 a57999926291c97cfdfb07e486c13e67b862bc6d689a560f97c88144fec59073 files/digest-apache-2.0.54-r16 217
 MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
+RMD160 16beddce9293f4175659c19d0988daec0d7fd2de files/digest-apache-2.0.54-r30 151
+SHA256 d7ab136507f3baa7859d3f72c8414601e423c9519bb572e15bd61d609a6de3fa files/digest-apache-2.0.54-r30 151
 MD5 f3ab77f6b13c80af68614aa80de7af2b files/digest-apache-2.0.54-r31 154
+RMD160 11dc4a3e5c8f83bf0e6128b5edd170da8e6ff771 files/digest-apache-2.0.54-r31 154
+SHA256 8b8b7a26f61e2d8ca75875f2feebe0bd58619e1b9724041a55ba8a99a786ef52 files/digest-apache-2.0.54-r31 154
 MD5 35d8cf2217559d96a69696d69f4c85cc files/digest-apache-2.0.54-r9 214
+RMD160 2927e35b27eab50c6c5dbcb2ebbf8e43cc06933a files/digest-apache-2.0.54-r9 214
+SHA256 23f1f61016f659107990eeb9929a7a3bf5f37ad8b6de2a12373d473417193609 files/digest-apache-2.0.54-r9 214
 MD5 76c56212c3095c58a713ffb7d5263cdf files/digest-apache-2.0.55 147
+RMD160 1c6a4a1379e9f908df47c74707c4888d54ccb24c files/digest-apache-2.0.55 147
+SHA256 08f9bd778fff1f0480864c99106c095cb7919943cdd9c1daa8c3d4aa143fa0a4 files/digest-apache-2.0.55 147
 MD5 d505d0e0fb4d17095848855d54c6b0f1 files/digest-apache-2.0.55-r1 150
+RMD160 6a44c9b3b1b54ae34f1ef3938b4512b24378c61a files/digest-apache-2.0.55-r1 150
+SHA256 5f1294744eca94fff4fdc4104980b9b7864a752224873293f3517f5df0ebb711 files/digest-apache-2.0.55-r1 150
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
+RMD160 0309ce8d85fe499997a879205e4909e604599051 files/httpd-2.0.48-ipv6.patch 865
+SHA256 aba5ff0caafc53ac3cc391f1776ad3c49d44ca878ba81330e81578ab9dcaad67 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
+RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 files/httpd-2.0.49-cgi.patch 10319
+SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
+RMD160 daf60de982736170f6d5ea1ff297ff3ceda14c41 files/httpd-2.0.49-ipv6.patch 788
+SHA256 606033033b4d6d8227cb9f1e1f0cae23f1bd30ced58bcd2797b72b09e28d0413 files/httpd-2.0.49-ipv6.patch 788
 MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+RMD160 e266b745db890b5b6e1009ac631346d220da33c4 files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+SHA256 24b172530a7b8a689e5d8ef0d0fc1e9c2204c7b4228b01b1f2785a35c9bc5d3e files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
 MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
+RMD160 b064dcf02b90e5cb017f9c25cc0f659acdfa4983 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
+SHA256 b0251805126dccc0a289d5d567978fff03060d983588d7995b889af1b559c9dc files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
+RMD160 056acf62b2354be73b3e97dc13d11f655ac2526b files/patches/2.0.49-r1/04_ssl_makefile.patch 619
+SHA256 55370d58a308c2b242c56be9aeaed85fbdb37fc4859e33cb00c07e01eb26421f files/patches/2.0.49-r1/04_ssl_makefile.patch 619
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
+RMD160 27b7cb6ef0ecab8d8336e4f0b4fadcc9972550c3 files/patches/2.0.49-r1/Readme.PATCHES 507
+SHA256 892df4db5d01e6e9f666c825eab075c5be4f4b23c1971efaf85ac3591716155e files/patches/2.0.49-r1/Readme.PATCHES 507
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
+RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
+SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
+RMD160 c007845abf1663f317a94d1749ecc6d975acbc1c files/robots.txt 342
+SHA256 ffc42ca609582241958a5b560dc65e596116d3f9123208a3c1e29d56ba61c5f8 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+RMD160 f271f5be1683fb60ec9611615ecf43af44cb0ba8 files/suexec.pam 59
+SHA256 565ea6eff7004c4933f5afddb9b0170359707e1e59884947463613ba3e13319b files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+RMD160 bc2da04439fde40ce90826aab721239e2cf05e23 files/suexec_pam_gentoo.patch 2149
+SHA256 32618a274dd2433d5d3f6295c7047fc7caf16763ec4fa4a6234c92fe08d3b606 files/suexec_pam_gentoo.patch 2149
 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDz4VO2+ySkm8kpY0RApnaAJ4gXtKltN1TPFdOpIptd2vVFtotsQCgnGSm
-dlEG+VFQJ3LHxQznTlj6lnE=
-=moSK
------END PGP SIGNATURE-----
+RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566
+SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 metadata.xml 566
diff --git a/net-www/apache/apache-1.3.34-r11.ebuild b/net-www/apache/apache-1.3.34-r11.ebuild
new file mode 100644
index 000000000000..e3480bac6b54
--- /dev/null
+++ b/net-www/apache/apache-1.3.34-r11.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r11.ebuild,v 1.1 2006/02/01 01:49:59 vericgar Exp $
+
+inherit eutils fixheadtails multilib
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHSTAMP="20060131"
+GENTOO_DEVSPACE="vericgar"
+GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
+
+# The mod_ssl archive is only for providing the EAPI patch in here.
+# You should install the net-www/mod_ssl package for the actual DSO.
+mod_ssl_ver=2.8.25
+lingerd_ver=0.94
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org"
+SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
+		ssl? ( ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz )
+		lingerd? ( http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz )
+		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
+
+DEPEND="dev-lang/perl
+		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
+		sys-libs/db
+		>=dev-libs/mm-1.1.3
+		>=dev-libs/expat-1.95.2
+		net-www/gentoo-webroot-default
+		app-misc/mime-types
+		selinux? ( sec-policy/selinux-apache )
+		lingerd? ( =net-www/lingerd-${lingerd_ver} )"
+
+# so leave it out until it's available
+PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver}-r10 )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	# Use correct multilib libdir in gentoo patches
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
+		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
+		|| die "sed failed"
+
+	# patch codes:
+	# 00-29 patches to work with gentoo
+	# 30-89 USE-flag patches
+	# 90-99 security patches
+	EPATCH_SUFFIX="patch"
+	epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
+	epatch ${GENTOO_PATCHDIR}/patches/9*
+
+	# setup the filesystem layout config
+	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
+	sed -i -e 's:version:${PF}:g' config.layout
+
+	if useq pam; then
+		epatch ${GENTOO_PATCHDIR}/patches/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
+	fi
+
+	# fix obsolete 'head -1' and 'tail -1' calls
+	ht_fix_file src/Configure src/helpers/getuid.sh src/helpers/buildinfo.sh src/helpers/fmn.sh
+
+	# setup mod_ssl eapi
+	if useq ssl; then
+		local myssl
+		myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
+		cp ${myssl}/pkg.eapi/*.h src/include
+		cp ${myssl}/pkg.eapi/*.c src/ap
+		epatch ${myssl}/pkg.eapi/eapi.patch || die "failed to setup mod_ssl eapi"
+	fi
+
+	# set a reasonable MM_CORE_PATH location..
+	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' src/include/httpd.h
+
+	if useq lingerd; then
+		local mylingerd=${WORKDIR}/lingerd-${lingerd_ver}
+		cp ${mylingerd}/apache-1.3/ap_lingerd.c ${mylingerd}/li_config.h src/main
+		cd src
+		if useq ssl; then
+			epatch ${mylingerd}/apache-1.3/aplinger-ssl.diff
+		else
+			epatch ${mylingerd}/apache-1.3/aplinger.diff
+		fi
+		cd ..
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	setup_apache_vars
+
+	select_modules_config || die "determining modules"
+
+	if ! useq no-suexec; then
+		myconf="${myconf}
+				--enable-suexec
+				--suexec-uidmin=1000 \
+				--suexec-gidmin=100 \
+				--suexec-caller=apache \
+				--suexec-userdir=public_html \
+				--suexec-docroot=/var/www \
+				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+				--suexec-logfile=/var/log/apache/suexec_log"
+	fi
+
+	if useq ssl; then
+		myconf="${myconf} --enable-rule=EAPI"
+	fi
+
+	OPTIM="${MY_CFLAGS} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
+		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+	LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \
+	EAPI_MM=SYSTEM \
+	./configure \
+		--with-layout=Gentoo \
+		--target=apache \
+		--server-uid=apache \
+		--server-gid=apache \
+		--with-perl=/usr/bin/perl \
+		--enable-rule=SHARED_CHAIN \
+		${MY_BUILTINS} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+
+	emake || die "problem compiling apache"
+
+	# build ssl version of apache bench (ab-ssl)
+	if useq ssl; then
+		cd src/support
+		rm -f ab ab.o
+		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
+		mv ab ab-ssl
+		rm -f ab.o
+		make ab || die
+	fi
+}
+
+src_install() {
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+
+	# general install
+	make install-quiet root=${D} || die
+	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
+
+	# protect the suexec binary
+	if ! useq no-suexec; then
+		fowners root:apache /usr/sbin/suexec
+		fperms 4710 /usr/sbin/suexec
+	fi
+
+	# apxs needs this to pickup the right lib for install
+	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
+	dosym /var/log/apache /usr/$(get_libdir)/apache/logs
+	dosym /etc/apache /usr/$(get_libdir)/apache/conf
+
+	# nice support scripts
+	exeinto /usr/sbin
+	for i in apachelogserverstatus apachesplitlogfile; do
+		doexe ${GENTOO_PATCHDIR}/scripts/${i}
+	done
+
+	# some more scripts
+	for i in split-logfile logresolve.pl log_server_status; do
+		doexe ${S}/src/support/${i}
+	done
+
+	# the ssl version of apache bench
+	if useq ssl; then
+		doexe src/support/ab-ssl
+	fi
+
+	# drop in a convenient link to the manual
+	if useq doc; then
+		insinto /etc/apache/modules.d
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
+		sed -i -e "s:1.3.32:${PVR}:" ${D}/etc/apache/modules.d/00_apache_manual.conf
+	else
+		rm -rf ${D}/usr/share/doc/${PF}/manual
+	fi
+
+	# tidy up
+	cd ${D}
+	dodoc etc/apache/*.default
+	rm -f etc/apache/*.default
+	rm -f etc/apache/*.conf
+	rm -f etc/apache/mime.types
+
+	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
+	rm -rf var/www/localhost
+
+	# config files
+	insinto /etc/conf.d
+	newins ${GENTOO_PATCHDIR}/init/apache.confd apache
+
+	exeinto /etc/init.d
+	newexe ${GENTOO_PATCHDIR}/init/apache.initd apache
+
+	insinto /etc/apache
+	doins ${GENTOO_PATCHDIR}/conf/apache-builtin-mods
+	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
+
+	insinto /etc/apache/vhosts.d
+	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
+
+	keepdir /etc/apache/vhosts.d
+	keepdir /etc/apache/modules.d
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]; then
+		sed -i -e '15a\AcceptMutex fcntl' ${D}/etc/apache/httpd.conf
+	fi
+
+	if useq lingerd; then
+		sed -i 's:\(need net.*\):\1 lingerd:g' ${D}/etc/init.d/apache
+	fi
+
+	if useq pam; then
+		insinto /etc/pam.d
+		newins ${GENTOO_PATCHDIR}/patches/suexec.pam suexec
+	fi
+
+	# empty dirs
+	for i in /var/log/apache /var/cache/apache /var/cache/apache-mm; do
+		keepdir ${i}
+		fowners apache:apache ${i}
+		fperms 755 ${i}
+	done
+}
+
+pkg_postinst() {
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+
+	if has_version '<net-www/apache-1.3.33-r10' ; then
+		einfo "Configuration locations have changed, you will need to migrate"
+		einfo "your configuration from /etc/apache/conf/apache.conf and"
+		einfo "/etc/apache/conf/commonapache.conf to /etc/apache/httpd.conf."
+		einfo
+		einfo "Apache now checks for the old configuration and refuses to start"
+		einfo "if it exists. You must remove the old configuration first"
+		einfo
+		einfo "For more information, see"
+		einfo "  http://www.gentoo.org/doc/en/apache-upgrading.xml"
+		einfo
+	fi
+
+	einfo "If you want modules to be installed for this version of apache"
+	einfo "then please ensure that apache2 is not in your USE flags. To remove"
+	einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf."
+
+}
+
+setup_apache_vars() {
+	MY_CFLAGS="${CFLAGS}"
+	unset CFLAGS
+	unset CXXFLAGS
+
+	# standard location for Gentoo Linux
+	DATADIR="${DATADIR:-/var/www/localhost}"
+	einfo "DATADIR is set to: ${DATADIR}"
+}
+
+parse_modules_config() {
+	local name=""
+	local disable=""
+	[ -f ${1} ] || return 1
+
+	for i in `cat $1 | sed "s/^#.*//"` ; do
+		if [ $i == "-" ]; then
+			disable="true"
+		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
+			name=`echo $i | sed "s/mod_//"`
+		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
+			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] || useq static-modules; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
+			name="" ; disable=""
+		elif [ $i == "shared" ]; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
+			name="" ; disable=""
+		fi
+	done
+
+	einfo "${1} options:\n${MY_BUILTINS}"
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache/apache-builtin-mods || \
+	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \
+	return 1
+}
+
+# vim:ts=4
diff --git a/net-www/apache/apache-1.3.34-r2.ebuild b/net-www/apache/apache-1.3.34-r2.ebuild
new file mode 100644
index 000000000000..393393fd54e0
--- /dev/null
+++ b/net-www/apache/apache-1.3.34-r2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r2.ebuild,v 1.1 2006/02/01 01:49:59 vericgar Exp $
+
+# Gentoo ARCH teams
+#
+# Do NOT mark this ebuild as stable unless the corresponding mod_ssl package
+# can also be marked as stable on your arch.
+#
+# Thanks,
+# stuart@gentoo.org
+
+inherit eutils fixheadtails
+
+IUSE="pam ssl selinux"
+
+mod_ssl_dep=2.8.25-r1
+mod_ssl_ver=2.8.25-1.3.34
+tarball_ver=1.3.34-20060131
+
+S=${WORKDIR}/${PN}_${PV}
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://www.apache.org http://www.modssl.org"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
+	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz
+	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${tarball_ver}.tar.bz2"
+
+
+# The mod_ssl archive is only for providing the EAPI patch in here.
+# You should install the net-www/mod_ssl package for the actual DSO.
+
+DEPEND="dev-lang/perl
+	<=sys-libs/db-4.1
+	>=dev-libs/mm-1.1.3
+	>=sys-libs/gdbm-1.8
+	>=dev-libs/expat-1.95.2
+	=sys-libs/db-1*
+	selinux? ( sec-policy/selinux-apache )
+	!dev-libs/apr
+	!dev-libs/apr-util"
+
+PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+
+#Standard location for Gentoo Linux
+DATADIR="/var/www/localhost"
+
+src_unpack() {
+	local myssl
+	unpack ${A} || die
+	cd ${S} || die
+
+	EPATCH_SUFFIX="patch"
+	epatch ${WORKDIR}/apache-patches-${tarball_ver}/[0-2]* || die
+
+	if useq pam; then
+		epatch ${WORKDIR}/apache-patches-${tarball_ver}/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
+	fi
+
+	#Obsolete 'head -1' and 'tail -1' calls.
+	ht_fix_file src/Configure src/helpers/getuid.sh \
+		src/helpers/fmn.sh src/helpers/buildinfo.sh
+
+	# setup eapi...
+	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
+	cp ${myssl}/pkg.eapi/*.h src/include
+	cp ${myssl}/pkg.eapi/*.c src/ap
+	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
+
+	# set a reasonable MM_CORE_PATH location..
+	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
+		src/include/httpd.h
+}
+
+src_compile() {
+	local myconf mycflags
+	mycflags="${CFLAGS}"
+	unset CFLAGS ; unset CXXFLAGS
+
+	select_modules_config || die "determining modules"
+
+	#-DBUFFERED_LOGS
+	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
+		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+	LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \
+	EAPI_MM=SYSTEM \
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib/apache \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/apache/conf \
+		--datadir=${DATADIR} \
+		--cgidir=${DATADIR}/cgi-bin \
+		--iconsdir=${DATADIR}/icons \
+		--htdocsdir=${DATADIR}/htdocs \
+		--manualdir=/usr/share/doc/${PF}/manual \
+		--includedir=/usr/include/apache \
+		--localstatedir=/var \
+		--runtimedir=/var/run \
+		--logfiledir=/var/log/apache \
+		--proxycachedir=/var/cache/apache \
+		--serverroot=/etc/apache \
+		--target=apache \
+		--server-uid=apache \
+		--server-gid=apache \
+		--with-perl=/usr/bin/perl \
+		--enable-rule=EAPI \
+		--enable-rule=SHARED_CHAIN \
+		${MY_BUILTINS} \
+		--enable-suexec \
+		--suexec-uidmin=1000 \
+		--suexec-gidmin=100 \
+		--suexec-caller=apache \
+		--suexec-userdir=public_html \
+		--suexec-docroot=/var/www \
+		--suexec-safepath="/bin:/usr/bin" \
+		--suexec-logfile=/var/log/apache/suexec_log \
+		\
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	local myfile
+
+	GID=`id -g apache`
+	if [ -z "${GID}" ]; then
+		einfo "Using default GID of 81 for Apache"
+		GID=81
+	fi
+
+	make install-quiet root=${D} || die
+	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
+		${FILESDIR}/robots.txt
+
+	#protect the suexec binary
+	fowners root:${GID} /usr/sbin/suexec
+	fperms 4710 /usr/sbin/suexec
+
+	# nice support scripts..
+	for myfile in apacheaddmod apachedelmod \
+		apachelogserverstatus apachesplitlogfile
+	do
+		exeinto /usr/sbin
+		doexe ${FILESDIR}/$myfile
+	done
+
+	# setup links in /etc/apache..
+	cd ${D}/etc/apache
+	ln -sf ../../usr/lib/apache modules
+	# apxs needs this to pickup the right lib for install..
+	ln -sf ../../usr/lib lib
+	ln -sf ../../var/log/apache logs
+	ln -sf ../../usr/lib/apache-extramodules extramodules
+
+	# drop in a convenient link to the manual
+	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+
+	# deprecated config files, empty dirs..
+	rm -f ${D}/etc/apache/conf/apache.conf.default
+	rm -f ${D}/etc/apache/conf/access.conf*
+	rm -f ${D}/etc/apache/conf/srm.conf*
+
+	# now the config files..
+	insinto /etc/apache/conf
+	doins ${FILESDIR}/conf/commonapache.conf
+	doins ${FILESDIR}/conf/apache.conf
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '15a\AcceptMutex fcntl' \
+		${D}/etc/apache/conf/apache.conf
+	fi
+
+	insinto /etc/apache/conf/vhosts
+	doins ${FILESDIR}/conf/VirtualHomePages.conf
+	doins ${FILESDIR}/conf/DynamicVhosts.conf
+	doins ${FILESDIR}/conf/Vhosts.conf
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
+	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
+	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
+
+	if use pam; then
+		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
+	fi
+
+	#empty dirs
+	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
+}
+
+pkg_postinst() {
+	# these are in baselayout now; it will not hurt to leave them here though
+	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
+	getent group apache >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		groupadd -g 81 apache || die "problem adding group apache"
+	fi
+
+	# usermod returns 2 on user-exists-but-no-flags-given
+	#usermod apache &>/dev/null
+	#if [ $? != 2 ]; then
+	getent passwd apache >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
+		assert "problem adding user apache"
+	fi
+
+	einfo
+	einfo "Please remember to update your config files in /etc/apache"
+	einfo "as --datadir has been changed to ${DATADIR}!"
+	einfo
+}
+
+parse_modules_config() {
+	local filename=$1
+	local name=""
+	local dso=""
+	local disable=""
+	[ -f ${filename} ] || return 1
+	einfo "Using ${filename} for builtins."
+	for i in `cat $filename | sed "s/^#.*//"` ; do
+		if [ $i == "-" ] ; then
+			disable="true"
+		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
+			name=`echo $i | sed "s/mod_//"`
+		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
+			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
+			name="" ; disable=""
+		elif [ $i == "shared" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
+			name="" ; disable=""
+		fi
+	done
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache/apache-builtin-mods || \
+	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
+	return 1
+}
diff --git a/net-www/apache/files/digest-apache-1.3.34-r11 b/net-www/apache/files/digest-apache-1.3.34-r11
new file mode 100644
index 000000000000..3b4b10ff7195
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.34-r11
@@ -0,0 +1,4 @@
+MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
+MD5 31d6e4403f7fb24b67024c264ab73ecb gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897
+MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
+MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
diff --git a/net-www/apache/files/digest-apache-1.3.34-r2 b/net-www/apache/files/digest-apache-1.3.34-r2
new file mode 100644
index 000000000000..c24683b5d6f0
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.34-r2
@@ -0,0 +1,9 @@
+MD5 016da4d5061ac8b7a95080910142dc32 apache-patches-1.3.34-20060131.tar.bz2 14655
+RMD160 2c7b3abea9bac00b541e17e0e5e25a1362f9e806 apache-patches-1.3.34-20060131.tar.bz2 14655
+SHA256 05f50b5412d681ebabcd03c30e9957fafe60e1f4f42846a6bc4044ee9993e17b apache-patches-1.3.34-20060131.tar.bz2 14655
+MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
+RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e apache_1.3.34.tar.gz 2468056
+SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 apache_1.3.34.tar.gz 2468056
+MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
+RMD160 90a3913d30c7f4d194907463125c90101005837a mod_ssl-2.8.25-1.3.34.tar.gz 820352
+SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 mod_ssl-2.8.25-1.3.34.tar.gz 820352