stable on x86, wrt security bug #186219

Package-Manager: portage-2.1.3.9

3 files changed, 24 insertions, 11 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 7e595e755b71..1408c7a72176 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.22 2007/09/08 18:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.23 2007/09/09 12:42:16 maekke Exp $
+
+  09 Sep 2007; Markus Meier <maekke@gentoo.org> apache-2.2.6.ebuild:
+  stable on x86, wrt security bug #186219
 
   08 Sep 2007; Jeroen Roovers <jer@gentoo.org> apache-2.2.6.ebuild:
   Stable for HPPA (bug #186219).
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b8de1d073fe4..b6cba83b6c2c 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
 DIST gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913 RMD160 c0cfc72d0316b0a977296a08932bebe6a7547c7b SHA1 e7e7ae28b0427c9b61895f3356307df5d6bcc324 SHA256 fa188f4f7e26b7277a8a1858c449766bc997c1f9cf1ee2a5f9fdbfda5dabcccb
 DIST gentoo-apache-2.0.61-20070907.tar.bz2 58543 RMD160 3d40fd2e793bfedbca0410e6aa31ec7cabd404ef SHA1 060eea0df3dc6674cb35e5c873469d20c7955a21 SHA256 f981b2627edace251a12a58fb22dacd98e6beb764b092db518ee3dac0045420e
@@ -24,14 +27,14 @@ EBUILD apache-2.2.4-r12.ebuild 15107 RMD160 3e316d5a3674b1e743997e1449b7b5409de8
 MD5 516d4e70d5ff127bdb3a3dda4ab9b1a6 apache-2.2.4-r12.ebuild 15107
 RMD160 3e316d5a3674b1e743997e1449b7b5409de8c4a4 apache-2.2.4-r12.ebuild 15107
 SHA256 ce9050bc7284f760ef28d954b5d3003d869baa9e80f3526a7fe7bc5766fb3f5b apache-2.2.4-r12.ebuild 15107
-EBUILD apache-2.2.6.ebuild 15344 RMD160 a9f6ff25e3de177d0397120e2d7315061c0ea5fb SHA1 8925ab6826432b2c55a95332c67a792bec83e042 SHA256 35c348494f2e2d1b5b943dc320a1f710ef021eefd0d8fb60e3025cc68fd9cff8
-MD5 1003cbd96ce7c541ae1d98c559e36427 apache-2.2.6.ebuild 15344
-RMD160 a9f6ff25e3de177d0397120e2d7315061c0ea5fb apache-2.2.6.ebuild 15344
-SHA256 35c348494f2e2d1b5b943dc320a1f710ef021eefd0d8fb60e3025cc68fd9cff8 apache-2.2.6.ebuild 15344
-MISC ChangeLog 96380 RMD160 3e93d0364eb21c46a0e0161ddecff40c6fbef052 SHA1 e8f75d0f07afd554f26ee03789c3da8bdee2bcbd SHA256 c55b6fb5f7a1990dd7656baa61923b0af083ecd9ae632d0b23ac863a4c6dabd7
-MD5 39ca480c84d27ae0ada30fbad75a7910 ChangeLog 96380
-RMD160 3e93d0364eb21c46a0e0161ddecff40c6fbef052 ChangeLog 96380
-SHA256 c55b6fb5f7a1990dd7656baa61923b0af083ecd9ae632d0b23ac863a4c6dabd7 ChangeLog 96380
+EBUILD apache-2.2.6.ebuild 15346 RMD160 1801e2d5dffcc8c4fb598bee163d4d380f87c71f SHA1 d95fdf05d5e9fabe35aaf4e110f4d1704c55dc9c SHA256 d96174083cac2ce3014c97ba98099665b556645266fb5acdd9cbd0f8e6adb5dd
+MD5 f1bd6dd311cca9d5a89c563b38529fdc apache-2.2.6.ebuild 15346
+RMD160 1801e2d5dffcc8c4fb598bee163d4d380f87c71f apache-2.2.6.ebuild 15346
+SHA256 d96174083cac2ce3014c97ba98099665b556645266fb5acdd9cbd0f8e6adb5dd apache-2.2.6.ebuild 15346
+MISC ChangeLog 96495 RMD160 fc6f994a1472e0c992525dc18c63f1e6a8f3e704 SHA1 e2ba3793169de45d666b883df9274999c7486807 SHA256 2de09b280b82d073f15316574b8d78ddb5301eaf3a0f0d36d549b454fd11b3a4
+MD5 669cb800e9592fe1f31ba680436be054 ChangeLog 96495
+RMD160 fc6f994a1472e0c992525dc18c63f1e6a8f3e704 ChangeLog 96495
+SHA256 2de09b280b82d073f15316574b8d78ddb5301eaf3a0f0d36d549b454fd11b3a4 ChangeLog 96495
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -51,3 +54,10 @@ SHA256 11c48e69c33b119d3890350bfda7fa96943c00014bfd9039f8ede53a556275c5 files/di
 MD5 bf89379d611a34d10b6e0a55eee69f9b files/digest-apache-2.2.6 527
 RMD160 77f2fce54301244724ec61c4a3e0b96dc7106b33 files/digest-apache-2.2.6 527
 SHA256 69de15f758686c7f7977e0b75dd988e247162fb97fb394be4efe40997a53e308 files/digest-apache-2.2.6 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG4+pVkKaRLQcq0GIRAiaVAJ9R8EChhzvS7isUShtcEvEsylxbzgCeIm/n
+oYkjg8hCAShTth0AFR3M9xI=
+=74BQ
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.6.ebuild b/www-servers/apache/apache-2.2.6.ebuild
index e08a527e0a4c..6101f93ceb6e 100644
--- a/www-servers/apache/apache-2.2.6.ebuild
+++ b/www-servers/apache/apache-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6.ebuild,v 1.4 2007/09/08 18:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6.ebuild,v 1.5 2007/09/09 12:42:16 maekke Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 # 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug doc ldap mpm-event mpm-itk mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"
 
 DEPEND="dev-lang/perl