Yet another revision bump, removing the previously installed original apache configs (install-conf), some config changes (Yet again, yes), adding a patch to fix the case where indexing would be *veery* slow (bug 139451 - thanks to Joshua Pettett <bugs.gentoo.devel at homelinkcs.com>); adding support for /etc/init.d/apache2 modules showing a list of present (as in loaded and compiled-in) modules.

Package-Manager: portage-2.1.2.9

5 files changed, 80 insertions, 37 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 68fec90b7c52..c8fd79c76b04 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.532 2007/06/02 19:34:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.533 2007/06/05 16:41:01 phreak Exp $
+
+*apache-2.2.4-r5 (05 Jun 2007)
+
+  05 Jun 2007; Christian Heim <phreak@gentoo.org> -apache-2.2.4-r4.ebuild,
+  +apache-2.2.4-r5.ebuild:
+  Yet another revision bump, removing the previously installed original apache
+  configs (install-conf), some config changes (Yet again, yes), adding a patch
+  to fix the case where indexing would be *veery* slow (bug 139451 - thanks to
+  Joshua Pettett <bugs.gentoo.devel at homelinkcs.com>); adding support for
+  /etc/init.d/apache2 modules showing a list of present (as in loaded and
+  compiled-in) modules.
 
   02 Jun 2007; Luca Longinotti <chtekk@gentoo.org> apache-2.2.4-r4.ebuild:
   Expand elog message for upgrades.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 830f6f9229ad..d464f625554a 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,10 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
 DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
 DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
 DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA1 05d3d2b4309365de54adfc5d1aba9ff4758fc3fc SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b
 DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
 DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518
-DIST gentoo-apache-2.2.4-r4-20070527.tar.bz2 57489 RMD160 e20aaee9c0fe243bcb801ae96bd9166b1742a774 SHA1 88d370828f89e11a0367443c846a840455062b9b SHA256 06d72c37d6fe73db0f82c4734bcce3a23c1acfdc4c600225588acfe70bbbda4b
+DIST gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317 RMD160 d5ef8bddc1a470d0a5ef41b1d7d3423054c90626 SHA1 7ff6af17fe342fab96718b7b2fcd4db1c5af1d25 SHA256 507327d1a0029b7583c842b5f9d15a2be54226befe4fe1c32969d267de138363
 DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
@@ -27,14 +30,14 @@ EBUILD apache-2.0.59-r2.ebuild 14079 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3e
 MD5 6dcdc4563ddbbc21f13ed8aa24f5242d apache-2.0.59-r2.ebuild 14079
 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3ecc32 apache-2.0.59-r2.ebuild 14079
 SHA256 7f4d8e4095e0e785ebb2e9b73b3702494157dfbb6125d0ee98041eacc79b6378 apache-2.0.59-r2.ebuild 14079
