Version bump

4 files changed, 270 insertions, 28 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 14644f9ffdd3..9b5441ad9ebb 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.279 2004/10/15 16:26:34 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.280 2004/10/23 21:16:02 stuart Exp $
+
+*apache-1.3.32 (23 Oct 2004)
+
+  23 Oct 2004; Stuart Herbert <stuart@gentoo.org> +apache-1.3.32.ebuild:
+  Version bump
 
   15 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.52.ebuild:
   Marked stable on amd64.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index a47b1ad312d6..22c89cf60c97 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,16 +1,19 @@
-MD5 5ce2e8ed48537e60367e8a9818f51f3a ChangeLog 47860
-MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
-MD5 190e9f0c2c609961ca653a7d08e0a13e apache-2.0.51-r1.ebuild 12858
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 e4dc4b093f2d9b8edd137e09ecbb2adf apache-1.3.29-r2.ebuild 7177
+MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
+MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
+MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
 MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
 MD5 c5b1ef03a59e0a8fc24a52f78cafc86b apache-2.0.50.ebuild 12925
-MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
-MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
+MD5 5ce2e8ed48537e60367e8a9818f51f3a ChangeLog 47860
+MD5 190e9f0c2c609961ca653a7d08e0a13e apache-2.0.51-r1.ebuild 12858
 MD5 8f1b0aafba0dfaa809f85a1dc53db750 apache-2.0.52.ebuild 12854
+MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
+MD5 c65cc5071892847d0868bcea7e35d976 apache-1.3.32.ebuild 6620
 MD5 9571486ae781f512a13ff50006873ff2 apache-2.0.51.ebuild 12849
+MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
+MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
@@ -23,23 +26,22 @@ MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
 MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
 MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
-MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
-MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137
-MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
-MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
 MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
+MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137
+MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
+MD5 d0934aedd71114be3cd0ba557fe07eb6 files/digest-apache-2.0.52 137
+MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
+MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
-MD5 d0934aedd71114be3cd0ba557fe07eb6 files/digest-apache-2.0.52 137
 MD5 64670c349a80e98fc61da8e32b44a913 files/httpd-2.0.49-ssl_engine_kernel.patch 66330
+MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
@@ -78,26 +80,19 @@ MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
 MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
+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 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
 MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
 MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-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 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 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 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-MD5 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330
-MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/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
@@ -107,5 +102,12 @@ MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl
 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304
 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
+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 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
+MD5 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330
+MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
+MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
+MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 a6fbf43cb7c6827f046f7b1df65932c2 files/patches/2.0.50-r1/00_ssl_engine.patch 414
 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
diff --git a/net-www/apache/apache-1.3.32.ebuild b/net-www/apache/apache-1.3.32.ebuild
new file mode 100644
index 000000000000..f53aa46d549c
--- /dev/null
+++ b/net-www/apache/apache-1.3.32.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32.ebuild,v 1.1 2004/10/23 21:16:02 stuart Exp $
+
+inherit eutils fixheadtails
+
+IUSE="pam"
+
+mod_ssl_ver=2.8.21
+
+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
+	http://dev.gentoo.org/~stuart/apache/apache-patches-1.3.32.tar.bz2"
+
+# 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-1*
+	selinux? ( sec-policy/selinux-apache )"
+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_SUFFIX="patch"
+	epatch ${WORKDIR}/apache-patches-${PVR} || die
+
+	#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.32 b/net-www/apache/files/digest-apache-1.3.32
new file mode 100644
index 000000000000..2f95a7ceea14
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.32
@@ -0,0 +1,3 @@
+MD5 45164531fb57bfa18af4b9efd0850dd3 apache_1.3.32.tar.gz 2472811
+MD5 19994ade6f8c46aa6cac87bca797fe82 mod_ssl-2.8.21-1.3.32.tar.gz 754629
+MD5 8009f4a13ea8e50cc5f692665b9f00c7 apache-patches-1.3.32.tar.bz2 14289