fix #276707, #276792

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 119 insertions, 12 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 1f1164a2fa77..3fceb3497630 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.108 2009/07/07 00:31:21 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.109 2009/07/07 09:50:43 hollow Exp $
+
+*apache-2.2.11-r2 (07 Jul 2009)
+
+  07 Jul 2009; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.11-r2.ebuild:
+  fix #276707, #276792
 
   07 Jul 2009; Richard Freeman <rich0@gentoo.org> apache-2.2.11-r1.ebuild:
   amd64 stable - 276589
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index edbc2bea265f..027d5834e576 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gentoo-apache-2.2.10-20081025.tar.bz2 60296 RMD160 bc6d9e05a5924cf104e0a07b18ab6c9da526a1dc SHA1 f3ea7bda13b57b9f622890b2d9288cb096472a96 SHA256 e7704ac9a645bb722d8063735c7de17a4041d76cc72244fc928a0a5ad1ee1ccd
 DIST gentoo-apache-2.2.11-20090101.tar.bz2 60721 RMD160 2a2342bcff3778f44ecb148c333da49f71b5ed57 SHA1 6bb963fa73bf2c26d89dc6b808454d1541f103db SHA256 88a24a6e600024386db5cfd704b11cd7a408ba6ef067a2ffe2dc0923993149ca
 DIST gentoo-apache-2.2.11-r1-20090705.tar.bz2 63773 RMD160 82f3d13fd041f1761a40ed306f7117d96fd317da SHA1 b306de6e8dcead08215c717257d87904f3abeba5 SHA256 3ca544946338ebe9d10dd3ecaac577ff073a5a933e76c5fa07f93abbc3ba59b6
+DIST gentoo-apache-2.2.11-r2-20090707.tar.bz2 64636 RMD160 07435d8c47288c036d721cf9af49a541d7e33313 SHA1 7472ca661bf1a25ad7f534f2b9331459b7286d04 SHA256 e12ef2f887fa962bbb10da16cae682b2738a9299b06c0eb21d299e25b228d182
 DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
 EBUILD apache-2.2.10.ebuild 2753 RMD160 36530781b03b69fb9070b5c67167493b1485c064 SHA1 c8c4d0bec50458f4f2c97c7d40cf76d52d58bd6c SHA256 3af230e5164379449a8a03953f7deeb7296b9cba82d6bdcb1844a66d05b67535
 EBUILD apache-2.2.11-r1.ebuild 2761 RMD160 c03cf7a8a448ba9a2be7204fe299e5d534655190 SHA1 a743cc59bfa667bfb6a6c72f5d6cb14aba87d76c SHA256 ed8d498b49006d95b66f254fc32cb6844098122050b01bdc5707037f8bd34426
+EBUILD apache-2.2.11-r2.ebuild 2766 RMD160 273cac5b80bbe1232c638ae0c236db48f1b7b938 SHA1 a785edbbd4e9be9fbea55ac03f974c945ce8b028 SHA256 d208b6438aebc044706d2d3b094e3264eb3e20c5d60373095efa902769939371
 EBUILD apache-2.2.11.ebuild 2749 RMD160 5ac59a07e2758e753aebfe803bb60f788823fed4 SHA1 8e0a285496f1a0c427461dc6bf418867cf497832 SHA256 5138ff239264ce12d10afcbd3bcd23dba7d2de379e40b2317c66ff06a8768466
-MISC ChangeLog 107219 RMD160 ed2f53fbca71afef9b847f5b71380c1b2ed32bc4 SHA1 9d013dc964e180a598657e06d7fc60d64aeeee1f SHA256 cd6905034ec47de64340b9c95d32314bf62d1792ea5fb38666d675f5d741d39f
+MISC ChangeLog 107353 RMD160 ed6c6404625dd15d033f505b1047b40235d2e016 SHA1 d6dd078d2dd443fbce31f76b12fe9e31d07e0861 SHA256 8b2127ef79d3b18ca60b62d0bda460e676e64a7d1fed0e58a599226b72905a2a
 MISC metadata.xml 707 RMD160 677af9851f39ffbce95448b9dcca095ec30724a1 SHA1 8354b35e30c99bda1312ed0c2a0cdb630c8a17ff SHA256 dd3c8b528c6623fd9d9ab521471c5b6d775fb78fdd00f1b200b18b6ee95e150d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpSl2UACgkQG4/rWKZmVWm3QQCglks3yla3pl6pR1LX3KpfbXYh
-mEEAoLT9W0Oa7Kb9yCWRcBd6GyiKKEBe
-=3VeH
------END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.11-r2.ebuild b/www-servers/apache/apache-2.2.11-r2.ebuild
new file mode 100644
index 000000000000..aa34b8c8c247
--- /dev/null
+++ b/www-servers/apache/apache-2.2.11-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11-r2.ebuild,v 1.1 2009/07/07 09:50:43 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20090707"
+GENTOO_DEVELOPER="hollow"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
+ext_filter file_cache filter headers ident imagemap include info log_config
+log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
+proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
+status substitute unique_id userdir usertrack version vhost_alias"
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="sni"
+
+DEPEND="${DEPEND}
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+RDEPEND="${RDEPEND}
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+src_unpack() {
+	if ! use sni ; then
+		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
+	fi
+
+	apache-2_src_unpack
+}
+
+pkg_preinst() {
+	# note regarding IfDefine changes
+	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
+		elog
+		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
+		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
+		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
+		elog "with AUTH_DIGEST now."
+		elog
+	fi
+}