fix mod_ssl memory leak wrt #222643

Package-Manager: portage-2.1.5.2

3 files changed, 191 insertions, 6 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 97d0ef13ba43..fdb460391aef 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.64 2008/04/19 09:04:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.65 2008/06/01 12:14:29 hollow Exp $
+
+*apache-2.2.8-r3 (01 Jun 2008)
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.8-r3.ebuild:
+  fix mod_ssl memory leak wrt #222643
 
   19 Apr 2008; Benedikt Böhm <hollow@gentoo.org> -apache-2.2.8-r1.ebuild,
   apache-2.2.8-r2.ebuild:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index a8a7d636c327..b15f287eb958 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-r2-20080322.tar.bz2 59889 RMD160 948092d19b2d879631a12369b27077e5c0058240 SHA1 14982e8e19145709cba193552f6c0ee4638cd2a2 SHA256 23f31eee017b363b37ad7a19ba52f8d6159166e32ef847e9220ca2c9ffdb019d
+DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40
 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-r2.ebuild 5239 RMD160 703f0e99d634495443fd4ccaa59170e44dc37298 SHA1 1ee0c87d050ccac66943b8ce002b532ed13a6a43 SHA256 61998eb22ba51367feae0cc0cef7989c9101909c68e61023e0d2fa4a6a555e91
+EBUILD apache-2.2.8-r3.ebuild 5239 RMD160 d8c52b52b322a1b4f2c12edaef0278a5ea51b0f2 SHA1 274232147d4b328db8952b9b48fef1f776ce6caf SHA256 aa7936d38aac57ba71cc0f2aad97bb35260ba1996ecfce38579ccf12d5cf8fe0
 EBUILD apache-2.2.8.ebuild 5171 RMD160 4a35610d97a4ac037f2c3b6a93577f0d160b6913 SHA1 68f63011f6d3cb890e3b2eb7d8a109d64e772505 SHA256 64ff85456d56465c48bd62a32644b1e03ba9f09644df0e217018c2008f504556
-MISC ChangeLog 101872 RMD160 37f2504cf0ddd19409a0432f4a22d6906510e20d SHA1 351b710ae55cb47d09614d0df3989f71ae2c19d5 SHA256 bbc319e2f41cc596f8b1ef3005a39daf59871eb302d40c69f31a14c4c4c71c42
+MISC ChangeLog 102018 RMD160 9c4df9c35379fe7f8b8a8356854ffa9b2b646fd8 SHA1 df7bbb4123466fa46844955bbd51c370db0b0d84 SHA256 0a5f4a1617a59dc3c74e7b24687d2c0b81aa8c90a5eac68e98a31429448837ef
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIC7Hcj9hvisErhMIRAlhCAKDedriB8YeucYeDYJhFdwz6FwtyrACg4nNp
-f/EeCqy0D9abW8QgbCtywhs=
-=cOfU
+iEYEARECAAYFAkhCkqwACgkQmPFBzbX68WEK1ACggz0c79Xy9XfqTcA6w+0CyruJ
+b84AnAiG/Ja/oGFcu7/qJKR111TkCj6b
+=SyFs
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.8-r3.ebuild b/www-servers/apache/apache-2.2.8-r3.ebuild
new file mode 100644
index 000000000000..04704c1456b4
--- /dev/null
+++ b/www-servers/apache/apache-2.2.8-r3.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-r3.ebuild,v 1.1 2008/06/01 12:14:29 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20080601"
+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 ~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~"
+}