Fix #25258, #25999, --datadir moves to /var/www/localhost

10 files changed, 492 insertions, 30 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 90bc04542079..86b26e404fb5 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,16 @@
 # 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.66 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.67 2003/09/25 02:20:48 woodchip Exp $
+
+*apache-2.0.47-r1 (24 Sep 2003)
+
+  24 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-2.0.47-r1.ebuild,
+  files/apache-2.0.47-gentoo.diff, files/2.0.40/41_mod_ssl.default-vhost.conf,
+  files/2.0.40/apache2.conf, files/2.0.40/apache2.confd,
+  files/2.0.40/apache2.initd, files/2.0.40/commonapache2.conf:
+  Fix #25258, #25999.  Add RH patches to fix parallel build and *.conf crash.
+  Move --datadir to /var/www/localhost; prepare for the upcoming vhost-config
+  and webapp-config tools.
 
   25 Aug 2003; Jason Wever <weeve@gentoo.org> apache-1.3.27-r3.ebuild,
   apache-1.3.27-r4.ebuild, apache-1.3.28.ebuild, apache-2.0.46.ebuild,
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 712cfcf41408..1851aca26891 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,7 +1,7 @@
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
 MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
-MD5 d7d8e9aad515d185d7649fb364384255 ChangeLog 13436
-MD5 d49003778a78d50c5a8bf8120b39c262 apache-2.0.47-r1.ebuild 10708
+MD5 845e252c11b15cdb71aa8c0da260a33a ChangeLog 13439
+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
@@ -43,10 +43,10 @@ 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 287e41fba04d207f2107e3d64f4c06dd files/2.0.40/commonapache2.conf 31741
-MD5 3bcbe7fae380806bd65e8d7a6d04d05e files/2.0.40/apache2.confd 775
-MD5 46ddeda9735bc19a3ffa120ce7b3c153 files/2.0.40/apache2.initd 1132
-MD5 12f8ec6337e2990c8bb2161c98bbef33 files/2.0.40/apache2.conf 7649
+MD5 61d98c732d5c50481ba26a384535990f files/2.0.40/commonapache2.conf 31741
+MD5 257af64b157a13460f89207c6844f79f files/2.0.40/apache2.confd 777
+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
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
 MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
