version bump wrt security #227111

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64

3 files changed, 208 insertions, 5 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index ade52f1509d6..0d32cc15c709 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.74 2008/06/14 13:13:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.75 2008/06/15 16:03:13 hollow Exp $
+
+*apache-2.2.9 (15 Jun 2008)
+
+  15 Jun 2008; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.9.ebuild:
+  version bump wrt security #227111
 
   14 Jun 2008; Zac Medico <zmedico@gentoo.org> apache-2.2.8.ebuild,
   apache-2.2.8-r3.ebuild, apache-2.2.8-r4.ebuild:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 8a6ce9b685b1..d4780fda71e5 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -4,16 +4,19 @@ Hash: SHA1
 DIST gentoo-apache-2.2.8-20080119.tar.bz2 60363 RMD160 c54970fdbd8e5906db5a86d383e15d5f542f2ab2 SHA1 48e98685c38e6940f2ea120419ce8d3c216a054e SHA256 6086dcf40451c348305e100551ebb1516050b50803e837cfcf53fa53ffd4d292
 DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40
 DIST gentoo-apache-2.2.8-r4-20080611.tar.bz2 60580 RMD160 81b0713d86f2856670fb75999f8e248a9c71622e SHA1 ed0ad64cf7eef057e23515571d4b6a3111e6fc01 SHA256 48509b3846c04c9c31db00a7d2a98a8156e839f895635ad398f84e73ce9e91c7
+DIST gentoo-apache-2.2.9-20080615.tar.bz2 60183 RMD160 924b6268324aa679b5ff624ece159dad323028aa SHA1 6c8e053a33a561df2417e718803b65f7ac55b640 SHA256 c3bb95e339d7bdfdcd3bd71927287843df0d34ad2740ddc7913cbb0200fc8072
 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
+DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
 EBUILD apache-2.2.8-r3.ebuild 5580 RMD160 c608b5208169d4f7ba2d14db10e5ba7613cd5fb7 SHA1 758a746fc2a0fbc1b3280ddf09c1cadb6041b1ef SHA256 02153c8ca731edb22f5cea6d56c8229267ae1df14afc88b072ac08478ce5d9e9
 EBUILD apache-2.2.8-r4.ebuild 5588 RMD160 21e69bf007a79785150a6e8303e638db5317a6c4 SHA1 eb42962370f7b213c385b3bfb22cd97d34b6d3c6 SHA256 74a60193269b6e6fcfe2f1212205731a65658ed7233a9543b6d07429336adb50
 EBUILD apache-2.2.8.ebuild 5508 RMD160 11127bc5789faf304e3edd620db3ae3d91eba420 SHA1 6340e4ee01aacb8a95b971f75d57de6a512f07e9 SHA256 298ce4a20742f73a9400675acba2d2671828b150ce1e4de2b38919a35d50c049
-MISC ChangeLog 103203 RMD160 168c5564e2487df5eaf4185b66597508a78368b6 SHA1 fc1f96fc8be15d0e909b4e32b862151c811b792a SHA256 b33931c65c8dde37f0a1730f6d3bb6d6dbb0f90c8c5f2dbf1f3f63516d361907
+EBUILD apache-2.2.9.ebuild 5584 RMD160 574a214ba75c13f444e3e6e5a21dbeed7c8cd016 SHA1 3fe18863a825e259a46c2e625f3df305ab5015c8 SHA256 720e1b0c041a48006b2a961983b2b3a52f95cc2eefb565fbb901ff6660eeac37
+MISC ChangeLog 103340 RMD160 9efc54b4c380836eb9ff04c709ca42540855c5b5 SHA1 14cfbf6ebb32e97379fe7acdc05c12bc451d9832 SHA256 321c0b0e6690df320263fb7008fb2b7444e3cceb7ad2fce169d97d487ba097b1
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhTxAoACgkQ/ejvha5XGaPS1gCfS5KZsBQFaIBTtVjvrJqt3htU
-nf0AoPNQelpJrs6rOwh4QIalPWRWavQd
-=mLYx
+iEYEARECAAYFAkhVPVQACgkQmPFBzbX68WH+8QCeLFf88XYyTiRvSP5kMC+PoTbc
+kZoAnjgfidB6deSeemzm4CkkOYVeRoWj
+=JesY
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.9.ebuild b/www-servers/apache/apache-2.2.9.ebuild
new file mode 100644
index 000000000000..dc891f335ec5
--- /dev/null
+++ b/www-servers/apache/apache-2.2.9.ebuild
@@ -0,0 +1,195 @@
+# 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.9.ebuild,v 1.1 2008/06/15 16:03:13 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20080615"
+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() {
+	has_version ">=${CATEGORY}/${PN}-2.2.4"
+	remove_upstream_configs=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.6-r1"
+	auth_ldap_define_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r7"
+	vhost_directives_moved=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r5"
+	config_layout_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.0"
+	previous_less_than_2_2_0=$?
+}
+
+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 [[ $remove_upstream_configs = 0 ]] ; 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 [[ $auth_ldap_define_changed = 0 ]] ; 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 [[ $vhost_directives_moved = 0 ]] ; 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 [[ $config_layout_changed = 0 ]] ; 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 [[ $previous_less_than_2_2_0 = 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~"
+}