Version bump, fixes security issue in mod_proxy_ajp #382971 and regression for CVE-2011-3192, thank Agostino Sarubbo for report. Add local description for USE static, bug 333885 wrt Diego Elio Pettenò. Use start-stop-daemon to start apache and use system limits, bug #347301 wrt Diego Elio Pettenò. Don't install cruft into /etc/apache2, bug #382997 by Remy Blank.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 120 insertions, 13 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index c706451c8406..ec0766c8351e 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.160 2011/09/03 13:34:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.161 2011/09/15 10:41:16 pva Exp $
+
+*apache-2.2.21 (15 Sep 2011)
+
+  15 Sep 2011; Peter Volkov <pva@gentoo.org> +apache-2.2.21.ebuild,
+  metadata.xml:
+  Version bump, fixes security issue in mod_proxy_ajp #382971 and regression
+  for CVE-2011-3192, thank Agostino Sarubbo for report. Add local description
+  for USE static, bug 333885 wrt Diego Elio Pettenò. Use start-stop-daemon to
+  start apache and use system limits, bug #347301 wrt Diego Elio Pettenò.
+  Don't install cruft into /etc/apache2, bug #382997 by Remy Blank.
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> apache-2.2.20.ebuild:
   arm/ia64/s390/sh/sparc/x86 stable wrt #380475
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 8aa1eca50a9f..1f5030b0cef0 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gentoo-apache-2.2.14-r1-20091008.tar.bz2 62359 RMD160 0e78de9a61265be2ef797e02bce0cf89f0a5fd2a SHA1 357316581f7d7d289655992216be6c5f5342f32c SHA256 99db378884b33af1c97713f63d92f0bb1d02eef6dc1f8f47a9addd258b3f7233
 DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b884876946b81bd476 SHA1 20fa102d6094d00d3c874b0b1df69d0ddcf34339 SHA256 b3c4ca6eed24ea82ff37bfa331403b09c94f3b2a8b5b1058761651c6824787c1
 DIST gentoo-apache-2.2.16-20100828.tar.bz2 63742 RMD160 c001f1f55099977c41b03346e449c95629f6b9be SHA1 bcb607199244948ffbb883aa36cabe54865ccfea SHA256 2820546adc7b3b3a38ae5173c75cab7ac42cc611570f0ffd814f833ee464f608
 DIST gentoo-apache-2.2.17-20110218.tar.bz2 62615 RMD160 05b57ab08e1938e5bf41ead2ce53c71c59303d60 SHA1 2a877d8269c3df5bb11f1a3c30953b38e8a17119 SHA256 8cc3cfe47d55877eaff15d6688d9ced1e7e54c93f012f4d84561d7ef7a3118ad
 DIST gentoo-apache-2.2.20-20110901.tar.bz2 63251 RMD160 279438975a3890ac5c14f882c2ffa436b2841912 SHA1 012db5dc78129b627f633c4fd5ff0319d6d0bba2 SHA256 3b4e809673516efb7c78d904d1d776e243e03437227c472eb08e6ec3688fc067
+DIST gentoo-apache-2.2.21-20110915.tar.bz2 63319 RMD160 797b3236145631fb18236cbc120775e5a634d82e SHA1 e0bbd052d7ccab1eb32887489aaad27990c1e355 SHA256 5cad94064254f00ffd561a3cf4e736b41aeaa082815450463cd4face6ded0f27
 DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
 DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf SHA1 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 SHA256 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
 DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf58112095 SHA1 ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9 SHA256 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52
 DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaff SHA1 5c9b44620dee449a86ba1bcba1715033c2c26b08 SHA256 868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04
 DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
+DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
 EBUILD apache-2.2.14-r1.ebuild 2275 RMD160 347fabe296dafc6bbed9f45d8f6b102659c58495 SHA1 bf266591b858a3d59c2b6c0d029ec05bd073b2d9 SHA256 2cd9e5df7b8302247aba75eaea51901defd5b998a911e599fb3ae3a4928d318c
 EBUILD apache-2.2.15.ebuild 2326 RMD160 6d56b8771691af5ad1afb35f1b7b0c76a1c0a317 SHA1 93bad89a62c4c5f22f2eafcda0187186c7820c54 SHA256 2d4d2c0944904f405332893dd7ffe62a6ea4d9ee77a516b64a48b185da933ab0
 EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad7b8 SHA1 0afb3ee574c4a2d775e754eb3840e3716140c9fd SHA256 529cc5347e19df6ae31ff0546b7b2f375fd9e35f67f8947e0a1f18742128e24b
 EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
 EBUILD apache-2.2.17.ebuild 2662 RMD160 504b6e5e1fca0e16802dc07a1244517e7c868b66 SHA1 881c6fa19547502b3d8e33a927d27c707569c8d9 SHA256 5f18d3f92d278467e839898adeb130c13b30be9a4eb9094c6b18a12700ff4332
 EBUILD apache-2.2.20.ebuild 2663 RMD160 45ffdb6ac45a8d2227128c3008aa66dfa84ab797 SHA1 c3d254c5239772964241527083a9d703848c8024 SHA256 abf0ff5141cb2335c9e826dfb59101079c559b945b2042da7266741004df4ce7
-MISC ChangeLog 113836 RMD160 51adb4393d933362d7c8bdfc10cd04fe0db4db0f SHA1 6e9a774749869d9cdc6eac4a123bb3d254c5c739 SHA256 bce9b562b0102aa95e2747d84cd4c560013fc8d22b9bcf9a60b76e0cd01265d8
-MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5iLNYACgkQuQc30/atMkC6fgCgmYZCkLxbcSgL+M4dzG8bMojc
-778AnjmxQQ1y0wGPo5+ee/DNj6Hidv5v
-=W0B3
------END PGP SIGNATURE-----
+EBUILD apache-2.2.21.ebuild 2670 RMD160 2dacf91534e7e0e1fb10cd533340deb045409faa SHA1 cf053a503029deda0bf10cf5c273448d334843d0 SHA256 ad164875a772d393ffc24e816a9428f3541198ae6b73623eabe0e94b904a2627
+MISC ChangeLog 114324 RMD160 d0a31eafac675089b4aea6811bf7373fe5f1f9bb SHA1 9619236aff0d4b8f3371f38a5634ab86c8ff7d5a SHA256 507f4836d75fd5ec2e8b6ac0bbdac05d90ea56a953fd15356fb1537b20d6ebdf
+MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c
diff --git a/www-servers/apache/apache-2.2.21.ebuild b/www-servers/apache/apache-2.2.21.ebuild
new file mode 100644
index 000000000000..c2ba80ca63e4
--- /dev/null
+++ b/www-servers/apache/apache-2.2.21.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21.ebuild,v 1.1 2011/09/15 10:41:16 pva Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20110915"
+GENTOO_DEVELOPER="pva"
+# We want the patch from r0
+GENTOO_PATCHNAME="gentoo-${P}"
+
+# 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 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="${DEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_mime? ( app-misc/mime-types )"
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index efdfa114cd86..ac80f7122a8d 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -5,6 +5,9 @@
 	<maintainer>
 		<email>apache-bugs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+	</maintainer>
 	<longdescription>
 		The Apache HTTP Server Project is an effort to develop and maintain an
 		open-source HTTP server for modern operating systems. The goal of this
@@ -13,5 +16,6 @@
 	</longdescription>
 	<use>
 		<flag name='suexec'>Install suexec with apache</flag>
+		<flag name='static'>Link in apache2 modules statically rather then plugins</flag>
 	</use>
 </pkgmetadata>