close #6149

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 47df2b7d3562ba72a6f8ca8c8e7b5b063558afef..d48364a2bfe9dd236df214248272881d5fa2f664 100644 (file)
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,6 @@
-B
 # ChangeLog for net-www/apache
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.26 2002/10/02 13:01:43 woodchip Exp $
 
 *apache-2.0.40-r1 (04 Sept 2002)
 
@@ -19,6 +19,9 @@ B
 
 *apache-1.3.26-r4 (3 Jul 2002)
 
+  02 Oct 2002; Donny Davies <woodchip@gentoo.org> apache-1.3.26-r4.ebuild :
+  Fix for #6149.
+
   28 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> files/apache.rc6 :
   Made restart send signal to  apache processes instead of httpd processes. Thanks to ska-fan
   in #gentoo-dev for finding this.

diff --git a/net-www/apache/apache-1.3.26-r4.ebuild b/net-www/apache/apache-1.3.26-r4.ebuild
index 1f5ce22804ada8e9dadbcd9513544641d81b086d..3feca29b87a339f2597ae382d6400369dc7b244d 100644 (file)
--- a/net-www/apache/apache-1.3.26-r4.ebuild
+++ b/net-www/apache/apache-1.3.26-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.26-r4.ebuild,v 1.6 2002/09/19 20:57:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.26-r4.ebuild,v 1.7 2002/10/02 13:01:43 woodchip Exp $
 
 mod_ssl_ver=2.8.9-${PV}
 HARD_SERVER_LIMIT=512
 
-S=${WORKDIR}/apache_${PV}
+S=${WORKDIR}/${PN}_${PV}
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
 KEYWORDS="x86 ppc sparc sparc64"
@@ -124,7 +124,7 @@ src_compile() {
                --suexec-gidmin=100 \
                --suexec-caller=apache \
                --suexec-userdir=public_html \
-               --suexec-docroot=${DATA_DIR}/htdocs \
+               --suexec-docroot=/home \
                --suexec-safepath="/bin:/usr/bin" \
                --suexec-logfile=/var/log/apache/suexec_log \
                \