diff --git a/net-www/apache/apache-2.0.47-r1.ebuild b/net-www/apache/apache-2.0.47-r1.ebuild
new file mode 100644
index 000000000000..acd065c53963
--- /dev/null
+++ b/net-www/apache/apache-2.0.47-r1.ebuild
@@ -0,0 +1,338 @@
+# 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-2.0.47-r1.ebuild,v 1.1 2003/09/25 02:20:48 woodchip Exp $
+
+inherit flag-o-matic
+has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+DESCRIPTION="Apache Web Server, Version 2.0.x"
+HOMEPAGE="http://www.apache.org/"
+
+S="${WORKDIR}/httpd-${PV}"
+SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
+KEYWORDS="~x86 ~ppc ~alpha ~hppa ~mips ~sparc ~amd64"
+LICENSE="Apache-1.1"
+SLOT="2"
+
+#Standard location for Gentoo Linux
+DATADIR="/var/www/localhost"
+
+DEPEND="dev-util/yacc
+	dev-lang/perl
+	sys-libs/zlib
+	dev-libs/expat
+	dev-libs/openssl
+	berkdb? sys-libs/db
+	gdbm? sys-libs/gdbm
+	ldap? =net-nds/openldap-2*"
+IUSE="berkdb gdbm ldap"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p1 <${FILESDIR}/apache-2.0.47-gentoo.diff || die
+
+	#avoid utf-8 charset problems
+	export LC_CTYPE=C
+
+	#the -1 shortcut is obsolete
+	perl -pi -e 's|head -1|head -n 1|;' srclib/apr/build/buildcheck.sh
+
+	#give it the stamp
+	perl -pi -e 's|" PLATFORM "|Gentoo/Linux|;' server/core.c
+	#fix perl with perl!
+	find -type f | xargs perl -pi -e \
+		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
+		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
+		s|/path/to/bin/perl|/usr/bin/perl|g;"
+	#dont want this cruft in /usr/bin
+	perl -pi -e 's|\@exp_bindir\@(/envvars)|\@exp_installbuilddir\@\1|;' \
+		support/apachectl.in
+
+	#setup the filesystem layout config
+	local prefix=/usr
+	cat >>config.layout <<-EOF
+	<Layout Gentoo>
+	prefix:          ${prefix}
+	exec_prefix:     ${prefix}
+	bindir:          ${prefix}/bin
+	sbindir:         ${prefix}/sbin
+	libdir:          ${prefix}/lib
+	libexecdir:      ${prefix}/lib/apache2
+	mandir:          ${prefix}/share/man
+	infodir:         ${prefix}/share/info
+	includedir:      ${prefix}/include/apache2
+	installbuilddir: ${prefix}/lib/apache2/build
+	datadir:         ${DATADIR}
+	errordir:        ${DATADIR}/error
+	iconsdir:        ${DATADIR}/icons
+	htdocsdir:       ${DATADIR}/htdocs
+	cgidir:          ${DATADIR}/cgi-bin
+	manualdir:       /usr/share/doc/${PF}/manual
+	sysconfdir:      /etc/apache2/conf
+	localstatedir:   /var
+	runtimedir:      /var/run
+	logfiledir:      /var/log/apache2
+	proxycachedir:   /var/cache/apache2
+	</Layout>
+	EOF
+
+	#gotta do these next two as well :\
+	cat >>srclib/apr/config.layout <<-EOF
+	<Layout Gentoo>
+	prefix:          ${prefix}
+	exec_prefix:     ${prefix}
+	bindir:          ${prefix}/bin
+	sbindir:         ${prefix}/sbin
+	libdir:          ${prefix}/lib
+	libexecdir:      ${prefix}/lib/apache2
+	mandir:          ${prefix}/share/man
+	sysconfdir:      /etc/apache2/conf
+	datadir:         ${DATADIR}
+	installbuilddir: ${prefix}/lib/apache2/build
+	includedir:      ${prefix}/include/apache2
+	localstatedir:   /var
+	libsuffix:       -\${APR_MAJOR_VERSION}
+	</Layout>
+	EOF
+
+	cat >>srclib/apr-util/config.layout <<-EOF
+	<Layout Gentoo>
+	prefix:          ${prefix}
+	exec_prefix:     ${prefix}
+	bindir:          ${prefix}/bin
+	sbindir:         ${prefix}/sbin
+	libdir:          ${prefix}/lib
+	libexecdir:      ${prefix}/lib/apache2
+	mandir:          ${prefix}/share/man
+	sysconfdir:      /etc/apache2/conf
+	datadir:         ${DATADIR}
+	installbuilddir: ${prefix}/lib/apache2/build
+	includedir:      ${prefix}/include/apache2
+	localstatedir:   /var
+	libsuffix:       -\${APRUTIL_MAJOR_VERSION}
+	</Layout>
+	EOF
+
+	./buildconf || die "buildconf failed"
+}
+
+src_compile() {
+	local myconf
+	use ldap && \
+		myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
+
+	select_modules_config || die "determining modules"
+
+	SSL_BASE="SYSTEM" \
+	./configure \
+		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+		--with-suexec-logfile=/var/log/apache2/suexec_log \
+		--with-suexec-bin=/usr/sbin/suexec2 \
+		--with-suexec-userdir=public_html \
+		--with-suexec-caller=apache \
+		--with-suexec-docroot=/home \
+		--with-suexec-uidmin=1000 \
+		--with-suexec-gidmin=100 \
+		--with-suexec-umask=077 \
+		--enable-suexec=shared \
+		\
+		${MY_BUILTINS} \
+		\
+		--with-perl=/usr/bin/perl \
+		--with-expat=/usr \
+		--with-ssl=/usr \
+		--with-z=/usr \
+		--with-port=80 \
+		--with-mpm=${MPM:=prefork} \
+		--enable-layout=Gentoo \
+		--with-program-name=apache2 \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+		#--with-mpm={worker|prefork|perchild|leader|threadpool}
+
+	emake || die "problem compiling Apache2 :("
+
+	#build ssl version of apache bench (ab-ssl)
+	cd support; rm -f ab .libs/ab ab.lo ab.o
+	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
+		-I/usr/include/openssl -L/usr/lib" || die
+	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
+	make ab || die
+}
+
+src_install () {
+	local i
+	make DESTDIR=${D} install || die
+	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
+		LICENSE README* ${FILESDIR}/robots.txt
+
+	#bogus values pointing at /var/tmp/portage
+	perl -pi -e "s/(APR_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apr-config
+	perl -pi -e "s/(APU_SOURCE_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
+	perl -pi -e "s/(APU_BUILD_DIR=).*/\1\"\"/" ${D}/usr/bin/apu-config
+
+	#protect the suexec binary
+	local gid=`getent group apache |cut -d: -f3`
+	[ -z "${gid}" ] && gid=81
+	fowners root.${gid} /usr/sbin/suexec
+	fperms 4710 /usr/sbin/suexec
+
+	#setup links in /etc/apache2
+	cd ${D}/etc/apache2
+	ln -sf ../../usr/lib/apache2 modules
+	#apxs needs this to pickup the right lib for install
+	ln -sf ../../usr/lib lib
+	ln -sf ../../var/log/apache2 logs
+	ln -sf ../../usr/lib/apache2-extramodules extramodules
+	cd ${S}
+
+	#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
+	do
+		doexe ${FILESDIR}/2.0.40/$i
+	done
+	exeinto /usr/lib/ssl/apache2-mod_ssl
+	doexe ${FILESDIR}/2.0.40/gentestcrt.sh
+
+	#some more scripts
+	exeinto /usr/sbin
+	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
+	do
+		doexe ${S}/support/$i
+	done
+	#the ssl version of apache bench
+	doexe support/.libs/ab-ssl
+
+	#move some mods to extramodules
+	dodir /usr/lib/apache2-extramodules
+	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
+	do
+		[ -x ${D}/usr/lib/apache2/$i ] && \
+		mv ${D}/usr/lib/apache2/$i ${D}/usr/lib/apache2-extramodules
+	done
+
+	#modules.d config file snippets
+	insinto /etc/apache2/conf/modules.d
+	for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf
+	do
+		doins ${FILESDIR}/2.0.40/$i
+	done
+	use ldap && doins ${FILESDIR}/2.0.40/46_mod_ldap.conf
+
+	#drop in a convenient link to the manual
+	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+
+	#SLOT=2!!!
+	cd ${D}
+	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
+	mv -v usr/sbin/htdigest usr/sbin/htdigest2
+	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
+	mv -v usr/sbin/logresolve usr/sbin/logresolve2
+	mv -v usr/sbin/apxs usr/sbin/apxs2
+	mv -v usr/sbin/ab usr/sbin/ab2
+	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
+	mv -v usr/sbin/suexec usr/sbin/suexec2
+	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
+	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
+	mv -v usr/sbin/checkgid usr/sbin/checkgid2
+	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
+	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
+	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
+	mv -v usr/sbin/log_server_status usr/sbin/log_server_status2
+	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
+	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
+	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
+	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
+	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
+	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
+	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
+	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
+	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
+	#tidy up
+	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
+	dodoc ${D}/etc/apache2/conf/*-std.conf
+	rm -f ${D}/etc/apache2/conf/*.conf
+	rm -rf ${D}/var/run ${D}/var/log
+
+	#config files
+	insinto /etc/conf.d; newins ${FILESDIR}/2.0.40/apache2.confd apache2
+	exeinto /etc/init.d; newexe ${FILESDIR}/2.0.40/apache2.initd apache2
+	insinto /etc/apache2; doins ${FILESDIR}/2.0.40/apache2-builtin-mods
+	insinto /etc/apache2/conf
+	doins ${FILESDIR}/2.0.40/commonapache2.conf
+	doins ${FILESDIR}/2.0.40/apache2.conf
+	insinto /etc/apache2/conf/vhosts
+	doins ${FILESDIR}/2.0.40/virtual-homepages.conf
+	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
+	doins ${FILESDIR}/2.0.40/vhosts.conf
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '13a\AcceptMutex fcntl' \
+			${D}/etc/apache2/conf/apache2.conf
+	fi
+}
+
+parse_modules_config() {
+	local filename=$1
+	local name=""
+	local dso=""
+	local disable=""
+	[ -f ${filename} ] || return 1
+	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-$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
+			name="" ; disable=""
+		elif [ $i == "shared" ] ; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
+			name="" ; disable=""
+		fi
+	done
+	einfo "${filename} options:\n${MY_BUILTINS}"
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache2/apache2-builtin-mods || \
+	parse_modules_config ${FILESDIR}/2.0.40/apache2-builtin-mods || \
+	return 1
+}
+
+pkg_postinst() {
+	#empty dirs...
+	install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
+	install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
+	install -d -m0755 -o root -g root ${ROOT}/var/cache/apache2
+	install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
+
+	cd ${ROOT}/etc/apache2/conf/ssl
+	einfo
+	einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
+	yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
+	einfo
+
+	if has_version '=net-www/apache-1*' ; then
+	ewarn
+	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
+	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
+	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
+	ewarn
+	fi
+
+	einfo
+	einfo "Please remember to update your config files in /etc/apache2"
+	einfo "as --datadir has been changed to ${DATADIR}!"
+	einfo
+}
diff --git a/net-www/apache/files/2.0.40/41_mod_ssl.default-vhost.conf b/net-www/apache/files/2.0.40/41_mod_ssl.default-vhost.conf
index f79b177ce5ee..9a7563ee6008 100644
--- a/net-www/apache/files/2.0.40/41_mod_ssl.default-vhost.conf
+++ b/net-www/apache/files/2.0.40/41_mod_ssl.default-vhost.conf
@@ -14,7 +14,7 @@
 
 #  General setup for the virtual host
 
-DocumentRoot "/home/httpd/htdocs"
+DocumentRoot "/var/www/localhost/htdocs"
 #ServerName localhost:443
 #ServerAdmin root@localhost
 ErrorLog logs/ssl_error_log
@@ -142,7 +142,7 @@ SSLCertificateKeyFile conf/ssl/server.key
 
 </Files>
 
-<Directory "/home/httpd/cgi-bin">
+<Directory "/var/www/localhost/cgi-bin">
 
     SSLOptions +StdEnvVars
 
diff --git a/net-www/apache/files/2.0.40/apache2.conf b/net-www/apache/files/2.0.40/apache2.conf
index f0e3b5cf54bb..a9c6218d61cd 100644
--- a/net-www/apache/files/2.0.40/apache2.conf
+++ b/net-www/apache/files/2.0.40/apache2.conf
@@ -1,5 +1,5 @@
 ### /etc/apache2/conf/apache2.conf
-### $Id: apache2.conf,v 1.2 2003/02/23 19:39:22 woodchip Exp $
+### $Id: apache2.conf,v 1.3 2003/09/25 02:20:48 woodchip Exp $
 ###
 ### Main Configuration Section
 ### You really shouldn't change these settings unless you're a guru
@@ -10,7 +10,7 @@ ServerRoot /etc/apache2
 PidFile /var/run/apache2.pid
 ErrorLog logs/error_log
 LogLevel warn
-DocumentRoot /home/httpd/htdocs
+DocumentRoot /var/www/localhost/htdocs
 
 ### Dynamic Shared Object (DSO) Support
 ### 
@@ -187,4 +187,3 @@ MaxSpareThreads     10
 MaxThreadsPerChild  20
 MaxRequestsPerChild  0
 </IfModule>
-
diff --git a/net-www/apache/files/2.0.40/apache2.confd b/net-www/apache/files/2.0.40/apache2.confd
index f31ff3785823..8fca4cbacaee 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-2002 Gentoo Technologies, Inc.
+# 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.3 2003/07/27 02:54:41 vapier Exp $
+# $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 $
 
 # Config file for /etc/init.d/apache2
 
diff --git a/net-www/apache/files/2.0.40/apache2.initd b/net-www/apache/files/2.0.40/apache2.initd
index e7e65b0c4adc..ff98a2984df9 100644
--- a/net-www/apache/files/2.0.40/apache2.initd
+++ b/net-www/apache/files/2.0.40/apache2.initd
@@ -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/2.0.40/apache2.initd,v 1.9 2003/07/11 04:29:55 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.initd,v 1.10 2003/09/25 02:20:48 woodchip Exp $
 
 opts="${opts} reload"
 
 depend() {
 	need net
 	use mysql dns logger netmount
+	after sshd
 }
 
 start() {
diff --git a/net-www/apache/files/2.0.40/commonapache2.conf b/net-www/apache/files/2.0.40/commonapache2.conf
index 4f36f699d103..685f77657a88 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.6 2003/07/21 03:08:20 woodchip Exp $
+### $Id: commonapache2.conf,v 1.7 2003/09/25 02:20:48 woodchip Exp $
 ###
 ### Common server configuration.
 ###
@@ -19,7 +19,7 @@ ServerAdmin root@localhost
 ### symbolic links and aliases may be used to point to other locations.
 ### DO NOT MODIFY THIS ONE, USE apache2.conf.
 ###
-#DocumentRoot /home/httpd/htdocs
+#DocumentRoot /var/www/localhost/htdocs
 
 ###
 ### Each directory to which Apache has access, can be configured with respect
@@ -218,7 +218,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
 
     #
@@ -229,17 +229,17 @@ ServerSignature On
     # The same rules about trailing "/" apply to ScriptAlias directives as to
     # Alias.
     #
-    ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
-    ScriptAlias /protected-cgi-bin/ /home/httpd/protected-cgi-bin/
+    ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
+    ScriptAlias /protected-cgi-bin/ /var/www/localhost/protected-cgi-bin/
     ScriptAliasMatch ^/~([^/]*)/cgi-bin/(.*) /home/$1/public_html/cgi-bin/$2
 
     <IfModule mod_perl.c>
 	#Provide two aliases to the same cgi-bin directory,
 	#to see the effects of the 2 different mod_perl modes
 	#for Apache::Registry Mode
-	Alias /perl/ /home/httpd/perl/
+	Alias /perl/ /var/www/localhost/perl/
 	#for Apache::Perlrun Mode
-	Alias /cgi-perl/ /home/httpd/perl/
+	Alias /cgi-perl/ /var/www/localhost/perl/
     </IfModule>
 
 </IfModule>
@@ -564,9 +564,9 @@ ServerSignature On
 ### The internationalized error documents require mod_alias, mod_include
 ### and mod_negotiation.  To activate them, uncomment the following 30 lines.
 ###
-#    Alias /error/ "/home/httpd/error"
+#    Alias /error/ "/var/www/localhost/error"
 #
-#    <Directory "/home/httpd/error">
+#    <Directory "/var/www/localhost/error">
 #        AllowOverride None
 #        Options IncludesNoExec
 #        AddOutputFilter Includes html
@@ -746,7 +746,7 @@ ServerSignature On
 ### being sent to the client over the network.
 ###
 <IfModule mod_deflate.c>
-    <Directory "/home/httpd/htdocs/manual">
+    <Directory "/var/www/localhost/htdocs/manual">
       AddOutputFilterByType DEFLATE text/html
     </Directory>
 
@@ -763,7 +763,7 @@ ServerSignature On
 ###
 ### 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",
 # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
@@ -790,7 +790,7 @@ ServerSignature On
 ###
 ### Comment me :)
 ###
-<Directory /home/httpd/perl>
+<Directory /var/www/localhost/perl>
     AllowOverride All
     Options -Indexes FollowSymLinks MultiViews ExecCGI
     <IfModule mod_access.c>
@@ -810,7 +810,7 @@ ServerSignature On
 ###
 ### This is intended for your world-accessible CGI programs.
 ###
-<Directory /home/httpd/cgi-bin>
+<Directory /var/www/localhost/cgi-bin>
     AllowOverride All
     Options ExecCGI
     <IfModule mod_access.c>
@@ -822,7 +822,7 @@ ServerSignature On
 ###
 ### Access to these CGI programs will be restricted.
 ###
-<Directory /home/httpd/protected-cgi-bin>
+<Directory /var/www/localhost/protected-cgi-bin>
     AllowOverride All
     Options ExecCGI
     <IfModule mod_access.c>
@@ -876,7 +876,7 @@ ServerSignature On
     </Directory>
 </IfModule>
 
-<Directory /home/httpd/icons>
+<Directory /var/www/localhost/icons>
     Options -Indexes MultiViews
     AllowOverride None
     <IfModule mod_access.c>
@@ -921,3 +921,22 @@ ServerSignature On
     </Location>
 </IfModule>
 
+AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/localhost/htdocs/manual/$1"
+<Directory "/var/www/localhost/htdocs/manual">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+
+    <Files *.html>
+        SetHandler type-map
+    </Files>
+
+    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
+    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
+    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
+    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
+    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
+    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
+    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
+</Directory>
diff --git a/net-www/apache/files/apache-2.0.47-gentoo.diff b/net-www/apache/files/apache-2.0.47-gentoo.diff
new file mode 100644
index 000000000000..188cff8b3a32
--- /dev/null
+++ b/net-www/apache/files/apache-2.0.47-gentoo.diff
@@ -0,0 +1,94 @@
+diff -uNr httpd-2.0.47/os/unix/unixd.c httpd-2.0.47-woodchip/os/unix/unixd.c
+--- httpd-2.0.47/os/unix/unixd.c	2003-05-15 16:28:18.000000000 -0400
++++ httpd-2.0.47-woodchip/os/unix/unixd.c	2003-09-03 22:27:07.000000000 -0400
+@@ -243,23 +243,20 @@
+ 
+ AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
+ {
+-    apr_finfo_t wrapper;
++    struct stat wrapper;
+ 
+     unixd_config.user_name = DEFAULT_USER;
+     unixd_config.user_id = ap_uname2id(DEFAULT_USER);
+     unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);
+ 
+     /* Check for suexec */
+-    unixd_config.suexec_enabled = 0;
+-    if ((apr_stat(&wrapper, SUEXEC_BIN, 
+-                  APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
+-        return;
+-    }
+-
+-    /* XXX - apr_stat is incapable of checking suid bits (grumble) */
+-    /* if ((wrapper.filetype & S_ISUID) && wrapper.user == 0) { */
++    if (stat(SUEXEC_BIN, &wrapper) == 0 && 
++	(wrapper.st_mode & S_ISUID) && wrapper.st_uid == 0) {
+         unixd_config.suexec_enabled = 1;
+-    /* } */
++    } else {
++	unixd_config.suexec_enabled = 0;
++    }
++    
+ }
+ 
+ 
+diff -uNr httpd-2.0.47/server/Makefile.in httpd-2.0.47-woodchip/server/Makefile.in
+--- httpd-2.0.47/server/Makefile.in	2003-03-11 10:41:55.000000000 -0500
++++ httpd-2.0.47-woodchip/server/Makefile.in	2003-09-03 22:29:14.000000000 -0400
+@@ -70,6 +70,9 @@
+ # wtf does this have to be explicit????
+ exports.lo: exports.c
+ 
++# Needed to allow exports.c to be generated in a parallel build successfully
++.NOTPARALLEL: $(top_builddir)/server/exports.c
++
+ # Rule to make def file for OS/2 core dll
+ ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
+ 	cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@
+diff -uNr httpd-2.0.47/server/config.c httpd-2.0.47-woodchip/server/config.c
+--- httpd-2.0.47/server/config.c	2003-02-26 23:01:20.000000000 -0500
++++ httpd-2.0.47-woodchip/server/config.c	2003-09-03 22:28:05.000000000 -0400
+@@ -1519,6 +1519,7 @@
+             /* strip out '.' and '..' */
+             if (strcmp(dirent.name, ".")
+                 && strcmp(dirent.name, "..")
++                && !apr_fnmatch_test(dirent.name)
+                 && (!ispatt ||
+                     apr_fnmatch(pattern, dirent.name, 
+                                 FNM_PERIOD) == APR_SUCCESS)) {
+diff -uNr httpd-2.0.47/support/apachectl.in httpd-2.0.47-woodchip/support/apachectl.in
+--- httpd-2.0.47/support/apachectl.in	2003-02-03 12:32:08.000000000 -0500
++++ httpd-2.0.47-woodchip/support/apachectl.in	2003-09-03 22:27:07.000000000 -0400
+@@ -28,7 +28,8 @@
+ # --------------------                              --------------------
+ # 
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@exp_sbindir@/@progname@'
++. /etc/conf.d/apache2
++HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}"
+ #
+ # pick up any necessary environment variables
+ if test -f @exp_bindir@/envvars; then
+diff -uNr httpd-2.0.47/support/apxs.in httpd-2.0.47-woodchip/support/apxs.in
+--- httpd-2.0.47/support/apxs.in	2003-05-21 07:39:52.000000000 -0400
++++ httpd-2.0.47-woodchip/support/apxs.in	2003-09-03 22:27:07.000000000 -0400
+@@ -237,19 +237,6 @@
+     ($httpd = $0) =~ s:support/apxs$::;
+ }
+ 
+-unless (-x "$httpd") {
+-	error("$httpd not found or not executable");
+-	exit 1;
+-}
+-
+-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+-    error("Sorry, no shared object support for Apache");
+-    error("available under your platform. Make sure");
+-    error("the Apache module mod_so is compiled into");
+-    error("your server binary `$httpd'.");
+-    exit 1;
+-}
+-
+ sub get_config_vars{
+     my ($file, $rh_config) = @_;
+ 
diff --git a/net-www/apache/files/digest-apache-2.0.47-r1 b/net-www/apache/files/digest-apache-2.0.47-r1
new file mode 100644
index 000000000000..35d1a58eaf56
--- /dev/null
+++ b/net-www/apache/files/digest-apache-2.0.47-r1
@@ -0,0 +1 @@
+MD5 63f16638c18b140b649fab32b54d7f9c httpd-2.0.47.tar.gz 6217401