From b063516901da3773f930f94d27e8f65200a3bf77 Mon Sep 17 00:00:00 2001
From: Christian Faulhammer <fauli@gentoo.org>
Date: Mon, 29 Mar 2010 14:03:01 +0000
Subject: [PATCH] stable x86, security bug 308049 Package-Manager:
 portage-2.1.7.17/cvs/Linux i686

---
 app-admin/apache-tools/ChangeLog                  |  6 +++++-
 app-admin/apache-tools/Manifest                   | 14 ++++++++++++--
 app-admin/apache-tools/apache-tools-2.2.15.ebuild |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 0b6b5aa30612..f58242391f66 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.71 2010/03/07 11:45:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.72 2010/03/29 14:03:01 fauli Exp $
+
+  29 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  apache-tools-2.2.15.ebuild:
+  stable x86, security bug 308049
 
 *apache-tools-2.2.15 (07 Mar 2010)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 0fbe9a023c07..6a044a862b23 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db1030fa3 SHA1 863110419b1fa393d36dfbcd0adf1da827b86f76 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b
 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
 EBUILD apache-tools-2.2.14.ebuild 2258 RMD160 2efba97f354d6a9eaee14b1ccce2c727fa99a7da SHA1 75ab4754ab0b5f51279fdfb13ef7d8df38fb4f28 SHA256 950671fe3809bfd809298c4bd320bb364d5ab92d3a15f0ea5f1b5313aa6253dd
-EBUILD apache-tools-2.2.15.ebuild 2269 RMD160 a1e1ec461a6810e90d3de1a43d87ef661bff49a2 SHA1 f86092b0f038ac029f766984f69c104184a80638 SHA256 104cc2e262dba86cffed9561f4e56d14f56a025015b5cf75c9df2a829eabd185
-MISC ChangeLog 9405 RMD160 59461c7564e41b46c4291e3709c5bc4bebc91ebb SHA1 7fd476884677dcdd1faef4ea477e56caf621ca6a SHA256 686a870c416b120ad8e595bfb5390a25ce738956f2c9e09284c48479eb786c10
+EBUILD apache-tools-2.2.15.ebuild 2267 RMD160 55821f7d52f4b0e7d8cbc706ce343e6d75a8e0e8 SHA1 c04ce188070b1cf19ddacccc83f755f2d9b1dbe0 SHA256 ee804c098ece6e60ee5b886934934b89f9bc7cf967f622a1a1f3e5f5503914f3
+MISC ChangeLog 9524 RMD160 2bd4b186ae526f8e37a9e945b26e2fb75ce46451 SHA1 e87cd3b2931aa242fa0727998b17228661e19f86 SHA256 48769577e643cb6fa20b343ad8bc0c3fb97e850b715eb6a15d15d3fa08edb43b
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuwsxsACgkQNQqtfCuFneOFWgCfQ5Do3AGMr04LdFc6MGYpFvb0
+CYAAnRGuQZIg7ptHzQMN+/2zHPsMSG3A
+=ixRJ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.15.ebuild b/app-admin/apache-tools/apache-tools-2.2.15.ebuild
index e6e68dc070d9..da98c691d5a0 100644
--- a/app-admin/apache-tools/apache-tools-2.2.15.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.15.ebuild,v 1.1 2010/03/07 11:45:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.15.ebuild,v 1.2 2010/03/29 14:03:01 fauli Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 
-- 
2.26.2