Bump

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64

3 files changed, 231 insertions, 22 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index b3fd2b198cd5..217e84d72fe8 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.233 2013/07/18 13:26:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.234 2013/07/22 03:57:12 patrick Exp $
+
+*apache-2.4.6 (22 Jul 2013)
+
+  22 Jul 2013; Patrick Lauer <patrick@gentoo.org> +apache-2.4.6.ebuild:
+  Bump
 
 *apache-2.2.25 (18 Jul 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 58bfcb9532d5..39162db2d925 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 32 SHA256 dea0d272faab1be2f608334b76d327a4c90c69f4c9171df53b73fdcfbea4cfdb SHA512 ca37332f07590114256fb3eefc286a3da5ed41328ecef7e921b6b8c8f515549590fdfd2bc45d72bc3136ac04b399e4290ca30e79a647799afb15c01c70e4dc88 WHIRLPOOL e4715824f12bc464670a8607cb03b8a664da3fa0111d615b0957887c7b6543d73573a1c357e63fc75fcdbc5573a2be93dc91aa41fef6ce8d61dad963d73d3e0c
@@ -12,28 +9,13 @@ DIST gentoo-apache-2.4.4-20130227.tar.bz2 24579 SHA256 cf27447dc87b4c145e50a6850
 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
 DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
 DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0
+DIST httpd-2.4.6.tar.bz2 4949897 SHA256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea SHA512 8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 WHIRLPOOL 81f036bb438afa30106a402e256d641a2687b619ef7f6ea3e4ab61f30715560e1c9dd3afa3e53c4d99c77de72f100e8a1894a5a898247c381100ceb165b8a146
 EBUILD apache-2.2.24-r1.ebuild 3268 SHA256 b3b27b6bba5c1558fd0ce68ee4c70e86f5d901ce683550d72a8d3d465c955a2b SHA512 1118413d380f01f3a3a2351df3218f30a01c3bbc2d472adb0b57b01cffdc69a20d87755cbb253df7ca66f155367fdafa728a642e503de6e9da3a67d88c436eb0 WHIRLPOOL 37283df89b9e555196af0b8cb9a7a71bd8fa988532fae989288f3755a41c35615c86ada39b23627b488774999f3df261842fb45dc5e9cf236c9a40c87ea0e602
 EBUILD apache-2.2.24.ebuild 3098 SHA256 c742f39514dab10ec7732ac351b98fd3a5c4995e68797fa8694bc9460b0cfb21 SHA512 1dfd4da41b5c0e04f476881af504a22b553742b021177855f2d182ec14b73fb4c3ae66e9c1be87fd7a8cf4eaf9c4f4ab06514b10e2e29548bc792e40709ddf75 WHIRLPOOL 8fa3e7067a38e6b13577b801d45c8fd9dd25243730e53cb0dc3e8b9652540bb60ba19b2f5d1782fd100413f700e017ab9aa38c608ff68ee26e16a5821f7422a5
 EBUILD apache-2.2.25.ebuild 3272 SHA256 a3ace4823de0ab1b2902aed052037c1349241d112491acace44e3752347b1078 SHA512 1d64ff53df3c680ae280b467eb02f140e61aa045652e9d173cfb01a518a85cc6dbc0944b42ecdbd4dc867d8e62d2fbbb2d0577c3a23ea4a7f134df72fddbb009 WHIRLPOOL 4ee816f850834b3490ad5938451c1e62a8aa5ebd7de2d5772b59f5c27be962a2e7e0e55d60d835f048716c6cfb2a7874af49f067b0d02ed2c229b6f58c5cec38
 EBUILD apache-2.4.4-r3.ebuild 7545 SHA256 e1a2d8b84131cb9086e702a189e2e8438062ae7637a8fededd5e3fb67f422dec SHA512 d4bbf08abf58f279abc9bf4c5c34bf8226b2c6eae2f7b332bfcd4bde4735a4f077484478a894cac343be114cb96d90cfadc54fc935ebcbb0460fb7ec30d814e5 WHIRLPOOL 6c4be7a6060d0df07fa64e4f33830e215970ff95dc9b9fbb56f4b366f72909c22c641b1c783fb2428e7e2650b4201c0252550fea5aa7c98925c7ce6c60651ed1
 EBUILD apache-2.4.4.ebuild 7122 SHA256 484112ce1681f6ea85f2e7f8c8d106a0831da108ad5e3ecebf4adb26d4973965 SHA512 84d10fb9aff453c4b5f71307799c1f1f65775b5aeba22e4f6fe97e144be08ec3c0150c30331277ce60ab279e66edd0f964fbd684257b1e6834f1ba04d205c2af WHIRLPOOL 6b7d067a8a719a961240255e99388089f56d45f951e33c3c802723cc3375ece4b9b1e94386a666adfcd42abd84871297136134eea7a9cf26f6b29babd2fd8fab
-MISC ChangeLog 19878 SHA256 ba3e54751ce2926da222aaccbb7e57b78d4964564a693f365895b850fae0a1a6 SHA512 9c3d4c6e48d1ee69ff3824050e6d18c5a66aaec3c6da91e79bc55ba2ef6153ebcd904898ea585ed945c257426dd5b0751b245543f3ebc3734bd4b82b6154b5db WHIRLPOOL 6c1aedec34110b02b364688bd77e840fa2ffa80207421bd4494f2747126cfbc119c56ba0f7ef70a907c308cea21a8d75c08c2a9f06cc2616d764c0d0dfcd2574
+EBUILD apache-2.4.6.ebuild 7542 SHA256 25a3cdf349400e9345bc0808568310d24ffd92cd3a5f84a17417fc0347789316 SHA512 fbcd2aebb8b22a464e7ed66dfe4dee294d7b53022622df4e6f30346427cc83f72116e3b295a899d852ad399c921ddaf8f7b600deacbfd9889550f976e6e3e366 WHIRLPOOL f1bfa32c781c4164a40eb5d7ebe70f03aa7e71af0726cdddcfebaed2bd3e172cb8f2e0d29fc55946344594c74b9701d4ed8dc580afd03d35bc9b4f7702f27548
+MISC ChangeLog 19982 SHA256 6e3bd6d9e1684d4999c9a2de7c0952299557515ef0163cbdf66bb8b63c04e4db SHA512 3daa16f7a0e6eb92c5e0111a5bd9919ab89f254a35c055ff5a4e6d40c2e529474f61e82faf3f76fdbd0901f186f1a1acf28a329927be76f76f80d4fbadee5614 WHIRLPOOL 35f5d0cdcc18ed35fecfbd247e042e68440ea4250e5949c4e7e8477e606da6fd7589a40ccdfc9fa566583e7085e5d57a4d6a8087b73220c1a84796b086a3978c
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2492 SHA256 f132bc37567605f338e23ed6ec22c553e1443d2b6cf407ab0bcff359fc9b3f90 SHA512 0582259bc2d615f1f640d375aab4452613a4006dca03c8bcf9757c376599bc2c7789df44003db914e2e3a5cd5a3ce725b0bf76d92488f65c67f4859927c83d11 WHIRLPOOL 6e826e0847788527dc2499e10c8c4ec59b78e2e4859b23127c26f103fc679c1516720be587ee25753c52d04f0544e634f553a769bed2d24db8442d57be22d26f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJR5+0NAAoJEPiazRVxLXTFY9YP/1zoyOj9/elZ7bxuuv2poNCP
-lXbmv4gNSb0tnGWbZ1hoK/2TGhUVILlmaaReAowXpxd7NYQ8Om1lpDVI780G1XVA
-j2B/98mRSY2nOIEU+JjMaECgQjsngSRHWRk858RgtiY6A0f2r+0SgruD52Sc/N8+
-Y4rmsnJ2/gAebviTFDZuoJ/5qcLhk0mxXMBY1+qGBPT6mjPxVPRmvK0AINGxXIgE
-y9nA0rQ9wtZL0wUWwljksEQoIjoTVOcfA5+tZFWd/EOUWKQN6LzPZYp8+rmB8PaY
-L4gyvTDxu5isGU7a73QncvXjxUL9USxcrr2M2icqwuTH9qfPeTN6WKvePoO0KcPh
-jlaygC2ENICSbZiey2tJpXCva3H7q+kRGo7vsysg+sWQyw5BrljEfPvU4LW5mu9x
-4LlSdopKbe0rzyV1g0CJuvLv2nG7qxeFvLfwGvSvOM+oP00691yBESASLMfob9zp
-ETgN3Uruk1/OOw86oBGdV0EaZGo/f790jMREJzL4HpF5qWoR0RE6HYDZzlBdrVEV
-Bp/iA2jFElOKE1qet7H6g5NntufkCY6ZAAXMi0Z5MZS2EsSlLDPkicmQw1UdRgPO
-tN10s+ioi3bG33wT5aW8k5P+UrM674O/sG62aklc0YRDqL8vv6TzY9nJuULYW/gT
-7/bXmAHvJjWO9Bw+9pTd
-=TLOB
------END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.6.ebuild b/www-servers/apache/apache-2.4.6.ebuild
new file mode 100644
index 000000000000..ea72d415db74
--- /dev/null
+++ b/www-servers/apache/apache-2.4.6.ebuild
@@ -0,0 +1,222 @@
+# 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.6.ebuild,v 1.1 2013/07/22 03:57:12 patrick 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 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_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 systemd
+
+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
+
+	# 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
+}