Bump for #517298

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 236 insertions, 22 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index e460202d9713..17e6ac95ff90 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.276 2014/05/22 15:56:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.277 2014/07/24 02:30:58 patrick Exp $
+
+*apache-2.4.10 (24 Jul 2014)
+
+  24 Jul 2014; Patrick Lauer <patrick@gentoo.org> +apache-2.4.10.ebuild:
+  Bump for #517298
 
   22 May 2014; Lars Wendler <polynomial-c@gentoo.org> Manifest:
   Fixed regression in 00_apache_manual.conf
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 20dfc23fd5f1..eb2411a05a79 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 00_systemd.conf 88 SHA256 487e7451ce2d834d8af09a1db09bfe235fbc87b17b13a88bf849f0739b023ce3 SHA512 c510b77450f45d8ca5b8f00ebae5de9e3dc0ecb45f9857e391ac923dadb6b5193b13e9bc372790de20bb8829f2bee5bfc0e85ad03b3a72818c5dd6a0d7f45353 WHIRLPOOL 35ff7234f1ac513a522481ed08d2281dc331835cccd1049dbbadd9f2dff7fce1700a3ae9fd8f2f490f09d82edd960f4a0b4f00a91db2bafb7c647e3b54733cef
 AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee SHA512 c18fd461f02ab79fc456a1ad99bf91c8891ecdabd90f41437ebf87e20b3d28d2006a10d6726164c2f0333e7aee350bd125838abaff3a188d8ab2f5f34d3e5466 WHIRLPOOL 59cbee68fc8012df01229b8d5e38045eb974bab3f08ebf5b01097dabb5275bb83e28cd09a058ce71949ca4a2439811cff457d4c7df88d7b3fc5318c6b7ef0075
 AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
@@ -12,27 +9,12 @@ DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff4
 DIST gentoo-apache-2.2.27-r3-20140522.tar.bz2 64512 SHA256 ff2dec65d379bf362583e8b5a6e9dc8b121bf78710e2c120e2c51573e3bc8464 SHA512 d6997a2f6907c31ccf43f129f59692eb9f205be3f6aad24f0cea5a4989f0591f4d65b434adc967dbf0042845db4254ac8a6a85d3915b6663a28b5f111017c1ca WHIRLPOOL 44370466e0d30c45959edcc352770fb3fd24586d04f77d50d6c9e0903ab2c77f58f3286495352b3059d3d93cd5e166557dfb07174bb23c565287019ebfc9fc57
 DIST gentoo-apache-2.4.9-r3-20140522.tar.bz2 24978 SHA256 65714f27eb1d3c125ff9cd9ef71159ca5592d4336c8d7807e55c826f3a317920 SHA512 0a35a8bf4af399ac4c203db7ac0b60b66550317734fd72e4ce7640dd27648f679ba02100c2384e6dd79fc97bbef25889dfd8c481a2ca0593d06b5df13a762f5d WHIRLPOOL 97085dfb7703187d4a1c873a3dab96ff0b92a36578da000ee9ade6d7762c21e80b4452d4496d60f2918a3818e4137c5717a68eda43b0fa675823b02ba114cd19
 DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
+DIST httpd-2.4.10.tar.bz2 5031834 SHA256 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a SHA512 e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f WHIRLPOOL c9f81296052a61483ceef4ae4b4c467cf64a4035030472dc8c17355f572a4887ddc6179ade2a764a4e3f0cd4ab7cc34a3fa36577a148c3df7b8d44a5f1f0424d
 DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648
 EBUILD apache-2.2.27-r3.ebuild 3129 SHA256 0b7ebf6f7552c9dffa620b45d77cc0e88e107d85a87785fc39b69be0f86e0993 SHA512 a4bd5bc6e8f668358f9c93be44c0bc3231792df84dff1916679ff515b55c56df1095dd5d8df3243c5a42485d2b16fd6f768cbaf36524de61d8bf9ce18b83e630 WHIRLPOOL dbc8a1dc62e6a573d2fbce7d1ea7c4a14584ced370de93f02962db18cc1c3866382f6005766bed0a61b65b8c891798f8b9284721fb9b7bfa5b70aaf089e8149c
 EBUILD apache-2.2.27.ebuild 3406 SHA256 80f8ea23faadc81fe1b10bbb8cb4d9755df1702d39cb38e1dfe764bf6f418160 SHA512 dc8e946414f7ea3baa46337c4658f22c40e612e814f906ed02ee0132edefd6bac052a9e2cfe6b1036ae86ecaecd20a2a024673518305f362994acdd9c5756fce WHIRLPOOL 97ff85dce68dce72d40959f8508a3a70dd270200b44d49de53311e2906be3fcd730f5e49748fd8b3fe46d9a442bfffa1d10b9b4f8f90899de9805f0ce08aefa3
+EBUILD apache-2.4.10.ebuild 7419 SHA256 a44e79836bd40b8526cde1e0a80a7e28663326c339b8954854797610a8ff6647 SHA512 338ec5752a29ce584dd7987664539663ec46480c16d157180d40d97076ce77b55401727277e23039af18aa4f75fb2af6722c35b85898eaad1bc5125aa1f1e20e WHIRLPOOL 1e626002f1c5002c4c72bda2b33feb04d8a1335f6694644d1db90e53e5938d9635e550005b240c2268f59962235089a874ddbbed11cbc329d0e1edb095b0a5ce
 EBUILD apache-2.4.9-r3.ebuild 7426 SHA256 3dd3022e19d409547eb5432e1ea82af77440694bb4904b1bf72e45f23724ca0f SHA512 c51e86910813ce770f7d74d6a36bb2791224c34a005422b2370cfc87d57facd36b291ff711e28dc7e93c01690503ecd993e6c6e3233355d1d84aaa5cde140333 WHIRLPOOL 25d941f1a0b15c9a73103be6c674c11bf104cf3dab6fbbca83b4b22069a082aad70a39367711a36076be1a28d435ae63025ee9c05e3d20fdec9c56be21223ab9
-MISC ChangeLog 26377 SHA256 42eb22242c4456556ae672e248e91d32b0dd058186c4516ba8a088f02ae045e5 SHA512 1df208fb6f964ab7834d1bf72cdf6e9ba8cd45beab09c375e70100485276b8644b4eb1202d2d0682917aefe33b8827eb0218ff7fa89c588bcd0aceae09d41e28 WHIRLPOOL e0c36da4da1ea7be1d83c2f1d1ecd584dc34fbb6a7e73bf9d5912fcfc0edc47af160443fdfb6ed5caaccf89f9abdb1cc9fde78e46f23e870d34a031046057c93
+MISC ChangeLog 26495 SHA256 af518457e021647b8150ef68bb9476daa72401f1f16da6d9a196af4503376822 SHA512 8b2a3cf01efca19689d54c87e560542e3159aae5e5ab9e0b869ae5770d844b88ac86d2d4c898b8e7a382818b940e5af6c2533bd7c1c3944ef8a178c82fb44b6a WHIRLPOOL 987c7a5931c300f523afb386466b0342292b726ed9fedd7f1a511fb667cd7cb504232386765237415cad50ad4008ade88dc95aa10fa90409846aa6ec6c8c8fd0
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2882 SHA256 bb1c73d9b53a1049c14b477d4441b09670ecafcf46a0ad114c24bb284d0d194a SHA512 bd9a0a5f26e1420aa6023160208d177e233f97f2265b8fad68772a084cbc9fabb2a186f14916a5a664b5590a6052fe039874ff96b1bd9d3dc530c3750561c7ce WHIRLPOOL 0e92d1cd3fbbf3f75ebd38e356a736061c9ea19afd40b06f58abe0ed86219223cafab188bbfa4ce9c91a8cc6619de47dfc3a68edc2c39e6a38476915ad8d48ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTfh4hAAoJEPiazRVxLXTFXuYQANThIFTFlCkvL5a8ywrVeixi
-jnwg24Xk+UPqM1IaUrsKMpTh6IBuYbSySRkrXjPbeaW1WuFk6OB5MUtI3Y/6fe32
-9/MA50XRhaxJsQFS0F0Fs2PjwliLilK+ozNgPrtNhPyNN0ObIuIUaNhJDL8U6MQP
-wtTRu2moIZtl30YoYkFvXC/vyQl1q0QmGgLuk3qeYk2KPGI4nnQEGXN9tK8aAV+n
-lOel3Ks8HKvKzHJAooTlliUwg2lQPv9xNYmtu6nPOUMjmYmQ9f6fiHgkA3JM/PeL
-fZb3ztCgbqQpr++V5N8r6fdFpJqNAY3m2XrnTb+62AClgPFPljuobv7Vh3oY0+1d
-qhi06+xcp2reuOXqU6tqOswU9gyxwfGFW9spnYijHuJcL5PrENNf1JBcE/5CFere
-yZinTzW0gHkNDvbtssGMputBb7E3Lqz0gslx0qNTDiVWvPAezkXTYmyu8ABS/h19
-WEkEYiBP0Bqm3KQ2rS+B9j0owNNVAvTyXnHZ29GpJMRpzhpby3MtEEcfETM2Wt6+
-bEQKTI/ai7tJmmExGFBVG3RZz+FMYcKcgYl6H2s4bYN8iAEDhQzJ5kYZjaBscKhJ
-xAxQ3XpJMiPxSvFyPoBdZ6mRFBw4TdrRAllsI4BFNEHMobALvmCRev+4BmJyOd7z
-F3Tlz2bLeTUy2B7pTLAu
-=sht8
------END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.10.ebuild b/www-servers/apache/apache-2.4.10.ebuild
new file mode 100644
index 000000000000..1d7ea47189bd
--- /dev/null
+++ b/www-servers/apache/apache-2.4.10.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v 1.1 2014/07/24 02:30:58 patrick Exp $
+
+EAPI=5
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20140522"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.9-r3"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="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_dbd 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  proxy_wstunnel rewrite ratelimit remoteip 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_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel: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
+	proxy_scgi:PROXY
+	proxy_wstunnel: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
+"
+inherit eutils apache-2 systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+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
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the 
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs="/usr/bin/apxs"
+	cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs"
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+	chmod 0755 "${D}"${apxs} || die
+
+	# Note: wait for mod_systemd to be included in the next release,
+	# then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+}
+
+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
+}