New tarball: Splits the default vhost into it's own file, makes all references to configuration files absolute, clears up general user confusion. Fixes bugs 84133, 91745, 92024, 92891, 94168.

(Portage version: 2.0.51.22-r1)

6 files changed, 56 insertions, 54 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index ebc5f347f362..666c1dc09237 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,12 @@
 # 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.389 2005/07/12 16:25:15 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.390 2005/07/13 02:53:48 vericgar Exp $
+
+  13 Jul 2005; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.33-r10.ebuild, apache-2.0.54-r12.ebuild:
+  New tarball: Splits the default vhost into it's own file, makes all
+  references to configuration files absolute, clears up general user
+  confusion. Fixes bugs 84133, 91745, 92024, 92891, 94168.
 
   12 Jul 2005; Michael Stewart <vericgar@gentoo.org>
   apache-2.0.54-r8.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 926360fbb6a2..fa90d3ef63a9 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f6e86bf9511313dc09413076c25a03e4 ChangeLog 65684
 MD5 b56779cb8460b101ad6912c8f45ff583 apache-1.3.29-r2.ebuild 7237
 MD5 3e32afd7bbab740bdce0fc0cf45d5be3 apache-1.3.31-r1.ebuild 6816
@@ -10,34 +7,25 @@ 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 08dd65ceee3af53604691c12d4db9e2d apache-1.3.33-r1.ebuild 6954
-MD5 fd8e4c90c15ed51d4690c66d94a78e11 apache-1.3.33-r10.ebuild 8696
 MD5 c0a6ad3dd00fab5f5f447861f3a9114a apache-1.3.33-r2.ebuild 8659
 MD5 7ffd5d16d8cb2f8192d1fc48b75371df apache-1.3.33-r3.ebuild 6952
 MD5 7923d1f4e8425d3aed9435e1ed14349b apache-1.3.33-r4.ebuild 8695
-MD5 d2c3037122bf1ba1e40758794ddc4fbb apache-1.3.33-r5.ebuild 7103
 MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
 MD5 1e34ebcb3af5040c59f77dcb26faf53a apache-2.0.50.ebuild 12912
 MD5 e89db5b90b1db0adeb25fc77840d4e4d apache-2.0.51-r1.ebuild 12864
 MD5 ef3bd6fff8727f55a996d2ab32ee3f88 apache-2.0.51.ebuild 12855
 MD5 2fd63d87bf209b47757a0267f98e914a apache-2.0.52-r1.ebuild 13208
 MD5 996748170bc5ec8a2c230f8df8cff2f9 apache-2.0.52-r2.ebuild 12318
+MD5 b00063e0761934bb0da5cbf885b4b22d apache-2.0.54-r11.ebuild 12838
 MD5 7ad73fb027e9bc2dcda86b448a76450d apache-2.0.52.ebuild 12887
+MD5 be5ced0014610d6dd719ad16e1ebffec apache-2.0.54-r8.ebuild 12625
+MD5 3c12b234987dd995dc3d4494a9fa6296 apache-2.0.54-r12.ebuild 12934
 MD5 87a8485d6da12611957ee2b4748ac201 apache-2.0.54-r10.ebuild 12840
-MD5 b00063e0761934bb0da5cbf885b4b22d apache-2.0.54-r11.ebuild 12838
-MD5 ffd5d49ee6bef0486d4585d30c87776f apache-2.0.54-r12.ebuild 12840
 MD5 4003f8561ac1d6abec33916647691263 apache-2.0.54-r7.ebuild 12518
-MD5 be5ced0014610d6dd719ad16e1ebffec apache-2.0.54-r8.ebuild 12625
+MD5 c30dded0e338c41d3b0c9032092e8091 apache-1.3.33-r10.ebuild 8789
+MD5 d2c3037122bf1ba1e40758794ddc4fbb apache-1.3.33-r5.ebuild 7103
+MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
 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
@@ -53,14 +41,6 @@ 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
@@ -70,25 +50,51 @@ 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 ab172ba6840ad9da49c124113381084b files/digest-apache-1.3.33-r10 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 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
 MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
 MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 f0386414da0ae14678d2875eb947d99d files/digest-apache-2.0.54-r10 151
 MD5 326a59d4f3d30e34f7b61550f9466328 files/digest-apache-2.0.54-r11 151
