Stable on x86, alpha and ia64, bug 117835.

Package-Manager: portage-2.0.53

3 files changed, 65 insertions, 52 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index db4306d8b9c1..df13e11d21f2 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.443 2005/12/23 07:32:40 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.444 2006/01/09 22:34:18 kloeri Exp $
+
+  09 Jan 2006; Bryan Østergaard <kloeri@gentoo.org apache-2.0.55.ebuild:
+  Stable on x86, alpha and ia64, bug 117835.
 
   23 Dec 2005; Markus Rothe <corsair@gentoo.org> apache-1.3.34-r10.ebuild:
   Stable on ppc64
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index daab6c101613..679a09884476 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,4 +1,7 @@
-MD5 12a2ec651d3fbe2b6638b5a53df3e7d8 ChangeLog 74236
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19c671b7ca546e5a573b12dfd5adac94 ChangeLog 74355
 MD5 b56779cb8460b101ad6912c8f45ff583 apache-1.3.29-r2.ebuild 7237
 MD5 3e32afd7bbab740bdce0fc0cf45d5be3 apache-1.3.31-r1.ebuild 6816
 MD5 a448a0e7566f85098cf55c54e4c6621f apache-1.3.31-r2.ebuild 6941
@@ -7,25 +10,34 @@ MD5 4972651d68219ad15fc821feda90d440 apache-1.3.31.ebuild 6760
 MD5 26a30fcfe2a6fbbf994b64756ed4f604 apache-1.3.32-r1.ebuild 6685
 MD5 71231c76a51034e85d1f116b4767fadc apache-1.3.32.ebuild 6693
 MD5 ed25e8cbac132cbbecbc3f41b43a3f51 apache-1.3.33-r1.ebuild 6951
+MD5 3ef41afa50a72857fe3c62ce5a628744 apache-1.3.33-r10.ebuild 8772
+MD5 170ac9a47fbef6414a686b59592b7470 apache-1.3.33-r11.ebuild 8773
+MD5 0464f4cfb853e8d2ae179f3f06619e9d apache-1.3.33-r12.ebuild 9024
+MD5 f154daabfa5b59d9597f8ede26b839d2 apache-1.3.33-r13.ebuild 8674
 MD5 17a8753ef203bc6d24e61967cad63421 apache-1.3.33-r2.ebuild 8637
 MD5 7ffd5d16d8cb2f8192d1fc48b75371df apache-1.3.33-r3.ebuild 6952
 MD5 2c34b40a3fe461014b19ca5e4763203e apache-1.3.33-r4.ebuild 8673
+MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
+MD5 17e12318b6dd1cd8bb25cb987490c7fd apache-1.3.33-r6.ebuild 7108
 MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
+MD5 f98b6437e47b471cea336f1cbb6ac240 apache-1.3.34-r1.ebuild 7114
+MD5 0eb24bf60ddc4cc541b0fe6e70fb48b1 apache-1.3.34-r10.ebuild 8666
 MD5 8dfa3f0fbdc01264e754bd3ebf7b8a5a apache-2.0.54-r15.ebuild 12594
 MD5 be59fbc220730a0212fbf6f34a1a6652 apache-2.0.54-r30.ebuild 12930
-MD5 0464f4cfb853e8d2ae179f3f06619e9d apache-1.3.33-r12.ebuild 9024
 MD5 17f7420f9957d17a514ee70bc4786a25 apache-2.0.54-r31.ebuild 13375
-MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
-MD5 3ef41afa50a72857fe3c62ce5a628744 apache-1.3.33-r10.ebuild 8772
-MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
 MD5 e1e33b99a1b8f95a419f0e95a6ebb2dc apache-2.0.54-r9.ebuild 12595
