Fix SSL test certificate generation; New patch that creates AddDirectoryIndex and RemoveDirectoryIndex directives - fixes bug #50611

(Portage version: 2.0.51.16)

6 files changed, 21 insertions, 14 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 419639bdbc1a..d1778da89a09 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.319 2005/02/18 04:10:19 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.320 2005/02/20 22:34:47 vericgar Exp $
+
+  20 Feb 2005; Michael Stewart <vericgar@gentoo.org> apache-1.3.33-r1.ebuild,
+  apache-2.0.52-r3.ebuild:
+  Fix SSL test certificate generation; New patch that creates AddDirectoryIndex
+  and RemoveDirectoryIndex directives - fixes bug #50611
 
   18 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild,
   apache-2.0.52-r3.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index f8baf17fe3bc..cf7d2f0ce95d 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,4 +1,4 @@
-MD5 295d6fe1880cca289580a535916b4a7d ChangeLog 54229
+MD5 0d937fbc4ad76ad33f6bb09e3dc6e3f9 ChangeLog 54472
 MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178
 MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739
 MD5 9a5242011f95057c3afabf1cc3973f11 apache-1.3.31-r2.ebuild 6864
@@ -13,8 +13,8 @@ MD5 451d45c9613e9ed7ee770085a8e28ef8 apache-2.0.51.ebuild 12831
 MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
 MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
-MD5 7160ac34e063b1ed70f5f262d3e29135 apache-1.3.33-r1.ebuild 8626
-MD5 70484c05ffdffabd0c2e07a23db03b08 apache-2.0.52-r3.ebuild 11548
+MD5 ba2093f68d9950fb1b495309c67e1c35 apache-1.3.33-r1.ebuild 8626
+MD5 df209d7cdb321f4bdf236c5f2acb6fc3 apache-2.0.52-r3.ebuild 11624
 MD5 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
@@ -52,8 +52,8 @@ MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 975bf0a5232f78d45ab4d3c8dca2ac8f files/digest-apache-1.3.33-r1 286
-MD5 891f842545098a8eca9fa61cb91f6f4b files/digest-apache-2.0.52-r3 150
+MD5 79fe350dca5b488a1b0f396caeb43248 files/digest-apache-1.3.33-r1 286
+MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150
 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
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index 12ffdf002323..d195fcc94941 100644
--- a/net-www/apache/apache-1.3.33-r1.ebuild
+++ b/net-www/apache/apache-1.3.33-r1.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-r1.ebuild,v 1.9 2005/02/18 04:10:19 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.10 2005/02/20 22:34:47 vericgar Exp $
 
 inherit eutils fixheadtails
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050218"
+GENTOO_PATCHSTAMP="20050220"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 # The mod_ssl archive is only for providing the EAPI patch in here.
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index eed07cc7e6e7..5dfe9bb4e94b 100644
--- a/net-www/apache/apache-2.0.52-r3.ebuild
+++ b/net-www/apache/apache-2.0.52-r3.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.52-r3.ebuild,v 1.12 2005/02/20 08:09:29 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.13 2005/02/20 22:34:47 vericgar Exp $
 
 inherit eutils gnuconfig
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050218"
+GENTOO_PATCHSTAMP="20050220"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 DESCRIPTION="The Apache Web Server, Version 2.0.x"
@@ -163,9 +163,11 @@ src_install () {
 	# Credits to advx.org people for these scripts. Heck, thanks for
 	# the nice layout and everything else ;-)
 	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile gentestcrt.sh; do
+	for i in apache2logserverstatus apache2splitlogfile; do
 		doexe ${GENTOO_PATCHDIR}/scripts/${i}
 	done
+	# gentestcrt.sh only if USE=ssl
+	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
 
 	# some more scripts
 	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
@@ -264,7 +266,7 @@ src_install () {
 		cd /etc/apache2/ssl
 		einfo
 		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1
+		yes "" 2>/dev/null | ${D}/usr/sbin/gentestcrt.sh >/dev/null 2>&1
 		einfo
 	fi
 
diff --git a/net-www/apache/files/digest-apache-1.3.33-r1 b/net-www/apache/files/digest-apache-1.3.33-r1
index 356e7e523459..0e552355dabd 100644
--- a/net-www/apache/files/digest-apache-1.3.33-r1
+++ b/net-www/apache/files/digest-apache-1.3.33-r1
@@ -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 8cb5da9fe4bc27a8cff9cdde55fcf477 gentoo-apache-1.3.33-r1-20050218.tar.bz2 27510
+MD5 e4604c4147257f0d7552a5a0182a9cd6 gentoo-apache-1.3.33-r1-20050220.tar.bz2 28130
diff --git a/net-www/apache/files/digest-apache-2.0.52-r3 b/net-www/apache/files/digest-apache-2.0.52-r3
index c2b809deaa1f..e96049630711 100644
--- a/net-www/apache/files/digest-apache-2.0.52-r3
+++ b/net-www/apache/files/digest-apache-2.0.52-r3
@@ -1,2 +1,2 @@
 MD5 0e1b47c53921a1fc8fb006effdb3bf1c httpd-2.0.52.tar.bz2 5187776
-MD5 b96f47e2f4f1870660fba31dd64ffdb0 gentoo-apache-2.0.52-r3-20050218.tar.bz2 62505
+MD5 702881db63689ca8f1348f149f208491 gentoo-apache-2.0.52-r3-20050220.tar.bz2 63157