Version bump (bug #554948)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 256 insertions, 6 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 3af3bab3655c..8ceae49cdaf4 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.304 2015/06/07 19:25:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.305 2015/07/16 06:08:57 polynomial-c Exp $
+
+*apache-2.4.16 (16 Jul 2015)
+
+  16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> +apache-2.4.16.ebuild:
+  Version bump (bug #554948).
 
   07 Jun 2015; Pacho Ramos <pacho@gentoo.org> -apache-2.4.12.ebuild,
   apache-2.4.12-r1.ebuild, metadata.xml:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 33b75d0f3d60..784fafb12bec 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX apache-2.4.12-alpn.patch 16871 SHA256 ead1bd4914c52e11172ff7457f77fb119dc1d735176ae149e6410fb96f3d67fa SHA512 f4ffa98d1ad6c7150f759470f74091b8e246de8b7c8a32fbda18d5bd3eb3f119e6175c0e649e33d664e5719405fd725f5d79548573abeaffaf42de68b2032e5c WHIRLPOOL b57db8087e5fed89223c56cba9a48dfa342427a960579881f29fa51e0e3f19b489041764f03675d46bfa1ca2b6a0877cf9b9a4cc008048c148219a96a65d5e6e
 AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
@@ -8,15 +8,27 @@ DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4d
 DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839
 DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
 DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
+DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
 EBUILD apache-2.2.29.ebuild 3105 SHA256 db3e7e9fd9663ca383e414acf04c964ab3971faf891a740285e4269332c74a45 SHA512 3a6b89e825f46c4a545c7a77840f7ebb6e1276d520789cd997cc5f43500ff1bdb8cce8aeb0ab2e4cd773c598ea3a30a21293d04757796ab495dbc088705cd76b WHIRLPOOL 16a2423411d9966bf40c259af251ddc639e9d11ab718193397ebd1b93ea00d27bb3178193531cadb0fc77f00842f6c9c9a7f3d5e41d2118006dc4bd34115f2f3
 EBUILD apache-2.4.12-r1.ebuild 7648 SHA256 a3578cde6f6c2c906c76a5df7f46bfe7854004d35ffa045c0cc080c748bb3a82 SHA512 81f616510d85ee0d48c0f34cd45ada103261952a062c3d2e5835058082b0cbd7ca56dbc51e18dd586c51c70f0f30867ad68af73e69d09ef5cd31b18a4803c004 WHIRLPOOL 7acbc7ed2e1c2c620145359e273fe341e69dd93ae795cabaa845b124b6003e043c57fe0b2b83e8e2af1569dec40a25fa176005edcbf4bf05eb7b6096f18b8496
-MISC ChangeLog 30128 SHA256 20fd5472d00e039e824533a7757111401ca11cd71aebb5adfb460eb3e8198429 SHA512 dd7ae751d00de71c381ea1137cf1ac1c637242bef56cfe4057ac2044b18385276e9a399bb71b2cd1c8bfce75e9f02edb03c234d71b2edead855e101e6034c1df WHIRLPOOL 8646c4e3a8f8552331ff20c3bd42538a3101925d812da065d527c845a2fe0dc57f685dbbd3d153601c5afad76a6f6cda657cad25d2b4246fbef2c40b95b606d1
+EBUILD apache-2.4.16.ebuild 7652 SHA256 a69b36aa027e5e80ea9fad09766b8362b0956e280878832bb3c2feb2effc5e2d SHA512 744ac27fdd52ab66b555df96198bb2e9a6b6ae361553e76579cb53f93f86f30cb9ad200604875e54f64969a78b157142cd8ba459cbbde35a7031f6f73ffd73ec WHIRLPOOL acf5d3bfc49fc4fd96919abc758ab190fbe24c03e8d2c45534f087d6423884f02b03fe1d0bae8b4e0a01386ad5b65e052ee24a5850de9544c162fd2f58d82ce6
+MISC ChangeLog 30273 SHA256 507b23a938db0a319302499b72a2c672c9571c2df2ee5e5367d1e34e7cdfc365 SHA512 c90685b078e5a949afd2c8027d5779f5603f03e698e30b5c5d258687f905aaf9834a4ccfd0fc232f12888c398e828b10a67fa3aa0015d4c2eb9d4a2dec3608a3 WHIRLPOOL fbc0122ce613785b9be104431a55a8303cd0a51e0d137d4645575b13571705633ec218dee8cdfe6f36418f87ddb1b96448483a1ca3c9d316a233a38fb5775c7c
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 3082 SHA256 529415f44340c023ec4eb9208999b080b6ea10f9ed6e1f5ebeddaf4099a36ee3 SHA512 c50d30f4b6a9f2373683825cd598d0daed11a68815da8aa6ba2c42817db4b4bb63b3c6c1b31acb4d17671ba23a3c8dba7d3aa7a4bca38be7694feefc1826d8e1 WHIRLPOOL 8f227ab785226746116173b3c1d4b842c1f4ece6691957ce693bdb708f36372de2f9fdce766dd37957132d5061b74d449e6cafc23a4134e1cb258432e5177241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0msgACgkQCaWpQKGI+9R7QACbB3aXuv+ZWTMGhNa1go0I+D1u
-bBsAniakTuuXZw7iFB4+Xw5qRmA/Y3uj
-=0Pzt
+iQIcBAEBCgAGBQJVp0p6AAoJEPiazRVxLXTF4c0QAJO115Ey8SpYgfAZvrq+w1RY
+HEPOuh958HEP9rKj0R7EYuIoFNdIniu2GpQOjucllA3htrI5477Q2fa815x/cW1G
+YcDb4l4Oh1Xo+l2dH5kW3u4RPRYJ/zSlZztzad6zrXMXbOkpU9iA76EQ0xHNMcmR
+55P99oretERMiVcayAGuZ0a8WEOeTy5ft73k0fIJCnZoj5amb5u4wrFegn1LOJy0
+Kwg4Gf+dxODbKq2T+Qfg9YS6fectPqsV4xWNgQDs85wL+qqWC5+OavDBssNvty4W
+a2aq+uIhJCm4Z3bog81QeaxFUbuWbYFDf9HC3g19Fyfj/SUMqBzyvGQjugMoICgS
+JWk7WTjgkvxucJPBnnEaa9VFBQQN1sDKNzX1fiMaWkJ2krTeLaV/ir80JChdwMg3
+lIFh7W5RECFRkrnJM0EGjU4TF9b+Bdv96L9tTDiWlCrv/Uty3cGJD4R9XoOumSG5
+wSXoZJQReLMszTEA3Xh7Ju4VqCMgf/10JUltxli71rWS9rgABuHv5jr6HtMnioZN
+Roq7gy0ViohYI7ztohpwXnBX5yGIUcQAUcjmW7WsAumh+sVnsd5jfkObBjFLWCyZ
+Rs45EUNPJ7GImegg81FjjnXnF3q1kgoTsW+OD2yw/+rMtsMa6MFociTyyeCq+4VW
+2Qc2I5Fk18zIBIHIdklS
+=lMEl
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.16.ebuild b/www-servers/apache/apache-2.4.16.ebuild
new file mode 100644
index 000000000000..34bb9f57de32
--- /dev/null
+++ b/www-servers/apache/apache-2.4.16.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.16.ebuild,v 1.1 2015/07/16 06:08:57 polynomial-c Exp $
+
+EAPI=5
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20140731"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
+
+# 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 macro 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 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="alpn"
+REQUIRED_USE="alpn? ( ssl )"
+
+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_prepare() {
+	use alpn && epatch "${FILESDIR}"/${PN}-2.4.12-alpn.patch #471512
+	apache-2_src_prepare
+}
+
+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 "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+		rm "${ED}"/$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 "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+		rm "${ED}/"$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 "${ED}"${apxs} || die "Failed to install apxs"
+	ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
+	chmod 0755 "${ED}"${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
+}