-MD5 170ac9a47fbef6414a686b59592b7470 apache-1.3.33-r11.ebuild 8773
-MD5 17e12318b6dd1cd8bb25cb987490c7fd apache-1.3.33-r6.ebuild 7108
-MD5 92bcd37add7d46179b05da2170dcea55 apache-2.0.55.ebuild 13421
-MD5 f154daabfa5b59d9597f8ede26b839d2 apache-1.3.33-r13.ebuild 8674
-MD5 f98b6437e47b471cea336f1cbb6ac240 apache-1.3.34-r1.ebuild 7114
-MD5 0eb24bf60ddc4cc541b0fe6e70fb48b1 apache-1.3.34-r10.ebuild 8666
+MD5 fbbaad3fc3980cf7b051cec7f383836d apache-2.0.55.ebuild 13416
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
+MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
+MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
+MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
+MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944
+MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
+MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
 MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
@@ -41,6 +53,14 @@ MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
 MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
 MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
+MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
+MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
+MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
+MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
+MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
@@ -50,51 +70,25 @@ MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
 MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
 MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r1 212
+MD5 3ebdb23ee46d8cee6611fd327217c18c files/digest-apache-1.3.33-r10 287
+MD5 81bbd0e99cf3c40a3f803533fd41370d files/digest-apache-1.3.33-r11 287
+MD5 d3c0219cb097c5251f78caeaae6c571b files/digest-apache-1.3.33-r12 287
+MD5 66e608b207d3ee040c7ba712f97f675d files/digest-apache-1.3.33-r13 287
 MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286
 MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r3 212
 MD5 0282c9d20ad05b752812c62f655b50ce files/digest-apache-1.3.33-r4 286
+MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
+MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
+MD5 33b6746d8bc97e23fd7f4420ad437b8c files/digest-apache-1.3.34-r1 221
+MD5 947bc1e2e4792fd492a8d90f7abe9e78 files/digest-apache-1.3.34-r10 287
 MD5 282e8f0ae737d778a643251ad4f21122 files/digest-apache-2.0.54-r15 217
 MD5 b9925be24e72acc1031f76a8bc0a07cb files/digest-apache-2.0.54-r30 151
-MD5 d3c0219cb097c5251f78caeaae6c571b files/digest-apache-1.3.33-r12 287
 MD5 f3ab77f6b13c80af68614aa80de7af2b files/digest-apache-2.0.54-r31 154
+MD5 35d8cf2217559d96a69696d69f4c85cc files/digest-apache-2.0.54-r9 214
+MD5 803227bbf1ffe414e9771f219768640d files/digest-apache-2.0.55 147
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 3ebdb23ee46d8cee6611fd327217c18c files/digest-apache-1.3.33-r10 287
-MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
-MD5 35d8cf2217559d96a69696d69f4c85cc files/digest-apache-2.0.54-r9 214
-MD5 81bbd0e99cf3c40a3f803533fd41370d files/digest-apache-1.3.33-r11 287
-MD5 324e63ccba6d27b9d9b08209c9992fe4 files/digest-apache-1.3.33-r6 221
-MD5 803227bbf1ffe414e9771f219768640d files/digest-apache-2.0.55 147
-MD5 66e608b207d3ee040c7ba712f97f675d files/digest-apache-1.3.33-r13 287
-MD5 33b6746d8bc97e23fd7f4420ad437b8c files/digest-apache-1.3.34-r1 221
-MD5 947bc1e2e4792fd492a8d90f7abe9e78 files/digest-apache-1.3.34-r10 287
-MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
-MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944
-MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
-MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
-MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
-MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
-MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
-MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
-MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
-MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
-MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
-MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
-MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
-MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
@@ -104,9 +98,25 @@ MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl
 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304
 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
+MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
+MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
 MD5 59deb12158a55cc2259cd79c245eb00d 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
 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
+MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDwuVBugEuf3OQ0akRAjTQAJsEg5rtcSFIPYJEfdqjTFe4UycTSwCeP8xj
+6fYT+h/i1LAgWu8cT9SgBIw=
+=MdwM
+-----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.0.55.ebuild b/net-www/apache/apache-2.0.55.ebuild
index 5a1a931f2031..95d3007e7825 100644
--- a/net-www/apache/apache-2.0.55.ebuild
+++ b/net-www/apache/apache-2.0.55.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-2.0.55.ebuild,v 1.3 2005/12/11 03:01:15 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55.ebuild,v 1.4 2006/01/09 22:34:19 kloeri Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl