fix #110556, #209095, #212837

Package-Manager: portage-2.1.4.4

3 files changed, 190 insertions, 5 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index ad31b2cdb49b..ef8c2e75e8a3 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.62 2008/02/17 13:14:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.63 2008/03/22 15:45:21 hollow Exp $
+
+*apache-2.2.8-r2 (22 Mar 2008)
+
+  22 Mar 2008; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.8-r2.ebuild:
+  fix #110556, #209095, #212837
 
   17 Feb 2008; Christoph Mende <angelos@gentoo.org> apache-2.2.8.ebuild:
   Stable on amd64, security bug #205195
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 2601b5f6ff69..540e4b5603de 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -4,17 +4,19 @@ Hash: SHA1
 DIST gentoo-apache-2.2.6-r7-20080107.tar.bz2 61536 RMD160 b08af8e9d840b49685bf7a67243b80dc4e346efa SHA1 27278395f5ad01aef0f9c9fcf1c25565866422a0 SHA256 b2116b2b09ba3a5d4e1130bf7e202cc95312ac5b4f78f8653f15e2842bbbf92f
 DIST gentoo-apache-2.2.8-20080119.tar.bz2 60363 RMD160 c54970fdbd8e5906db5a86d383e15d5f542f2ab2 SHA1 48e98685c38e6940f2ea120419ce8d3c216a054e SHA256 6086dcf40451c348305e100551ebb1516050b50803e837cfcf53fa53ffd4d292
 DIST gentoo-apache-2.2.8-r1-20080202.tar.bz2 59701 RMD160 56f1459a7acd66d87481def7a8e14d50ba667002 SHA1 ffa9a928133ac5a21b69a456fe82d7ae86b70a16 SHA256 d168a8e2d82ca59e742ef02287a639c64bc6502cf67606cb5fd4cdb6ecf09d3f
+DIST gentoo-apache-2.2.8-r2-20080322.tar.bz2 59889 RMD160 948092d19b2d879631a12369b27077e5c0058240 SHA1 14982e8e19145709cba193552f6c0ee4638cd2a2 SHA256 23f31eee017b363b37ad7a19ba52f8d6159166e32ef847e9220ca2c9ffdb019d
 DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
 EBUILD apache-2.2.6-r7.ebuild 5174 RMD160 3690d1344099aa9b86031e6e9fe5e23ba2f4ac1d SHA1 f22d46a0fe920e4663e6e5bdfa86f7b0bbb72f46 SHA256 31a86ae520764ed9eda31733b7779e46b81406ce66fe1a07aa6b0b4c3e7fd917
 EBUILD apache-2.2.8-r1.ebuild 5230 RMD160 0374ac7a4ebc2d77553c795e4e1be3f5a846e723 SHA1 614d3399c1a6b57c16e59150e87ab77e16199466 SHA256 207e7b85874bde09e7f18eb18ca750689f44b8c29881bba58d342363adcecea3
+EBUILD apache-2.2.8-r2.ebuild 5230 RMD160 d8a79cbc1253739795e1216aedf7b5561bcc00ae SHA1 1bd7106850df504cca69cb1afaf087ccae02b22e SHA256 45617eac919d7a72bf4a507fe411d67593cd8dd66a52cfa864123222449191f2
 EBUILD apache-2.2.8.ebuild 5175 RMD160 52d5e26de8274a92e1d06cdbf221cac02e6e2b28 SHA1 fc0ace217cc63fa40c048428cd385cd01331f972 SHA256 220020b754266d2530f7e8b783d8c8f447ed1d2588a296a8304d61c52ea06051
-MISC ChangeLog 101598 RMD160 f85d24fbf06eeee557c7076a9c7c5b3a4af8c2da SHA1 a5056870e35e471d97d147fcd3b0b6646d697689 SHA256 254758a3bd9c2b122bcbca8f026ea6ca06ad5072ea3241c92e9391b9db32c9d7
+MISC ChangeLog 101737 RMD160 853af42fb875f3ef304ba4213a3d908b93f2f723 SHA1 5fdb580fe4e3d52acbb704513883c151622420fe SHA256 9016ed8e292b0bdbdd422c776a74677888f7703121f4c9b0e3edaf12ff4fe006
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHuDMwKhnDs22gwa8RAsh2AJsHhZsDaKRimuIUEveoka+OAwJoswCgpIoB
-xWQmAzwbn2TFvfq5LuAXfC0=
-=Cdet
+iD8DBQFH5SnDmPFBzbX68WERAk8dAJ42F5f1B5uTThz50EnJIaTxC69UsACdGK+z
+8VOypyH7ecNh/xbHOfYEKW0=
+=AaMu
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.8-r2.ebuild b/www-servers/apache/apache-2.2.8-r2.ebuild
new file mode 100644
index 000000000000..4d33b9f81c80
--- /dev/null
+++ b/www-servers/apache/apache-2.2.8-r2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r2.ebuild,v 1.1 2008/03/22 15:45:21 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20080322"
+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 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
+	usertrack:unique_id
+"
+
+# 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 ~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_postinst() {
+	apache-2_pkg_postinst
+
+	# previous installations of apache-2.2 installed the upstream configuration
+	# files, which shouldn't even have been installed!
+	if has_version '>=www-servers/apache-2.2.4' ; then
+		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
+			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
+		fi
+
+		for i in extra original ; do
+			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then
+				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1
+			fi
+		done
+	fi
+
+	# note regarding IfDefine changes
+	if has_version '<www-servers/apache-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
+
+	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
+	if has_version '<www-servers/apache-2.2.4-r7' ; then
+		elog
+		elog "Listen directives have been moved into the default virtual host"
+		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
+		elog "(depending on your USE-flags.)"
+		elog
+		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"
+		elog "be no listening sockets available."
+		elog
+	fi
+
+	# note the user of the config changes
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
+		elog
+		elog "Please make sure that you update your /etc directory."
+		elog "Between the versions, we had to changes some config files"
+		elog "and move some stuff out of the main httpd.conf file to a seperate"
+		elog "modules.d entry."
+		elog
+		elog "Thus please update your /etc directory either via etc-update,"
+		elog "dispatch-conf or conf-update !"
+		elog
+	fi
+
+	# check for dual/upgrade install
+	if has_version '<www-servers/apache-2.2.0' ; then
+		elog
+		elog "When upgrading from versions below 2.2.0 to this version, you"
+		elog "need to rebuild all your modules. Please do so for your modules"
+		elog "to continue working correctly."
+		elog
+		elog "Also note that some configuration directives have been"
+		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"
+		elog "and that some modules, foremost the authentication related ones,"
+		elog "have been renamed."
+		elog
+		elog "Some examples:"
+		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
+		elog
+		elog "For more information on what you may need to change, please"
+		elog "see the overview of changes at:"
+		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
+		elog "and the upgrading guide at:"
+		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
+		elog
+	fi
+
+	# cleanup the vim backup files, placed in /etc/apache2 by the last
+	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
+	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"
+}