summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-03-29 14:04:32 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-03-29 14:04:32 +0000
commit90ee51667f8a064d0920c9b088e186c76ea7505b (patch)
tree6e5ff23d552cc1562ab849096c8396201027766b /www-servers
parentstable x86, security bug 308049 (diff)
downloadhistorical-90ee51667f8a064d0920c9b088e186c76ea7505b.tar.gz
historical-90ee51667f8a064d0920c9b088e186c76ea7505b.tar.bz2
historical-90ee51667f8a064d0920c9b088e186c76ea7505b.zip
stable x86, security bug 308049
Package-Manager: portage-2.1.7.17/cvs/Linux i686
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/apache/ChangeLog5
-rw-r--r--www-servers/apache/Manifest14
-rw-r--r--www-servers/apache/apache-2.2.15.ebuild4
3 files changed, 18 insertions, 5 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/Manifest b/www-servers/apache/Manifest
index 3d59098c9e8d..f670ecb3c577 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST gentoo-apache-2.2.14-r1-20091008.tar.bz2 62359 RMD160 0e78de9a61265be2ef797e02bce0cf89f0a5fd2a SHA1 357316581f7d7d289655992216be6c5f5342f32c SHA256 99db378884b33af1c97713f63d92f0bb1d02eef6dc1f8f47a9addd258b3f7233
DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b884876946b81bd476 SHA1 20fa102d6094d00d3c874b0b1df69d0ddcf34339 SHA256 b3c4ca6eed24ea82ff37bfa331403b09c94f3b2a8b5b1058761651c6824787c1
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-2.2.14-r1.ebuild 2268 RMD160 7d889a8a82554e4aa7f512d8b5860b8bc8e3b3df SHA1 a0748f9e31319b0da47b2fd29398e615d8208079 SHA256 5403b4b520041ab1538bfefceca454a1fc38d7d095b20f3f2aec2b21816030b9
-EBUILD apache-2.2.15.ebuild 2328 RMD160 26f3d356a3df5991c83a8bb4794c1ef816c66ab3 SHA1 637321e5f808c75a1de2fc61a76481341cef5165 SHA256 8fe618d438c72696116d8f647b73ff2c923433a972d1c5c3a46de4b7e633cf44
-MISC ChangeLog 110153 RMD160 87b5a6aa3f048b932641284b633fee4d0e2a4087 SHA1 4f9a161f3d12e99a219531679698e8aa251543a4 SHA256 feb544089b0b7f3f0e57b38430c2ad87b6540358b408dcc522e41ee3df9cbca9
+EBUILD apache-2.2.15.ebuild 2326 RMD160 9eecbd9f995bd35ce90748297539439438b69b93 SHA1 ca5acf799379e4bac76548b904b1d9b05219efaf SHA256 2616af3d1f2ad2a6077ff45150fe64761fb6a12852ecb5e33a6ed3d1245dac23
+MISC ChangeLog 110264 RMD160 9dd7232c50ddb124e313efc806658fabd5b6cef0 SHA1 02a63208d2a9c1772055d1a367792645a0de24e5 SHA256 b380bf0acb06a563eea285bc70efee7ccfc5b8ee94df440231350ca018d09922
MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuws3YACgkQNQqtfCuFnePXKgCfYBQHkSBxf0ss+5IEV8T+Wygw
+XAAAnA5YerWXV7qAXdL5XgTbF6+5Y7/o
+=HQ/K
+-----END PGP SIGNATURE-----
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}