summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2010-03-29 21:51:52 +0000
committerMarkus Meier <maekke@gentoo.org>2010-03-29 21:51:52 +0000
commit9f5743aae7c4fdf53a76d1256d8849fc20c16a2a (patch)
tree11ce153a485acd8b2d609a8a9477849b4daec8d5 /www-servers
parentamd64/arm stable, bug #308049 (diff)
downloadgentoo-2-9f5743aae7c4fdf53a76d1256d8849fc20c16a2a.tar.gz
gentoo-2-9f5743aae7c4fdf53a76d1256d8849fc20c16a2a.tar.bz2
gentoo-2-9f5743aae7c4fdf53a76d1256d8849fc20c16a2a.zip
amd64/arm stable, bug #308049
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/apache/ChangeLog5
-rw-r--r--www-servers/apache/apache-2.2.15.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 079c1c6e8255..45f75a4e564d 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/apache
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.131 2010/03/29 14:04:32 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.132 2010/03/29 21:51:52 maekke Exp $
+
+ 29 Mar 2010; Markus Meier <maekke@gentoo.org> apache-2.2.15.ebuild:
+ amd64/arm stable, bug #308049
29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> apache-2.2.15.ebuild:
stable x86, security bug 308049
diff --git a/www-servers/apache/apache-2.2.15.ebuild b/www-servers/apache/apache-2.2.15.ebuild
index 95c8b0816366..097eed140620 100644
--- a/www-servers/apache/apache-2.2.15.ebuild
+++ b/www-servers/apache/apache-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/www-servers/apache/apache-2.2.15.ebuild,v 1.3 2010/03/29 14:04:32 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v 1.4 2010/03/29 21:51:52 maekke Exp $
# latest gentoo apache files
GENTOO_PATCHSTAMP="20100307"
@@ -80,7 +80,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}