-EBUILD apache-2.2.4-r4.ebuild 14341 RMD160 3b46d417c9206431166fc3c165099a390c94b63a SHA1 61ae8f8412a3ae8a93c5cff1352a6fdabf3849e5 SHA256 7b20bfa3e92b676532c683094ce4a0261b12e2c2459082c917fbaffd8d7ad63c
-MD5 6f2bc1a0c0b4206db18e31e308b2bab7 apache-2.2.4-r4.ebuild 14341
-RMD160 3b46d417c9206431166fc3c165099a390c94b63a apache-2.2.4-r4.ebuild 14341
-SHA256 7b20bfa3e92b676532c683094ce4a0261b12e2c2459082c917fbaffd8d7ad63c apache-2.2.4-r4.ebuild 14341
-MISC ChangeLog 91481 RMD160 dfd0dfe10929a0972d5015a20e9a96e257ca3cc8 SHA1 d6ddd2530a2553c65b29ca9209eb235a3aad2168 SHA256 12e8c5bf336e5097ed51feab462b140a7c1d72007a1c7e2a677ee8c66981b84c
-MD5 8864e60d0338b596e3f8d27b89892af7 ChangeLog 91481
-RMD160 dfd0dfe10929a0972d5015a20e9a96e257ca3cc8 ChangeLog 91481
-SHA256 12e8c5bf336e5097ed51feab462b140a7c1d72007a1c7e2a677ee8c66981b84c ChangeLog 91481
+EBUILD apache-2.2.4-r5.ebuild 14887 RMD160 543c861794909e99924ae17f2bd9ae052a2066b5 SHA1 c5a15b8d5cfc9d7df0217dc1c33c31351f443271 SHA256 10bb86076f10082779aa1e7760f414e53c0f05866f86444d35983802baba23bd
+MD5 eafe683e0f8148984a8857550f6f4585 apache-2.2.4-r5.ebuild 14887
+RMD160 543c861794909e99924ae17f2bd9ae052a2066b5 apache-2.2.4-r5.ebuild 14887
+SHA256 10bb86076f10082779aa1e7760f414e53c0f05866f86444d35983802baba23bd apache-2.2.4-r5.ebuild 14887
+MISC ChangeLog 92027 RMD160 20b15e8cf7328b0e1dfaad20318696c1701769fe SHA1 df5884fcaf165f7c58e04d371a7e7016050e8cb0 SHA256 273d589b2f07700a2f5115a911a1cc4d9b819ed7afe8cda4efb79e730a18d129
+MD5 3fc8cff4730bc29dd4a9022c7c32a10c ChangeLog 92027
+RMD160 20b15e8cf7328b0e1dfaad20318696c1701769fe ChangeLog 92027
+SHA256 273d589b2f07700a2f5115a911a1cc4d9b819ed7afe8cda4efb79e730a18d129 ChangeLog 92027
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -51,6 +54,13 @@ SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/di
 MD5 fb6513d7e3c17a25d505a7c7a06d43d7 files/digest-apache-2.0.59-r2 542
 RMD160 124580b340dddc55cb1c92565a0de043a9b27ab1 files/digest-apache-2.0.59-r2 542
 SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/digest-apache-2.0.59-r2 542
-MD5 38edd1af75c85f80e52ce2199c3e27cf files/digest-apache-2.2.4-r4 536
-RMD160 f84f8b4042aad943376d8793a3e286227550eb39 files/digest-apache-2.2.4-r4 536
-SHA256 b63dbb8203cd4642230f9140871dd3ce914bfa09d82942dc33a216fa8a988f79 files/digest-apache-2.2.4-r4 536
+MD5 3685a5e5ea27be4a736dc1ce919ae3c6 files/digest-apache-2.2.4-r5 536
+RMD160 643d3dfa434f0f243edbfef1da50bd19fc80c3c1 files/digest-apache-2.2.4-r5 536
+SHA256 1c6148391d382b0c388801c54fd831c9172e4063d03dd0c4c9a5c8b2dff6d027 files/digest-apache-2.2.4-r5 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGZZIpyuNVb5qfaOYRApsIAJ9UVPF9x9I9clGXVtTILitBvQAzrACgrTt7
+z7xGtpabr/dGBtyktAo5I1Y=
+=spjU
+-----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.2.4-r4.ebuild b/net-www/apache/apache-2.2.4-r5.ebuild
index 3d6896da552a..0ed62a46e7a5 100644
--- a/net-www/apache/apache-2.2.4-r4.ebuild
+++ b/net-www/apache/apache-2.2.4-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r4.ebuild,v 1.4 2007/06/02 19:34:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r5.ebuild,v 1.1 2007/06/05 16:41:01 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-${PF}"
-GENTOO_PATCHSTAMP="20070527"
+GENTOO_PATCHSTAMP="20070605"
 GENTOO_DEVSPACE="phreak"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
