diff options
author | Christian Faulhammer <fauli@gentoo.org> | 2010-03-29 14:04:32 +0000 |
---|---|---|
committer | Christian Faulhammer <fauli@gentoo.org> | 2010-03-29 14:04:32 +0000 |
commit | 4f80f372da25261339cc0ce50f3f6254ac489f54 (patch) | |
tree | df9acf471142c21377230d9fd9777af0aba2df84 /www-servers/apache | |
parent | stable x86, security bug 308049 (diff) | |
download | gentoo-2-4f80f372da25261339cc0ce50f3f6254ac489f54.tar.gz gentoo-2-4f80f372da25261339cc0ce50f3f6254ac489f54.tar.bz2 gentoo-2-4f80f372da25261339cc0ce50f3f6254ac489f54.zip |
stable x86, security bug 308049
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'www-servers/apache')
-rw-r--r-- | www-servers/apache/ChangeLog | 5 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.15.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 01e45debdac6..079c1c6e8255 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.130 2010/03/07 16:20:22 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.131 2010/03/29 14:04:32 fauli Exp $ + + 29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> apache-2.2.15.ebuild: + stable x86, security bug 308049 07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> apache-2.2.15.ebuild: fix openssl DEPEND wrt #308049 diff --git a/www-servers/apache/apache-2.2.15.ebuild b/www-servers/apache/apache-2.2.15.ebuild index 48fd491e5529..95c8b0816366 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.2 2010/03/07 16:20:22 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v 1.3 2010/03/29 14:04:32 fauli 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} |