Add support for mod_proxy_fcgi; work by Dan Kozlowski rediffed by Jaco Kroon. Testing by Tomas Mozes & Marios Andreopoulos in bug #421135.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

4 files changed, 236 insertions, 3 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 94178003a205..1ec6fd68b82f 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.205 2013/02/27 06:56:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.206 2013/02/27 15:49:15 chainsaw Exp $
+
+*apache-2.4.4-r1 (27 Feb 2013)
+
+  27 Feb 2013; Tony Vroon <chainsaw@gentoo.org> +apache-2.4.4-r1.ebuild,
+  metadata.xml:
+  Add support for mod_proxy_fcgi; work by Dan Kozlowski rediffed by Jaco Kroon.
+  Testing by Tomas Mozes & Marios Andreopoulos in bug #421135.
 
 *apache-2.4.4 (27 Feb 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b5dac2578b9f..d87aa1bd6575 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee SHA512 c18fd461f02ab79fc456a1ad99bf91c8891ecdabd90f41437ebf87e20b3d28d2006a10d6726164c2f0333e7aee350bd125838abaff3a188d8ab2f5f34d3e5466 WHIRLPOOL 59cbee68fc8012df01229b8d5e38045eb974bab3f08ebf5b01097dabb5275bb83e28cd09a058ce71949ca4a2439811cff457d4c7df88d7b3fc5318c6b7ef0075
 DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31 SHA512 f364bdbee967b3bc797d2053b9eb347af963f99275441093930d0057465e1a12567106f5c5ac21a45a4bbd4b353ce67553038d6146f469a7bf980a9148471170 WHIRLPOOL f5a3ab44fc14ddf67ccf0785006b1d9f5c49b915114f9d7e97858fba447a5ee872c741e73c17e121b61cc0aa678b42dc154616cd64054461c552d3a8c29f4f17
 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f
@@ -10,7 +13,15 @@ DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7
 EBUILD apache-2.2.22-r1.ebuild 3074 SHA256 37616a8dd1267770f2a5282773e473c7fdab5448f12937fa97e08e4de6653e27 SHA512 db31454169d4f767ebbf60c35a50e714c9a12737e86811f5d12e5d88e1ef1b0d0474dd015ecc0e11b416a67fc38ece2841aa7c44c00ea9d6260c49d78dcecee4 WHIRLPOOL 102c6d79880303957cd3b76c3e281d3d8e39b0d4385e91b9d85e822bc6616c717ade9a5abca8bd6834e9b6dda5f7884fead8aa2a4e3b7915e7425b7e7276dfb7
 EBUILD apache-2.2.23.ebuild 3067 SHA256 ccfa18af20dee34eb371b45a3151dde11fb3fb8ba1d122db35a4fd518d56f71a SHA512 7fa9e5fd1813b62dbcc321e8caf6fa6a84c0445de0157bcc12c605cc66d577acb6353513a4cae9df34c93c3e3234f78180cb1a4b62b8a7b6de16c337154bf50b WHIRLPOOL 658db06f575aeac6dcd9cfe47115f4fc69e1bff6ace4cd3c6b81a5dcc85d72cd4f70fcc6b0e98c15c42230d43d882d6b39ac66bcfb99372ed0614bddb6b0a074
 EBUILD apache-2.4.3.ebuild 7122 SHA256 3252477e67860bcfacf5896cf51e5c6c7da05e0bca86e76cfabd5e4129eb9433 SHA512 8fd2a54bd7c6b366908c45352623f86e93b23918602cc3e544fa77e05e6d9ca333e5bac635355d8153c6bb271dc4d7172bc37f3cf451894c875f8a54989e5414 WHIRLPOOL 70d4a9288d45b1f0732d078b89e28532f937a27cf6006473f53e1d722f9e449adfd31d8041a33230ba14da658c388fbf982f95538fb63f9898808b91bc826684
+EBUILD apache-2.4.4-r1.ebuild 7170 SHA256 816877fbac998f9c6ff13a4db48fd13c5c1c88d87c32a27717a67cf51c0cca3d SHA512 25d3ea617ed1fac9f81599881a817b0676cef6241a6fb20eea23af41502bc4127e5054cb3044ae4333a61248336bf42926cbf28e289343d5fdff21b7fff191c9 WHIRLPOOL a79d97df99d7ac6b664f7b7a504118b06352d889f941bf2c776f3496888d0f943c749cf2fdf1ddeac557040dd1aa60f3be71cccb8a55a40d3a2d654d5203ec7e
 EBUILD apache-2.4.4.ebuild 7120 SHA256 a0b34c193ab1de5148fa087fd9924644e0c724eb287120b2458525df10712d03 SHA512 aa457e44ab337bc7d29e57385a52b5c6b0f58909df63cce6654718e79228dd898df08a58f5fb76019b21ac5f380b14d3a0adf570ddf370b0e17a3aeb48c9b663 WHIRLPOOL 944fa8efb1671066539bc52ec743f193b9086371efa7ecfe4a896933211f80c62a430cbae1c9b0fb46d58512d94c6e5b077449c0552eeb73c3e5a74ed8234d39
-MISC ChangeLog 15675 SHA256 46c4f6c7f0cafbe7001174fe2a411279ceb82d1e1999c5ccbd27010b2121b86b SHA512 803b45327801aab7b3b4503c6664523592309a1e00b030e3139944ba836276cb63b759b7f341ca90695e55b51ddb94a3b62ff40d6852681dcc15f6c013de9b63 WHIRLPOOL 361b112000afd93576c74866e40ff8f2855591c2fb5c6082c5949640c01ca7236903c4370caf2b6b9436c40736d36dc76dd27c58849b876a0e3b80d6ca994da3
+MISC ChangeLog 15941 SHA256 8f108e8875c08ab98f1182fea52a6823dc8c40c65ca9f179907d743b992e0896 SHA512 865d6816b3ce55c82c75c464cf30113a98c72c6599f077845c55ad92368441990855730a909d11569e1a2c23664af7ccf9b2a9e01f2043dfd40dcdbaef7185f8 WHIRLPOOL 99f1a3d88ea3a1323678b2503fff895e64853867e00356c7e1906d1c368bca3d49aea7ef0581707a27c066001ed8cdcfef0b0d4ad9702ceb5178b668bb1d6d0e
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
-MISC metadata.xml 2340 SHA256 547097f694bc78f98bcdd017f16c3589a8ac4734ad50f12df14cc9e1547834ad SHA512 5c7c233dd173a4c7c0573bcc8b0e3822c6e9bb656822800fab4602b70669b4ada0eaf37b00bf0e611675a5f74c999d78e4e08ee59aecb7b35956a96d6c468dd2 WHIRLPOOL 5461a01c18e723d94ebd1992585385e1db399f2ea2f04908d37dfadb0a2db10bc25c65f86971cd4555a7eba5f68d22f614cd6bd7e0721dc2ccd183963abe012d
+MISC metadata.xml 2424 SHA256 e210921387eaace2714d1068db7313b7257bf69e80df01455269252662c30eee SHA512 b20cbf68c20f1c1be5fd83d4fad7c7c4937a34fc1752b0f079014313da9865e896ecbaa5d1198dc14caf294709f956e9bdc2de299514cbad74ba1d57bec73c57 WHIRLPOOL 4cd60b87e2a9b8f37a87a19816de06b67e5cc632a60c26e2e3510b8be7194306be67b7a2db3814f674b548648f86d173c1099bc28026789c4aef4c4add28e629
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEuKwUACgkQp5vW4rUFj5qejgCeJEGtqsnT7jfntzpzdVsjMEMm
+0XwAn1QZU8JnAS8HOTh4ltwc3T2+kaYy
+=aB+1
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.4-r1.ebuild b/www-servers/apache/apache-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..92d4d8377334
--- /dev/null
+++ b/www-servers/apache/apache-2.4.4-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r1.ebuild,v 1.1 2013/02/27 15:49:15 chainsaw Exp $
+
+EAPI="2"
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20130227"
+GENTOO_DEVELOPER="patrick"
+GENTOO_PATCHNAME="gentoo-apache-2.4.4"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
+authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
+env expires ext_filter file_cache filter headers ident imagemap include info
+lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
+log_config log_forensic logio mime mime_magic negotiation proxy
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi rewrite
+reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
+unixd version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	proxy_fcgi:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	proxy_fcgi:PROXY
+	socache_shmcb:SSL
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+# dependend criticals
+use ssl && MODULE_CRITICAL+=" socache_shmcb"
+use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+
+inherit eutils apache-2
+
+DESCRIPTION="The Apache Web Server."
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="${DEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+# dependency on >=dev-libs/apr-1.4.5 for bug #368651
+RDEPEND="${RDEPEND}
+	>=dev-libs/apr-1.4.5
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+# init script fixup - should be rolled into next tarball #389965
+src_prepare() {
+	# the following patch can be removed once it is included in
+	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
+	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
+		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
+		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
+			|| die "epatch failed"
+		cd "${S}" || die "Failed to cd to ${S}"
+	fi
+	apache-2_src_prepare
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
+}
+
+src_install() {
+	apache-2_src_install
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+		rm "${D}/"$i || die "Failed to prune apache-tools bits"
+	done
+
+	# well, actually installing things makes them more installed, I guess?
+	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
+	chmod 0755 "${D}"/usr/sbin/apxs
+
+	# create dir defined in 40_mod_ssl.conf
+	if use ssl; then
+		dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex"
+	fi
+}
+
+pkg_postinst()
+{
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+	# warnings that default config might not work out of the box
+	for mod in $MODULE_CRITICAL; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in $MODULE_CRITICAL; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [ ! $lbset ]; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index 64136dd44800..abefc96a1e86 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -28,5 +28,6 @@
 		<flag name='apache2_modules_slotmem_shm'>Slot-based shared memory provider.</flag>
 		<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
 		<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag>
+		<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag>
 	</use>
 </pkgmetadata>