x86 stable, bug #204838

Package-Manager: portage-2.1.4_rc14

3 files changed, 24 insertions, 11 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index d9941ac324c2..9aa56db45d72 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # 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.48 2008/01/08 02:06:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.49 2008/01/08 15:01:33 maekke Exp $
+
+  08 Jan 2008; Markus Meier <maekke@gentoo.org> apache-2.2.6-r7.ebuild:
+  x86 stable, bug #204838
 
   08 Jan 2008; Brent Baude <ranger@gentoo.org> apache-2.2.6-r7.ebuild:
   Marking apache-2.2.6-r7 ppc64 for bug 204838
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e848bd2b9b46..0709f893fc81 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache-2.2.6_CVE-2007-5000.patch 1011 RMD160 19d1376d938d9475979e923dc2dbaab1baad7bee SHA1 7c56470b25bffd5fa25679a80d9a3615e094db12 SHA256 8c53efb36eaaf11520b9bcc780b79361dbbf10caae05ed38a2ffb7ae8cd8a8a9
 MD5 6aad259a025870b036020a43b14642b7 files/apache-2.2.6_CVE-2007-5000.patch 1011
 RMD160 19d1376d938d9475979e923dc2dbaab1baad7bee files/apache-2.2.6_CVE-2007-5000.patch 1011
@@ -32,14 +35,14 @@ EBUILD apache-2.2.6-r6.ebuild 5183 RMD160 6457afc0990c100f73313e5b7448bfbc07f574
 MD5 667abaaccb2271bb345f320fb9cc7ab1 apache-2.2.6-r6.ebuild 5183
 RMD160 6457afc0990c100f73313e5b7448bfbc07f5747c apache-2.2.6-r6.ebuild 5183
 SHA256 1dccbfb43eadb67498a943d5f03c799c7c8f068f37cb888891f8232b40cce5a7 apache-2.2.6-r6.ebuild 5183
-EBUILD apache-2.2.6-r7.ebuild 5181 RMD160 b41ca29ce08d8dcce4b27c3ec4c145a8b6f3c5d5 SHA1 668723745ac69b48ddf127864685495ff81254a2 SHA256 a9b5756cef20fdbd49d68ba19f5213d5b48d627b81e0508b1f6ea47bcee9d637
-MD5 2eb6e6be6edef584cae68a5e8c8d375f apache-2.2.6-r7.ebuild 5181
-RMD160 b41ca29ce08d8dcce4b27c3ec4c145a8b6f3c5d5 apache-2.2.6-r7.ebuild 5181
-SHA256 a9b5756cef20fdbd49d68ba19f5213d5b48d627b81e0508b1f6ea47bcee9d637 apache-2.2.6-r7.ebuild 5181
-MISC ChangeLog 99872 RMD160 7207dea04f0041c5c28162874bfb344194fa2bfa SHA1 15838f9ceaa9b5fe3e6ffa2a5bd2e1f53bed5984 SHA256 589b9e94f28d5e26ca22c658edaafaea133efad57be8cc48808fedb1a4e5886a
-MD5 83481ff032afa3c3f0a177f7ade6794f ChangeLog 99872
-RMD160 7207dea04f0041c5c28162874bfb344194fa2bfa ChangeLog 99872
-SHA256 589b9e94f28d5e26ca22c658edaafaea133efad57be8cc48808fedb1a4e5886a ChangeLog 99872
+EBUILD apache-2.2.6-r7.ebuild 5180 RMD160 e62e0ca8dd064d096c5f00140832546711bd5a06 SHA1 a2e6f5bd5b043a3ec12e4e7d37697aeafa94b7fc SHA256 635526e574faa4440d03f70287995007d20266353264bf9cccbc01ef9a67b46f
+MD5 b56a2bc514a7e82c99aeb355b651e5d8 apache-2.2.6-r7.ebuild 5180
+RMD160 e62e0ca8dd064d096c5f00140832546711bd5a06 apache-2.2.6-r7.ebuild 5180
+SHA256 635526e574faa4440d03f70287995007d20266353264bf9cccbc01ef9a67b46f apache-2.2.6-r7.ebuild 5180
+MISC ChangeLog 99971 RMD160 3c227ca1963a47dc1935f318c35d148fd8e48e75 SHA1 e7dc74de20e0438cb9c789eca6411a1f23f7c1bc SHA256 4b918c10aa2583a56c499c50aee39bad05c22f0763ddaf3c09128d0efa03fd36
+MD5 dc9c42c77ccd18a7294298f9c0c4a932 ChangeLog 99971
+RMD160 3c227ca1963a47dc1935f318c35d148fd8e48e75 ChangeLog 99971
+SHA256 4b918c10aa2583a56c499c50aee39bad05c22f0763ddaf3c09128d0efa03fd36 ChangeLog 99971
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -62,3 +65,10 @@ SHA256 b96912d1eb1d3325b98daf7aa5314bf5eb5826206ba24add0d9840904497c541 files/di
 MD5 b75641abc20af74044985f8f16784fb5 files/digest-apache-2.2.6-r7 536
 RMD160 218080b6f024cc12529e6e7b280fac1256ec869e files/digest-apache-2.2.6-r7 536
 SHA256 a8b137170b4785953fb3ced4a48db1c61e7fda926ae0842df00b26d57232411e files/digest-apache-2.2.6-r7 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeDkJoACgkQkKaRLQcq0GKvGwCfV1NsdNN98qOkUCp+2NdM7xCf
+Rt0An1mtnzrTDSpRDKZ1+PA8tJM5H2AV
+=+UOS
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.6-r7.ebuild b/www-servers/apache/apache-2.2.6-r7.ebuild
index b59cc76132fe..4d79197ec825 100644
--- a/www-servers/apache/apache-2.2.6-r7.ebuild
+++ b/www-servers/apache/apache-2.2.6-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.6-r7.ebuild,v 1.3 2008/01/08 02:06:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r7.ebuild,v 1.4 2008/01/08 15:01:33 maekke Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20080107"
@@ -79,7 +79,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="sni"
 
 DEPEND="${DEPEND}