Move --datadir, fix plenty of bugs, see changelog.

11 files changed, 345 insertions, 35 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 86b26e404fb5..b7ac57cc23d1 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.67 2003/09/25 02:20:48 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.68 2003/09/27 04:47:17 woodchip Exp $
+
+*apache-1.3.28-r1 (27 Sep 2003)
+
+  27 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.28-r1.ebuild,
+  files/apache-1.3.27_db4_gentoo.patch, files/apache-1.3.28-zombie-cgi.patch,
+  files/apache.rc6, files/2.0.40/apache2.confd,
+  files/2.0.40/commonapache2.conf, files/conf/apache.conf,
+  files/conf/commonapache.conf:
+  Move --datadir to /var/www/localhost; prepare for the upcoming vhost-config
+  and webapp-config tools.  Added patches to fix #26632 and #29124.  Hopefully
+  fix #28552 and #28619 also.  Fix #29606.  Fix #29329.  Whew!
 
 *apache-2.0.47-r1 (24 Sep 2003)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index f60c88d06dde..cbe3f50c1765 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,13 +1,13 @@
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
 MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
-MD5 845e252c11b15cdb71aa8c0da260a33a ChangeLog 13439
-MD5 ac2380084c0b1eb016774376641d0118 apache-1.3.28-r1.ebuild 7760
+MD5 d8d2f98a07eff7a25b7e6aa2196b43fd ChangeLog 13985
+MD5 61f4bc626b916e84ea7a1adee665ba4c apache-1.3.28-r1.ebuild 7902
 MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
 MD5 d059ab302d0e6b1b96070adc4458ae08 apache-1.3.27-r4.ebuild 8653
 MD5 13eef3200abf41ea1ae8bb18ab40e481 apache-2.0.46.ebuild 10682
 MD5 a9d070561f89df4b231e17ce84564e92 apache-1.3.28.ebuild 8873
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 ff9124d60a4f8d464301680017739dd8 files/apache-1.3.28-zombie-cgi.patch 833
+MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
@@ -17,7 +17,7 @@ MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
 MD5 7f6973376101a01076d579aab3bd2dce files/apache-1.3.27_db4_gentoo.patch 868
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
-MD5 16f6a7f9299bb572e698a9016c00c983 files/apache.rc6 1032
+MD5 b852201630b63bb1e578ba13889b534a files/apache.rc6 1032
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
@@ -30,8 +30,8 @@ MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
 MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
-MD5 08b53fde56cca3bbaba976ea464cddaa files/conf/apache.conf 7187
-MD5 0f98d041002e6ad465e912d3f8cd66db files/conf/commonapache.conf 22112
+MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238
+MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169
 MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
 MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
 MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
@@ -46,8 +46,8 @@ MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
 MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
 MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
-MD5 ffe53c7823903ca8154e04dcb5f6bad8 files/2.0.40/commonapache2.conf 31777
-MD5 2675ec7169c3f63cb10a80a3ecdbe814 files/2.0.40/apache2.confd 784
+MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
+MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
 MD5 6ae912e7807f0bd583284afd1cc752a4 files/2.0.40/apache2.initd 1133
 MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 548304216950e0192bf40ae0f5ace370 files/2.0.40/vhosts.conf 1683
