summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-servers/apache/ChangeLog7
-rw-r--r--www-servers/apache/apache-2.2.20.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 09d4871fc8fe..7d9a8ec31b90 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
# 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.156 2011/09/01 15:51:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.157 2011/09/02 09:10:09 chainsaw Exp $
+
+ 02 Sep 2011; Tony Vroon <chainsaw@gentoo.org> apache-2.2.20.ebuild:
+ Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
+ Lazkani & Agostino "ago" Sarubbo in security bug #380475 filed by Alex "a3li"
+ Legler.
*apache-2.2.20 (01 Sep 2011)
diff --git a/www-servers/apache/apache-2.2.20.ebuild b/www-servers/apache/apache-2.2.20.ebuild
index 8e06ca61f0bb..04e0395821e6 100644
--- a/www-servers/apache/apache-2.2.20.ebuild
+++ b/www-servers/apache/apache-2.2.20.ebuild
@@ -1,6 +1,6 @@
# 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.20.ebuild,v 1.1 2011/09/01 15:51:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.20.ebuild,v 1.2 2011/09/02 09:10:09 chainsaw Exp $
# latest gentoo apache files
GENTOO_PATCHSTAMP="20110901"
@@ -88,7 +88,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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND="${DEPEND}