Verison bump, helps take care of #51368.

4 files changed, 289 insertions, 39 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 568ca3a9828e..baa6cde89170 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.175 2004/05/26 12:24:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.176 2004/05/29 16:28:37 zul Exp $
+
+*apache-1.3.31-r1 (29 May 2004)
+
+  29 May 2004; <chuck@gentoo.org> apache-1.3.31-r1.ebuild:
+  Version bump, to use the new mod_ssl whitch takes cares of some security
+  holes. See #51638.
 
   26 May 2004; Stuart Herbert <stuart@gentoo.org> apache-2.0.49-r1.ebuild,
   apache-2.0.49-r2.ebuild, files/patches/2.0.49-r1/04_ssl_makefile.patch,
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index ded86cdd81d9..5fe05ddf7572 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,40 +1,42 @@
-MD5 0554c5d71493814bdf5b8be830a57253 apache-2.0.49-r1.ebuild 12444
+MD5 3ef0817f23fee9b130f28be28b980c63 apache-2.0.49-r2.ebuild 12844
 MD5 dd23c6c6f8cdaeff6319e358601547be apache-1.3.29-r2.ebuild 7144
-MD5 738de16a708fdae922876faebfa4ddd7 apache-2.0.48-r4.ebuild 12398
 MD5 9d7d4e87f62b4c1667fb9016fd36b9d9 apache-1.3.31.ebuild 6701
+MD5 0554c5d71493814bdf5b8be830a57253 apache-2.0.49-r1.ebuild 12444
+MD5 738de16a708fdae922876faebfa4ddd7 apache-2.0.48-r4.ebuild 12398
 MD5 e0f991e03523c04fc281041e5a6c88c6 apache-1.3.29-r1.ebuild 7442
-MD5 3ef0817f23fee9b130f28be28b980c63 apache-2.0.49-r2.ebuild 12844
+MD5 969cda4fe045249c08d5a13aec212865 apache-2.0.49.ebuild 12747
+MD5 40ca46e2d1e12d455b6d934b5fc0a9ec apache-1.3.31-r1.ebuild 6712
 MD5 f0bc8312a2a5568a086bfeef9d4f598f ChangeLog 31791
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 969cda4fe045249c08d5a13aec212865 apache-2.0.49.ebuild 12747
+MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r1 65
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r1 211
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
-MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
-MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48-r4 65
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r1 65
+MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r2 65
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49-r2 65
 MD5 7d55db018577d9c8f779d29dad70f22d files/apache.rc6 1082
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
+MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
 MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
+MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
+MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 d3339c25967ce7b36ef24495542f044a files/apachesplitlogfile 4948
-MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65
-MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
-MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
+MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
+MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
+MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
+MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 75e88ab5a3193fe8ff31c09f5bae2c09 files/conf/commonapache.conf 22175
 MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
@@ -44,9 +46,9 @@ MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776
 MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955
 MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
 MD5 e8f5a440ea77613b7908872b6ef7cf88 files/2.0.48-r1/apache2.conf 7659
-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 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
@@ -65,37 +67,42 @@ MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
 MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
-MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
-MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
-MD5 6d56b77cb2230dd123b6a22ce71ef1f4 files/2.0.49/apache2.initd 2498
-MD5 65f0d13e644e1dba96e3f0470488c75e files/2.0.49/commonapache2.conf 32101
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
-MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
-MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.49/40_mod_ssl.conf 3185
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844
 MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
 MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
-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 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+MD5 65f0d13e644e1dba96e3f0470488c75e files/2.0.49/commonapache2.conf 32101
+MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
+MD5 6d56b77cb2230dd123b6a22ce71ef1f4 files/2.0.49/apache2.initd 2498
+MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
+MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
+MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
+MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
 MD5 fc31be76ad482038fa9019ea59067473 files/patches/2.0.49-r1/00_ssl_engine.patch 1364
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
+MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
 MD5 b7c4fabdcb3845c4218b770acb792f73 files/patches/2.0.49-r2/00_gentoo_base.patch 6316
-MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 5c4796d256a7a9d38dfd7cad6ffbc448 files/patches/2.0.49-r2/01_gentoo_cvs_sync.patch 619776
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/patches/2.0.49-r2/01_gentoo_ipv6.patch 788
-MD5 7c6533ba87a75f243b4098b4e530bc00 files/patches/2.0.49-r2/01_ssl_verify_client.patch 6743
+MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r2/01_apache_ldap_fixes.patch 18048
 MD5 b50b5055727b0d1aa89936d0decccd2e files/patches/2.0.49-r2/03_redhat_xfsz.patch 563
 MD5 f0d25e7c6f092d5f64b18eb8f2f62fc6 files/patches/2.0.49-r2/Readme.PATCHES 552
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r2/01_apache_ldap_fixes.patch 18048
+MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/patches/2.0.49-r2/01_gentoo_ipv6.patch 788
+MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r2/04_ssl_makefile.patch 619
+MD5 7c6533ba87a75f243b4098b4e530bc00 files/patches/2.0.49-r2/01_ssl_verify_client.patch 6743
+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 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/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-r1/00_gentoo_base.patch 27799
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
+MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31-r1/Readme.PATCHES 747
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
diff --git a/net-www/apache/apache-1.3.31-r1.ebuild b/net-www/apache/apache-1.3.31-r1.ebuild
new file mode 100644
index 000000000000..1d7f439e67a8
--- /dev/null
+++ b/net-www/apache/apache-1.3.31-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2004 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.31-r1.ebuild,v 1.1 2004/05/29 16:28:37 zul Exp $
+
+inherit eutils fixheadtails
+
+IUSE="pam"
+
+mod_ssl_ver=2.8.18
+
+S=${WORKDIR}/${PN}_${PV}
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://www.apache.org http://www.modssl.org"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+SRC_URI="http://www.apache.org/dist/httpd/apache_${PV}.tar.gz
+	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.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-4.1
+	>=dev-libs/mm-1.1.3
+	>=sys-libs/gdbm-1.8
+	>=dev-libs/expat-1.95.2
+	>=sys-apps/sed-4
+	sys-libs/db"
+LICENSE="Apache-2.0"
+SLOT="1"
+
+#Standard location for Gentoo Linux
+DATADIR="/var/www/localhost"
+
+src_unpack() {
+	local myssl
+	unpack ${A} || die
+	cd ${S} || die
+
+	epatch ${FILESDIR}/patches/${PVR}/00_gentoo_base.patch
+	epatch ${FILESDIR}/patches/${PVR}/00_gentoo_db4_detect.patch
+	epatch ${FILESDIR}/patches/${PVR}/00_gentoo_apachectl.patch
+
+	if use pam ; then
+		epatch ${FILESDIR}/patches/${PVR}/00_gentoo_suexec_pam.patch
+	fi
+
+	#Obsolete 'head -1' and 'tail -1' calls.
+	ht_fix_file src/Configure src/helpers/getuid.sh
+
+	# setup eapi...
+	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
+	cp ${myssl}/pkg.eapi/*.h src/include
+	cp ${myssl}/pkg.eapi/*.c src/ap
+	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
+
+	# set a reasonable MM_CORE_PATH location..
+	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
+		src/include/httpd.h
+}
+
+src_compile() {
+	local myconf mycflags
+	mycflags="${CFLAGS}"
+	unset CFLAGS ; unset CXXFLAGS
+
+	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 \
+		--with-perl=/usr/bin/perl \
+		--enable-rule=EAPI \
+		--enable-rule=SHARED_CHAIN \
+		${MY_BUILTINS} \
+		--enable-suexec \
+		--suexec-uidmin=1000 \
+		--suexec-gidmin=100 \
+		--suexec-caller=apache \
+		--suexec-userdir=public_html \
+		--suexec-docroot=/var/www \
+		--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=`id -g apache`
+	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
+	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
+}
+
+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/digest-apache-1.3.31-r1 b/net-www/apache/files/digest-apache-1.3.31-r1
new file mode 100644
index 000000000000..72445cf02f09
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.31-r1
@@ -0,0 +1,2 @@
+MD5 bd548a06ac48dda496b4e613572bb020 apache_1.3.31.tar.gz 2467371
+MD5 4e966d62bb9304fef153b03868756543 mod_ssl-2.8.18-1.3.31.tar.gz 754214