diff --git a/net-www/apache/apache-1.3.28-r1.ebuild b/net-www/apache/apache-1.3.28-r1.ebuild
new file mode 100644
index 000000000000..523c63c7a29d
--- /dev/null
+++ b/net-www/apache/apache-1.3.28-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28-r1.ebuild,v 1.1 2003/09/27 04:47:17 woodchip Exp $
+
+#IUSE="ipv6 pam"
+IUSE="pam"
+
+mod_ssl_ver=2.8.15
+
+S=${WORKDIR}/${PN}_${PV}
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://www.apache.org http://www.modssl.org"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm"
+SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2
+	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz"
+#	ipv6? http://motoyuki.bsdclub.org/data/IPv6/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz"
+# The mod_ssl archive is only for providing the EAPI patch in here.
+# You should install the net-www/mod_ssl package for the actual DSO.
+
+DEPEND="dev-lang/perl sys-libs/db
+	>=dev-libs/mm-1.1.3
+	>=sys-libs/gdbm-1.8
+	>=dev-libs/expat-1.95.2"
+LICENSE="Apache-1.1"
+SLOT="1"
+
+#Standard location for Gentoo Linux
+DATADIR="/var/www/localhost"
+
+src_unpack() {
+	local myssl
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p1 <${WORKDIR}/${P}-gentoo.diff || die
+
+	#Obsolete 'head -1' and 'tail -1' calls.
+	perl -pi -e 's|tail -1|tail -n 1|;' \
+		src/Configure src/helpers/getuid.sh
+	perl -pi -e 's|head -1|head -n 1|;' \
+		src/Configure src/helpers/buildinfo.sh src/helpers/fmn.sh
+
+	#Make apachectl read /etc/conf.d/apache
+	patch -p1 <${FILESDIR}/apache-1.3.27-apachectl.patch || die
+	#Fix for #26632
+	patch -p1 <${FILESDIR}/apache-1.3.28-zombie-cgi.patch || die
+
+	# yet another perl path fix..
+	cp htdocs/manual/search/manual-index.cgi \
+		htdocs/manual/search/manual-index.cgi.orig
+	sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
+		htdocs/manual/search/manual-index.cgi.orig \
+		> htdocs/manual/search/manual-index.cgi
+	rm -f htdocs/manual/search/manual-index.cgi.orig
+
+	# setup eapi...
+	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
+	cp ${myssl}/pkg.eapi/*.h src/include
+	cp ${myssl}/pkg.eapi/*.c src/ap
+	patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
+
+	# set a reasonable MM_CORE_PATH location..
+	mv src/include/httpd.h src/include/httpd.h.orig
+	sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
+		src/include/httpd.h.orig > src/include/httpd.h
+
+#	# thanks drey@rt.mipt.ru for these two ...
+#	if use ipv6; then
+#		zcat ${DISTDIR}/apache-${PV}-mod_ssl-${mod_ssl_ver}-v6-20021004.diff.gz | patch -p0 || die
+#	fi
+
+	if use pam; then
+		patch -p1 <${FILESDIR}/suexec_pam_gentoo.patch || die
+	fi
+
+	# Detect db4 correctly
+	patch -p1 <${FILESDIR}/apache-1.3.27_db4_gentoo.patch || die
+}
+
+src_compile() {
+	local myconf mycflags
+	mycflags="${CFLAGS}"
+	unset CFLAGS ; unset CXXFLAGS
+#	use ipv6 && myconf="--enable-rule=INET6"
+
+	select_modules_config || die "determining modules"
+
+	#-DBUFFERED_LOGS
+	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
+		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+	LIBS="-lgdbm -lpthread" \
+	EAPI_MM=SYSTEM \
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib/apache \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/apache/conf \
+		--datadir=${DATADIR} \
+		--cgidir=${DATADIR}/cgi-bin \
+		--iconsdir=${DATADIR}/icons \
+		--htdocsdir=${DATADIR}/htdocs \
+		--manualdir=/usr/share/doc/${PF}/manual \
+		--includedir=/usr/include/apache \
+		--localstatedir=/var \
+		--runtimedir=/var/run \
+		--logfiledir=/var/log/apache \
+		--proxycachedir=/var/cache/apache \
+		--serverroot=/etc/apache \
+		\
+		--target=apache \
+		--server-uid=apache \
+		--server-gid=apache \
+		--enable-rule=EAPI \
+		--enable-rule=SHARED_CHAIN \
+		--with-perl=/usr/bin/perl \
+		\
+		${MY_BUILTINS} \
+		\
+		--enable-suexec \
+		--suexec-uidmin=1000 \
+		--suexec-gidmin=100 \
+		--suexec-caller=apache \
+		--suexec-userdir=public_html \
+		--suexec-docroot=/home \
+		--suexec-safepath="/bin:/usr/bin" \
+		--suexec-logfile=/var/log/apache/suexec_log \
+		\
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	local myfile
+
+	GID=`getent group apache | cut -d: -f3`
+	if [ -z "${GID}" ]; then
+		einfo "Using default GID of 81 for Apache"
+		GID=81
+	fi
+
+	make install-quiet root=${D} || die
+	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
+		${FILESDIR}/robots.txt
+
+	#protect the suexec binary
+	fowners root.${GID} /usr/sbin/suexec
+	fperms 4710 /usr/sbin/suexec
+
+	# nice support scripts..
+	for myfile in apacheaddmod apachedelmod \
+		apachelogserverstatus apachesplitlogfile
+	do
+		exeinto /usr/sbin
+		doexe ${FILESDIR}/$myfile
+	done
+
+	# setup links in /etc/apache..
+	cd ${D}/etc/apache
+	ln -sf ../../usr/lib/apache modules
+	# apxs needs this to pickup the right lib for install..
+	ln -sf ../../usr/lib lib
+	ln -sf ../../var/log/apache logs
+	ln -sf ../../usr/lib/apache-extramodules extramodules
+
+	# drop in a convenient link to the manual
+	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+
+	# deprecated config files, empty dirs..
+	rm -f ${D}/etc/apache/conf/apache.conf.default
+	rm -f ${D}/etc/apache/conf/access.conf*
+	rm -f ${D}/etc/apache/conf/srm.conf*
+
+	# now the config files..
+	insinto /etc/apache/conf
+	doins ${FILESDIR}/conf/commonapache.conf
+	doins ${FILESDIR}/conf/apache.conf
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '15a\AcceptMutex fcntl' \
+		${D}/etc/apache/conf/apache.conf
+	fi
+
+	insinto /etc/apache/conf/vhosts
+	doins ${FILESDIR}/conf/VirtualHomePages.conf
+	doins ${FILESDIR}/conf/DynamicVhosts.conf
+	doins ${FILESDIR}/conf/Vhosts.conf
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
+	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
+	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
+
+	if use pam; then
+		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
+	fi
+
+	#empty dirs
+	dodir /var/cache/apache ; touch ${D}/var/cache/apache/.keep
+	dodir /var/cache/apache-mm ; touch ${D}/var/cache/apache-mm/.keep
+	dodir /usr/lib/apache-extramodules ; touch ${D}/usr/lib/apache-extramodules/.keep
+	dodir /etc/apache/conf/addon-modules ; touch ${D}/etc/apache/conf/addon-modules/.keep
+	dodir /var/log/apache ; touch ${D}/var/log/apache/.keep
+}
+
+pkg_postinst() {
+	# these are in baselayout now; it will not hurt to leave them here though
+	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
+	getent group apache >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		groupadd -g 81 apache || die "problem adding group apache"
+	fi
+
+	# usermod returns 2 on user-exists-but-no-flags-given
+	#usermod apache &>/dev/null
+	#if [ $? != 2 ]; then
+	getent passwd apache >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
+		assert "problem adding user apache"
+	fi
+
+	einfo
+	einfo "Please remember to update your config files in /etc/apache"
+	einfo "as --datadir has been changed to ${DATADIR}!"
+	einfo
+}
+
+parse_modules_config() {
+	local filename=$1
+	local name=""
+	local dso=""
+	local disable=""
+	[ -f ${filename} ] || return 1
+	einfo "Using ${filename} for builtins."
+	for i in `cat $filename | sed "s/^#.*//"` ; do
+		if [ $i == "-" ] ; then
+			disable="true"
+		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then
+			name=`echo $i | sed "s/mod_//"`
+		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then
+			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
+			name="" ; disable=""
+		elif [ $i == "shared" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
+			name="" ; disable=""
+		fi
+	done
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache/apache-builtin-mods || \
+	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
+	return 1
+}
diff --git a/net-www/apache/files/2.0.40/apache2.confd b/net-www/apache/files/2.0.40/apache2.confd
index 8fca4cbacaee..085ac5e72aa7 100644
--- a/net-www/apache/files/2.0.40/apache2.confd
+++ b/net-www/apache/files/2.0.40/apache2.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.confd,v 1.4 2003/09/25 02:20:48 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.confd,v 1.5 2003/09/27 04:47:18 woodchip Exp $
 
 # Config file for /etc/init.d/apache2
 
@@ -14,8 +14,8 @@
 #
 # This means that the mod_ssl.so DSO module is only loaded
 # into the server when you pass "-D SSL" at startup.  To
-# enable WebDAV, add "-D DAV".  If you installed mod_php
-# then add "-D PHP4".  For more options, please read the
-# snippets in the /etc/apache2/conf/modules.d directory.
+# enable WebDAV, add "-D DAV -D DAV_FS".  If you installed
+# mod_php then add "-D PHP4".  For more options, please
+# read the files in the /etc/apache2/conf/modules.d directory.
 
 #APACHE2_OPTS="-D SSL"
diff --git a/net-www/apache/files/2.0.40/commonapache2.conf b/net-www/apache/files/2.0.40/commonapache2.conf
index 685f77657a88..722298bb1e4c 100644
--- a/net-www/apache/files/2.0.40/commonapache2.conf
+++ b/net-www/apache/files/2.0.40/commonapache2.conf
@@ -1,5 +1,5 @@
 ### /etc/apache2/conf/commonapache2.conf
-### $Id: commonapache2.conf,v 1.7 2003/09/25 02:20:48 woodchip Exp $
+### $Id: commonapache2.conf,v 1.8 2003/09/27 04:47:18 woodchip Exp $
 ###
 ### Common server configuration.
 ###
@@ -921,7 +921,10 @@ ServerSignature On
     </Location>
 </IfModule>
 
+<IfModule mod_alias.c>
 AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/localhost/htdocs/manual/$1"
+</IfModule>
+
 <Directory "/var/www/localhost/htdocs/manual">
     Options Indexes
     AllowOverride None
diff --git a/net-www/apache/files/apache-1.3.27_db4_gentoo.patch b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
index e84a6fcb93c0..525df767706c 100644
--- a/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
+++ b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
@@ -1,16 +1,16 @@
-diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.27/src/modules/standard/mod_auth_db.module
---- apache_1.3.27.orig/src/modules/standard/mod_auth_db.module	2001-10-16 11:12:02.000000000 +0200
-+++ apache_1.3.27/src/modules/standard/mod_auth_db.module	2003-06-22 20:22:02.000000000 +0200
-@@ -2,7 +2,12 @@
+diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.27/src/modules/standard/mod_auth_db.module--- apache_1.3.27.orig/src/modules/standard/mod_auth_db.module  2001-10-16 11:12:02.000000000 +0200
++++ apache_1.3.27/src/modules/standard/mod_auth_db.module       2003-06-22 20:22:02.000000000 +0200
+@@ -2,7 +2,13 @@
  ConfigStart
      DB_VERSION=''
      DB_LIB=''
 -    if ./helpers/TestCompile func db_create; then
-+    if ./helpers/TestCompile func db_create_4000; then
-+	DB_VERSION='Berkeley-DB/4.x'
-+    elif ./helpers/TestCompile lib db-4 db_create_4000; then
-+	DB_VERSION='Berkeley-DB/4.x'
-+	DB_LIB='-ldb-4'
++    if ./helpers/TestCompile lib db-4 db_create_4000; then
++       DB_VERSION='Berkeley-DB/4.x'
++       DB_LIB='-ldb-4'
++    elif ./helpers/TestCompile lib db-4.0 db_create_4000; then
++       DB_VERSION='Berkeley-DB/4.x'
++       DB_LIB='-ldb-4.0'
 +    elif ./helpers/TestCompile func db_create; then
          DB_VERSION='Berkeley-DB/3.x'
      elif ./helpers/TestCompile lib db db_create; then
diff --git a/net-www/apache/files/apache-1.3.28-zombie-cgi.patch b/net-www/apache/files/apache-1.3.28-zombie-cgi.patch
new file mode 100644
index 000000000000..a32999535ef0
--- /dev/null
+++ b/net-www/apache/files/apache-1.3.28-zombie-cgi.patch
@@ -0,0 +1,25 @@
+diff -uNr apache_1.3.28.orig/src/main/alloc.c apache_1.3.28/src/main/alloc.c
+--- apache_1.3.28.orig/src/main/alloc.c	2003-06-20 11:05:40.000000000 -0400
++++ apache_1.3.28/src/main/alloc.c	2003-09-26 23:48:14.000000000 -0400
+@@ -2858,13 +2858,14 @@
+     for (p = procs; p; p = p->next) {
+ 	if ((p->kill_how == kill_after_timeout)
+ 	    || (p->kill_how == kill_only_once)) {
+-	    /* Subprocess may be dead already.  Only need the timeout if not. */
+-	    if (ap_os_kill(p->pid, SIGTERM) == -1) {
+-                p->kill_how = kill_never;
+-            }
+-            else {
+-		need_timeout = 1;
+-            }
++	    /*
++	     * This is totally bogus, but seems to be the
++	     * only portable (as in reliable) way to accomplish
++	     * this. Note that this implies an unavoidable
++	     * delay.
++	     */
++	    ap_os_kill(p->pid, SIGTERM);
++	    need_timeout = 1;
+ 	}
+ 	else if (p->kill_how == kill_always) {
+ 	    kill(p->pid, SIGKILL);
diff --git a/net-www/apache/files/apache.rc6 b/net-www/apache/files/apache.rc6
index 201970e0af6f..9f424076bcaf 100644
--- a/net-www/apache/files/apache.rc6
+++ b/net-www/apache/files/apache.rc6
@@ -1,13 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.12 2003/07/11 04:29:55 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.13 2003/09/27 04:47:18 woodchip Exp $
 
 opts="${opts} reload"
 
 depend() {
 	need net
 	use mysql dns logger netmount
+	after sshd
 }
 
 start() {
diff --git a/net-www/apache/files/conf/apache.conf b/net-www/apache/files/conf/apache.conf
index 94b822a7bb9f..25f887a4cd71 100644
--- a/net-www/apache/files/conf/apache.conf
+++ b/net-www/apache/files/conf/apache.conf
@@ -1,4 +1,6 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/conf/apache.conf,v 1.2 2002/05/04 23:23:01 woodchip Exp $
+### /etc/apache/conf/apache.conf
+### $Id: apache.conf,v 1.3 2003/09/27 04:47:18 woodchip Exp $
+###
 ### Main Configuration Section
 ### You really shouldn't change these settings unless you're a guru
 ###
@@ -12,7 +14,7 @@ ErrorLog logs/error_log
 LogLevel warn
 ResourceConfig /dev/null
 AccessConfig /dev/null
-DocumentRoot /home/httpd/htdocs
+DocumentRoot /var/www/localhost/htdocs
 
 
 ### Dynamic Shared Object (DSO) Support
diff --git a/net-www/apache/files/conf/commonapache.conf b/net-www/apache/files/conf/commonapache.conf
index db45c82f6d78..cda503d744c6 100644
--- a/net-www/apache/files/conf/commonapache.conf
+++ b/net-www/apache/files/conf/commonapache.conf
@@ -1,6 +1,8 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/conf/commonapache.conf,v 1.4 2002/05/04 23:23:01 woodchip Exp $
-### Common server configuration
-#
+### /etc/apache/conf/commonapache.conf
+### $Id: commonapache.conf,v 1.5 2003/09/27 04:47:18 woodchip Exp $
+###
+### Common server configuration.
+###
 User apache
 Group apache
 
@@ -198,7 +200,7 @@ ServerSignature On
     # require it to be present in the URL.  So "/icons" isn't aliased in this
     # example, only "/icons/"..
     #
-    Alias /icons/ /home/httpd/icons/
+    Alias /icons/ /var/www/localhost/icons/
     Alias /doc /usr/share/doc
 
 
@@ -210,7 +212,7 @@ ServerSignature On
     # The same rules about trailing "/" apply to ScriptAlias directives as to
     # Alias.
     #
-    ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
+    ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
 
 </IfModule>
 # End of aliases.
@@ -474,7 +476,7 @@ ServerSignature On
 
 <Location /manual>
 Options Multiviews
-ErrorDocument 404 "The document you requested has not been installed on your system.
+ErrorDocument 404 "The document you requested has not been installed on your system."
 </Location>
 
 
@@ -611,7 +613,7 @@ ErrorDocument 404 "The document you requested has not been installed on your sys
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory /home/httpd/htdocs>
+<Directory /var/www/localhost/htdocs>
 
 #
 # This may also be "None", "All", or any combination of "Indexes",
@@ -636,7 +638,7 @@ ErrorDocument 404 "The document you requested has not been installed on your sys
     Allow from all
 </Directory>
 
-<Directory /home/httpd/cgi-bin>
+<Directory /var/www/localhost/cgi-bin>
     AllowOverride All
     Options ExecCGI
     Order allow,deny
@@ -682,7 +684,7 @@ ErrorDocument 404 "The document you requested has not been installed on your sys
     </Directory>
 </IfModule>
 
-<Directory /home/httpd/icons>
+<Directory /var/www/localhost/icons>
     Options -Indexes MultiViews
     AllowOverride None
     Order allow,deny
diff --git a/net-www/apache/files/digest-apache-1.3.28-r1 b/net-www/apache/files/digest-apache-1.3.28-r1
new file mode 100644
index 000000000000..ced7a9374bca
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.28-r1
@@ -0,0 +1,3 @@
+MD5 2cdece7b4881d541e072de6a2b65db77 apache_1.3.28.tar.gz 2388111
+MD5 2faa15ad074ab273af41496a1afa527f apache-1.3.28-gentoo.diff.bz2 6862
+MD5 0f37d6efd51128f696000d73624f5aff mod_ssl-2.8.15-1.3.28.tar.gz 754203