-MD5 73e93ac0164ffdfa564b6711a9ddd1bd files/digest-apache-2.0.54-r12 151
-MD5 4f6de1cd192882313d41650cf23eb26a files/digest-apache-2.0.54-r7 214
 MD5 eb8a02a66654924ac00333c33066c8a5 files/digest-apache-2.0.54-r8 214
+MD5 2a290bf8617837e695c7971fdfef1766 files/digest-apache-2.0.54-r12 151
+MD5 b75d2bfc008916e050f1bafb8a04c944 files/digest-apache-1.3.33-r5 221
+MD5 b8f37b74551688d546b14c87e086993c files/digest-apache-1.3.33-r10 287
+MD5 f0386414da0ae14678d2875eb947d99d files/digest-apache-2.0.54-r10 151
+MD5 4f6de1cd192882313d41650cf23eb26a files/digest-apache-2.0.54-r7 214
 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 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
@@ -98,25 +104,9 @@ 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 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1Aw9I1lqEGTUzyQRAo0AAJkB/n7x8vxHrrqVBI9EKE7Zm7dBbQCfbViF
-E04vZp3iTB5/sfTr4afN868=
-=qS8f
------END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.33-r10.ebuild b/net-www/apache/apache-1.3.33-r10.ebuild
index 1450917aeeb2..3df92f5accdc 100644
--- a/net-www/apache/apache-1.3.33-r10.ebuild
+++ b/net-www/apache/apache-1.3.33-r10.ebuild
@@ -1,12 +1,12 @@
 # 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-r10.ebuild,v 1.1 2005/07/12 03:58:27 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r10.ebuild,v 1.2 2005/07/13 02:53:48 vericgar Exp $
 
 inherit eutils fixheadtails
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050711"
+GENTOO_PATCHSTAMP="20050712"
 GENTOO_DEVSPACE="vericgar"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
@@ -200,6 +200,9 @@ src_install() {
 	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
 
diff --git a/net-www/apache/apache-2.0.54-r12.ebuild b/net-www/apache/apache-2.0.54-r12.ebuild
index 3153f3fd0e7f..3ffdab478bb7 100644
--- a/net-www/apache/apache-2.0.54-r12.ebuild
+++ b/net-www/apache/apache-2.0.54-r12.ebuild
@@ -1,12 +1,12 @@
 # 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-2.0.54-r12.ebuild,v 1.1 2005/07/10 09:02:32 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r12.ebuild,v 1.2 2005/07/13 02:53:48 vericgar Exp $
 
 inherit eutils gnuconfig
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050710"
+GENTOO_PATCHSTAMP="20050712"
 GENTOO_DEVSPACE="vericgar"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
@@ -270,6 +270,9 @@ src_install () {
 	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
 	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
 
+	insinto /etc/apache2/vhosts.d
+	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
+
 	keepdir /etc/apache2/vhosts.d
 	keepdir /etc/apache2/modules.d
 
diff --git a/net-www/apache/files/digest-apache-1.3.33-r10 b/net-www/apache/files/digest-apache-1.3.33-r10
index 8cae3eb1c50f..913a68f1e9d6 100644
--- a/net-www/apache/files/digest-apache-1.3.33-r10
+++ b/net-www/apache/files/digest-apache-1.3.33-r10
@@ -1,4 +1,4 @@
 MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
 MD5 cdfdf1f576f77768c90825b43b462405 mod_ssl-2.8.22-1.3.33.tar.gz 754606
 MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
-MD5 47f30f75b5cfc381fbc87fab1a20c53d gentoo-apache-1.3.33-r10-20050711.tar.bz2 28324
+MD5 c87274b69e70dbc320ff9c0540f1f9fb gentoo-apache-1.3.33-r10-20050712.tar.bz2 28585
diff --git a/net-www/apache/files/digest-apache-2.0.54-r12 b/net-www/apache/files/digest-apache-2.0.54-r12
index a31abea31269..033453426e67 100644
--- a/net-www/apache/files/digest-apache-2.0.54-r12
+++ b/net-www/apache/files/digest-apache-2.0.54-r12
@@ -1,2 +1,2 @@
 MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-MD5 1aa33c35801f863b13082b73a78c8abe gentoo-apache-2.0.54-r12-20050710.tar.bz2 50709
+MD5 8a7788baf46453e26e548b0462838626 gentoo-apache-2.0.54-r12-20050712.tar.bz2 50892