Upstream security fix adds "SSLCompression" parameter to disable flawed compression support and thus protect against the CRIME attack. For security bug #438680 filed by Hanno Boeck.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 124 insertions, 5 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 1ec6fd68b82f..a6caa3bcc8e5 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,13 @@
 # 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.206 2013/02/27 15:49:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.207 2013/02/28 22:17:52 chainsaw Exp $
+
+*apache-2.2.24 (28 Feb 2013)
+
+  28 Feb 2013; Tony Vroon <chainsaw@gentoo.org> +apache-2.2.24.ebuild:
+  Upstream security fix adds "SSLCompression" parameter to disable flawed
+  compression support and thus protect against the CRIME attack. For security
+  bug #438680 filed by Hanno Boeck.
 
 *apache-2.4.4-r1 (27 Feb 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d87aa1bd6575..c5eb5d2c7f4a 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -8,20 +8,22 @@ DIST gentoo-apache-2.4.3-20121012.tar.bz2 24541 SHA256 aeed23c716f05d7430a6d905f
 DIST gentoo-apache-2.4.4-20130227.tar.bz2 24579 SHA256 cf27447dc87b4c145e50a6850245e3ed8d350bc3500bb249035322b23d03ccd2 SHA512 d6e8e37c53c37e9791c9d0ed3501d271212f0d2e2aac757a8a1914f20eb7b3dc0ca7e2d33a6f17dcb3572bc1f01b2c2f5876329ac8c2a4aaa7d2bca8e71f1d84 WHIRLPOOL 6364049b25c0aa21c4336dab7d1af8d3f3d06a60766fe401fc4f818f8ff7764564d136a414c444811612698221d830040ff4c5afb2a379607d5bd32b60260be6
 DIST httpd-2.2.22.tar.bz2 5378934 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231 SHA512 b6901453aaef3cac31cf763f7748e06a2492e1f72e4158627f38e45423a9bcd9bea1f74ba1a1ec9a5c7fc554eb062ea61b944e2001f19825def2e530ce8a42bc WHIRLPOOL 32a03d638f82d791effdce888a02e66189d6fe87c2179ab9f3de034fbf5c8311d24835f28e9a18addb847aa6859ed817bf2e11833e315285474eefcea6f56891
 DIST httpd-2.2.23.tar.bz2 5485205 SHA256 14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34 SHA512 69b3bc942b2a91cdb57356a5c57078794db2d8404a23080a2621cdf33ae2d9bdbbacd0f6e95fd6e71fbfa87e94942be0a014c3e8709148f991e391d03aa6dee2 WHIRLPOOL 8d00184aff654b2d7f1c5ebd471f19ffcb57107ea37179fa05c424424d7b70ff0c9abf3be68ed9f0d091b3c057f1ba24cb989937e35087c3199f82e3dddbbd4f
+DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
 DIST httpd-2.4.3.tar.bz2 4559279 SHA256 d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e SHA512 d4501ae69aacb75d960bc8cb61c9e1ff52e6e42a37c37ca84c839262e183ca2f305794da28266aa2119d211ba0f4531705f66330079ab594c05e92ae8196d1ab WHIRLPOOL 4ffb7dc8057200f676557a70591d6938e92a8990d88dc88237d278f185290d260312dd8cfdd08994ffd7b7280502b3debea0f3e02acc718dd9db613222b6d2ae
 DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0
 EBUILD apache-2.2.22-r1.ebuild 3074 SHA256 37616a8dd1267770f2a5282773e473c7fdab5448f12937fa97e08e4de6653e27 SHA512 db31454169d4f767ebbf60c35a50e714c9a12737e86811f5d12e5d88e1ef1b0d0474dd015ecc0e11b416a67fc38ece2841aa7c44c00ea9d6260c49d78dcecee4 WHIRLPOOL 102c6d79880303957cd3b76c3e281d3d8e39b0d4385e91b9d85e822bc6616c717ade9a5abca8bd6834e9b6dda5f7884fead8aa2a4e3b7915e7425b7e7276dfb7
 EBUILD apache-2.2.23.ebuild 3067 SHA256 ccfa18af20dee34eb371b45a3151dde11fb3fb8ba1d122db35a4fd518d56f71a SHA512 7fa9e5fd1813b62dbcc321e8caf6fa6a84c0445de0157bcc12c605cc66d577acb6353513a4cae9df34c93c3e3234f78180cb1a4b62b8a7b6de16c337154bf50b WHIRLPOOL 658db06f575aeac6dcd9cfe47115f4fc69e1bff6ace4cd3c6b81a5dcc85d72cd4f70fcc6b0e98c15c42230d43d882d6b39ac66bcfb99372ed0614bddb6b0a074
+EBUILD apache-2.2.24.ebuild 3078 SHA256 3fa5d52e5f55609f3174d4ed1bc72a8042ec497202accdf5548239fba8f38b12 SHA512 ce1cd2ef2957bee7a05d75ee8563c9728526847f4975382aca385ed78f80564e85ef1e2e9b0aeecea7af9858362ef37a2bcd8218236d3fb6102253e6cf381909 WHIRLPOOL f7d04a2528c783fe95785dde3b712ee5e988da3f01a84e060f3d8f87b9592cc617cbc11237f66cd94980e170ae376dbca3a5157f7b71cc74dfd2af4947ee7530
 EBUILD apache-2.4.3.ebuild 7122 SHA256 3252477e67860bcfacf5896cf51e5c6c7da05e0bca86e76cfabd5e4129eb9433 SHA512 8fd2a54bd7c6b366908c45352623f86e93b23918602cc3e544fa77e05e6d9ca333e5bac635355d8153c6bb271dc4d7172bc37f3cf451894c875f8a54989e5414 WHIRLPOOL 70d4a9288d45b1f0732d078b89e28532f937a27cf6006473f53e1d722f9e449adfd31d8041a33230ba14da658c388fbf982f95538fb63f9898808b91bc826684
 EBUILD apache-2.4.4-r1.ebuild 7170 SHA256 816877fbac998f9c6ff13a4db48fd13c5c1c88d87c32a27717a67cf51c0cca3d SHA512 25d3ea617ed1fac9f81599881a817b0676cef6241a6fb20eea23af41502bc4127e5054cb3044ae4333a61248336bf42926cbf28e289343d5fdff21b7fff191c9 WHIRLPOOL a79d97df99d7ac6b664f7b7a504118b06352d889f941bf2c776f3496888d0f943c749cf2fdf1ddeac557040dd1aa60f3be71cccb8a55a40d3a2d654d5203ec7e
 EBUILD apache-2.4.4.ebuild 7120 SHA256 a0b34c193ab1de5148fa087fd9924644e0c724eb287120b2458525df10712d03 SHA512 aa457e44ab337bc7d29e57385a52b5c6b0f58909df63cce6654718e79228dd898df08a58f5fb76019b21ac5f380b14d3a0adf570ddf370b0e17a3aeb48c9b663 WHIRLPOOL 944fa8efb1671066539bc52ec743f193b9086371efa7ecfe4a896933211f80c62a430cbae1c9b0fb46d58512d94c6e5b077449c0552eeb73c3e5a74ed8234d39
-MISC ChangeLog 15941 SHA256 8f108e8875c08ab98f1182fea52a6823dc8c40c65ca9f179907d743b992e0896 SHA512 865d6816b3ce55c82c75c464cf30113a98c72c6599f077845c55ad92368441990855730a909d11569e1a2c23664af7ccf9b2a9e01f2043dfd40dcdbaef7185f8 WHIRLPOOL 99f1a3d88ea3a1323678b2503fff895e64853867e00356c7e1906d1c368bca3d49aea7ef0581707a27c066001ed8cdcfef0b0d4ad9702ceb5178b668bb1d6d0e
+MISC ChangeLog 16231 SHA256 9ebf713af35cb6344011095923cff49b6a273aabfed36b571d046d80ac10adaf SHA512 b757a4c6f0a0cb2558ef715337bfcea5c735e536d7a406852e0dc2d60d16d5ed1ed7befdbd81e69df2ac67a85591358e9763ed5d4a3c2e4d2b066e372a176760 WHIRLPOOL 1a920463b5e5874ac45ce987956ac7f65ed98b56b8960ea91d8b1adbece0bb55229e581be3d02058a5e4a0d061fd92d002ea969456c95590659381265d08f711
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2424 SHA256 e210921387eaace2714d1068db7313b7257bf69e80df01455269252662c30eee SHA512 b20cbf68c20f1c1be5fd83d4fad7c7c4937a34fc1752b0f079014313da9865e896ecbaa5d1198dc14caf294709f956e9bdc2de299514cbad74ba1d57bec73c57 WHIRLPOOL 4cd60b87e2a9b8f37a87a19816de06b67e5cc632a60c26e2e3510b8be7194306be67b7a2db3814f674b548648f86d173c1099bc28026789c4aef4c4add28e629
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEuKwUACgkQp5vW4rUFj5qejgCeJEGtqsnT7jfntzpzdVsjMEMm
-0XwAn1QZU8JnAS8HOTh4ltwc3T2+kaYy
-=aB+1
+iEYEAREIAAYFAlEv2BcACgkQp5vW4rUFj5qQwgCglSlsVAM7zdpAEQ6r6moYv/Cw
+rDgAoLfAynfx9W6jIOQtatnKiH6h+C7r
+=gqd/
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.24.ebuild b/www-servers/apache/apache-2.2.24.ebuild
new file mode 100644
index 000000000000..5fdb979ccdb0
--- /dev/null
+++ b/www-servers/apache/apache-2.2.24.ebuild
@@ -0,0 +1,110 @@
+# 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.2.24.ebuild,v 1.1 2013/02/28 22:17:52 chainsaw Exp $
+
+EAPI="2"
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20121012"
+GENTOO_DEVELOPER="patrick"
+GENTOO_PATCHNAME="gentoo-apache-2.2.23"
+
+# 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 cgi cgid 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 proxy_scgi rewrite
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
+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
+	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
+	proxy_scgi: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 ~amd64-fbsd ~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() {
+	apache-2_src_prepare
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
+	cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
+}