summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-04-11 13:58:37 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-04-11 13:58:37 +0000
commit15dc6ce3494a8e79174f4a4c9dfc46594ec15982 (patch)
tree39f70844b7b080e33409f3f61fdcaa7691e8223e /www-servers
parentx86 stable wrt bug #360625 (diff)
downloadhistorical-15dc6ce3494a8e79174f4a4c9dfc46594ec15982.tar.gz
historical-15dc6ce3494a8e79174f4a4c9dfc46594ec15982.tar.bz2
historical-15dc6ce3494a8e79174f4a4c9dfc46594ec15982.zip
x86 stable wrt bug #360625
Package-Manager: portage-2.1.9.42/cvs/Linux i686
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/apache/ChangeLog5
-rw-r--r--www-servers/apache/Manifest10
-rw-r--r--www-servers/apache/apache-2.2.17.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index d01ff6b87439..0f0cb9688289 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
# 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.151 2011/04/10 19:49:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.152 2011/04/11 13:58:37 phajdan.jr Exp $
+
+ 11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> apache-2.2.17.ebuild:
+ x86 stable wrt bug #360625
10 Apr 2011; Markus Meier <maekke@gentoo.org> apache-2.2.17.ebuild:
arm stable, bug #360625
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 2ebebf15de4c..eda5ba3ea7e4 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -13,13 +13,13 @@ EBUILD apache-2.2.14-r1.ebuild 2275 RMD160 347fabe296dafc6bbed9f45d8f6b102659c58
EBUILD apache-2.2.15.ebuild 2326 RMD160 6d56b8771691af5ad1afb35f1b7b0c76a1c0a317 SHA1 93bad89a62c4c5f22f2eafcda0187186c7820c54 SHA256 2d4d2c0944904f405332893dd7ffe62a6ea4d9ee77a516b64a48b185da933ab0
EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad7b8 SHA1 0afb3ee574c4a2d775e754eb3840e3716140c9fd SHA256 529cc5347e19df6ae31ff0546b7b2f375fd9e35f67f8947e0a1f18742128e24b
EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
-EBUILD apache-2.2.17.ebuild 2673 RMD160 7dc11ef0a2c7d0818533029c9d86d9ae5cb20f51 SHA1 6fafea3377413f71af275cef9b1739162462f9ff SHA256 2af0363a39dd032d0a02698e508bcdf36006342cc5bbf593a2bc7a9a91ed5d7d
-MISC ChangeLog 112467 RMD160 11a83d88b6a26877427bacc30b9f6ba9efc32dee SHA1 cf69e2d613b8fab8b5330ef440dd02bbf1e0fa87 SHA256 a6208e7df8582993eabde053a0f502e34553a671469b8c9dc6b5f10a74c76424
+EBUILD apache-2.2.17.ebuild 2676 RMD160 0fe5fa1d1a1e8c3c020ef92ac82eb7a2e69be169 SHA1 020f971a1802a7559344cbdb254c4004dd77df2e SHA256 e68401dc7893f75647fe165845a816a20b650aa5d37dcdf7ea31ffd4c6615a44
+MISC ChangeLog 112578 RMD160 df06af27afb4ec24b1d6bdad62beecc2a46dd898 SHA1 326bff5030a2803fd7ecc3bef25f3fba6bf448eb SHA256 bf2e27055adf64e81c89a3994f1b97e11843d6f2e2c57581412f33f8c82c2d72
MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2iClAACgkQkKaRLQcq0GKurQCeJ8Nvlziy7xFlvzvzI9/Cs5PB
-Ra0Amwb4q1p4KTESV713EBL0w0HAfHMw
-=4rAw
+iEYEARECAAYFAk2jCRcACgkQuUQtlDBCeQLhlACeJeeDGNjPqWEPhwRaNEVaQPQM
+ZcoAn0PfUc9C606J8IgTk8B1TFomm8oC
+=zqmo
-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.17.ebuild b/www-servers/apache/apache-2.2.17.ebuild
index f4af934ba716..c95f64aefd5a 100644
--- a/www-servers/apache/apache-2.2.17.ebuild
+++ b/www-servers/apache/apache-2.2.17.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.17.ebuild,v 1.4 2011/04/10 19:49:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.17.ebuild,v 1.5 2011/04/11 13:58:37 phajdan.jr Exp $
# latest gentoo apache files
GENTOO_PATCHSTAMP="20110218"
@@ -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}