Back into testing until mod_ssl deps for the 1.3.33-release are fixed.

Package-Manager: portage-2.0.51.19

3 files changed, 80 insertions, 75 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 07e891cca303..2dac4748fd56 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.335 2005/03/21 14:30:29 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.336 2005/04/03 20:33:13 beu Exp $
+
+  03 Apr 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild:
+  Back into testing for you - hard masked; going back in once arches
+  have confirmed that it's working correctly with mod_ssl (or someone
+  from the apache herd nurses its stabilisation *wink* ;)
 
   21 Mar 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild:
   Stable on x86 (bug #86052).
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 3d6601d4ad0c..bb90f1c339d8 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,108 +1,108 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 3a3c425126f2c807be687471ee586e99 apache-1.3.31-r1.ebuild 6767
 MD5 f7c1d7b06e45c35cd6608a8e10812277 apache-1.3.31-r2.ebuild 6892
+MD5 60e48a390ee6534b28916a31803b3fa7 apache-2.0.50.ebuild 12882
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
-MD5 3e3c0c750760bbd42b957989345f4d57 apache-2.0.52-r1.ebuild 13132
-MD5 d42fc69e80706e40559d17dda84c8419 apache-2.0.51-r1.ebuild 12817
-MD5 aa97e52247ade47afe6744b06960f728 apache-2.0.52-r3.ebuild 12045
+MD5 5058c2961b8b79be5b2ea3e6a219aa3e ChangeLog 57238
+MD5 403b273e728dd37e437c09b05069fa1e apache-1.3.33-r1.ebuild 6905
+MD5 fd46570e4125dd33e0f4853f6755b878 apache-2.0.52.ebuild 12811
 MD5 6f736bb02fa0e38438e74782d223293d apache-1.3.31-r3.ebuild 6900
+MD5 e265b8c0426359efe22f6c29d7e9be82 apache-2.0.53.ebuild 11915
+MD5 e93c99f4e26015b708542c727566a7d0 apache-2.0.52-r2.ebuild 12271
 MD5 db0afdd5255ad831638131ef69ff2267 apache-1.3.33.ebuild 6879
-MD5 90e70419bec385aee16b10303e9235d3 apache-1.3.29-r2.ebuild 7158
+MD5 d42fc69e80706e40559d17dda84c8419 apache-2.0.51-r1.ebuild 12817
 MD5 2ca94db2eb9cce1b1b8859b2241fcff0 apache-1.3.33-r2.ebuild 8614
-MD5 30eae150ac83b20287102122c37b580a apache-1.3.31.ebuild 6721
-MD5 a1e51da257b8b9f3015f651702e764b5 ChangeLog 56967
-MD5 e265b8c0426359efe22f6c29d7e9be82 apache-2.0.53.ebuild 11915
-MD5 9248cf858ba3f9c865481a0344840343 apache-1.3.33-r1.ebuild 6904
-MD5 15170badcb6a28012cc4d1e3bfddc126 apache-1.3.32.ebuild 6644
+MD5 90e70419bec385aee16b10303e9235d3 apache-1.3.29-r2.ebuild 7158
 MD5 f96d59b9c21e284c185a151612dd25c6 apache-2.0.51.ebuild 12808
-MD5 fd46570e4125dd33e0f4853f6755b878 apache-2.0.52.ebuild 12811
-MD5 60e48a390ee6534b28916a31803b3fa7 apache-2.0.50.ebuild 12882
+MD5 30eae150ac83b20287102122c37b580a apache-1.3.31.ebuild 6721
+MD5 3e3c0c750760bbd42b957989345f4d57 apache-2.0.52-r1.ebuild 13132
 MD5 38f354f2c6d004534fc7a506209c1b3d apache-1.3.32-r1.ebuild 6636
-MD5 3a3c425126f2c807be687471ee586e99 apache-1.3.31-r1.ebuild 6767
-MD5 e93c99f4e26015b708542c727566a7d0 apache-2.0.52-r2.ebuild 12271
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33-r1 212
-MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
-MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
+MD5 15170badcb6a28012cc4d1e3bfddc126 apache-1.3.32.ebuild 6644
+MD5 aa97e52247ade47afe6744b06960f728 apache-2.0.52-r3.ebuild 12045
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
-MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
-MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
-MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
-MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
-MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
-MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
-MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
+MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994
 MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150
-MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
+MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
+MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
+MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
+MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
+MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078
-MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 d44cd7c0521a1fbc26bff3dcc5024185 files/digest-apache-2.0.53 147
-MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
-MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
-MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
-MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
-MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
-MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
+MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
+MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33-r1 212
+MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
 MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331
+MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
-MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
+MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
+MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
+MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
+MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
+MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
+MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
+MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
 MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 d44cd7c0521a1fbc26bff3dcc5024185 files/digest-apache-2.0.53 147
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
+MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
+MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
+MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286
+MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
 MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
-MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
-MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
+MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
+MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
+MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
+MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
+MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
-MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
 MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944
+MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
+MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
+MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
-MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
-MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
-MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
-MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/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 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 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304
 MD5 c42fc79a9d08f38a8d8938883451f6b6 files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch 790
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
 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 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
+MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
+MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCPtqUjUHll2nfF60RAgvVAJ9oQffb7cXtjbigZ9V26oTJUhf8EQCfSeVF
-KL7YOgQ3oVktya3gPJpuVqQ=
-=np/T
+iD8DBQFCUFMwjUHll2nfF60RAnONAKCNAaajqj8WRrSEOEu+WCMZDt1YPACfYYWF
+FcHTBc11TFfBBUv82Zve7Mo=
+=w27I
 -----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index ea2490177520..3f41fdc1acf4 100644
--- a/net-www/apache/apache-1.3.33-r1.ebuild
+++ b/net-www/apache/apache-1.3.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.16 2005/03/21 14:30:30 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.17 2005/04/03 20:33:13 beu Exp $
 
 # Gentoo ARCH teams
 #
@@ -20,7 +20,7 @@ mod_ssl_ver=2.8.21-1.3.32
 S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
 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/~stuart/apache/apache-patches-1.3.33.tar.bz2"