@@ -49,13 +49,15 @@ pkg_setup() {
 		die "ldap USE-flag enabled while not supported in apr-util"
 	fi
 
-	# select our MPM
+	# Select the default MPM module
 	MPM_LIST="event itk peruser prefork worker"
 	for x in ${MPM_LIST} ; do
 		if use mpm-${x} ; then
 			if [[ "x${mpm}" == "x" ]] ; then
 				mpm=${x}
-				einfo "Selected MPM: ${mpm}"
+				elog
+				elog "Selected MPM: ${mpm}"
+				elog
 			else
 				eerror "You have selected more then one mpm USE-flag."
 				eerror "Only one MPM is supported."
@@ -67,10 +69,14 @@ pkg_setup() {
 	if [[ "x${mpm}" == "x" ]] ; then
 		if use threads ; then
 			mpm=worker
-			einfo "Selected default threaded MPM: ${mpm}";
+			elog
+			elog "Selected default threaded MPM: ${mpm}";
+			elog
 		else
 			mpm=prefork
-			einfo "Selected default MPM: ${mpm}";
+			elog
+			elog "Selected default MPM: ${mpm}";
+			elog
 		fi
 	fi
 
@@ -125,7 +131,8 @@ src_unpack() {
 	fi
 
 	# setup the filesystem layout config
-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout
+	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
+		die "Failed preparing config.layout!"
 	sed -i -e "s:version:${PF}:g" "${S}"/config.layout
 
 	# patched-in MPMs need the build environment rebuilt
@@ -134,7 +141,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local modtype="shared" myconf=""
+	local modtype="shared" myconf="" mods=""
 	cd "${S}"
 
 	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
@@ -154,14 +161,6 @@ src_compile() {
 		myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}"
 	fi
 
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer! This avoids
-	# it violating the sandbox. This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux. This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source.
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> config.cache
-
 	# Only build suexec with USE=-no-suexec
 	if use no-suexec ; then
 		myconf="${myconf} --disable-suexec"
@@ -188,7 +187,6 @@ src_compile() {
 		--datadir=/var/www/localhost \
 		--sysconfdir=/etc/apache2 \
 		--localstatedir=/var \
-		--cache-file="${S}/config.cache" \
 		--with-mpm=${mpm} \
 		--with-perl=/usr/bin/perl \
 		--with-expat=/usr \
@@ -344,8 +342,32 @@ pkg_postinst() {
 		chown -R apache:0 "${ROOT}"/var/www/localhost
 	fi
 
-	# Check for dual/upgrade install
+	# Previous installations of apache-2.2 installed the upstream configuration
+	# files, which shouldn't even have been installed!
+	if has_version '>=net-www/apache-2.2.4' ; then
+		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
+			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
+
+		for i in extra original ; do
+			[ -d "${ROOT}"/etc/apache2/$i ] && \
+				rm -rf "${ROOT}"/etc/apache2/$i >/dev/null 2>&1
+		done
+	fi
 
+	# Note the user of the config changes
+	if has_version '<net-www/apache-2.2.4-r5' ; then
+		elog
+		elog "Please make sure that you update your /etc directory."
+		elog "Between the versions, we had to changes some config files"
+		elog "and move some stuff out of the main httpd.conf file to a seperate"
+		elog "modules.d entry."
+		elog
+		elog "Thus please update your /etc directory either via etc-update,"
+		elog "dispatch-conf or conf-update !"
+		elog
+	fi
+
+	# Check for dual/upgrade install
 	if has_version '<net-www/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
diff --git a/net-www/apache/files/digest-apache-2.2.4-r4 b/net-www/apache/files/digest-apache-2.2.4-r4
deleted file mode 100644
index fc9f722cc47c..000000000000
--- a/net-www/apache/files/digest-apache-2.2.4-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bb30deabe843052f7a354c5ce38f8aa9 gentoo-apache-2.2.4-r4-20070527.tar.bz2 57489
-RMD160 e20aaee9c0fe243bcb801ae96bd9166b1742a774 gentoo-apache-2.2.4-r4-20070527.tar.bz2 57489
-SHA256 06d72c37d6fe73db0f82c4734bcce3a23c1acfdc4c600225588acfe70bbbda4b gentoo-apache-2.2.4-r4-20070527.tar.bz2 57489
-MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
-RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
-SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375
diff --git a/net-www/apache/files/digest-apache-2.2.4-r5 b/net-www/apache/files/digest-apache-2.2.4-r5
new file mode 100644
index 000000000000..9f9a3b4d896b
--- /dev/null
+++ b/net-www/apache/files/digest-apache-2.2.4-r5
@@ -0,0 +1,6 @@
+MD5 b1df5f894ba9b0c8ce2235160037d68e gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+RMD160 d5ef8bddc1a470d0a5ef41b1d7d3423054c90626 gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+SHA256 507327d1a0029b7583c842b5f9d15a2be54226befe4fe1c32969d267de138363 gentoo-apache-2.2.4-r5-20070605.tar.bz2 57317
+MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
+RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
+SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375