summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2011-10-29 18:46:16 +0000
committerRaúl Porcel <armin76@gentoo.org>2011-10-29 18:46:16 +0000
commitff9cb1b82e1e3144a1b7aaa5b392c8eb923827b5 (patch)
tree3747b8665c3231b6f779ffb93b9a6d5b50e49052 /www-servers/apache
parentalpha/ia64/s390/sh/sparc stable wrt #385859 (diff)
downloadhistorical-ff9cb1b82e1e3144a1b7aaa5b392c8eb923827b5.tar.gz
historical-ff9cb1b82e1e3144a1b7aaa5b392c8eb923827b5.tar.bz2
historical-ff9cb1b82e1e3144a1b7aaa5b392c8eb923827b5.zip
alpha/ia64/s390/sh/sparc stable wrt #385859
Package-Manager: portage-2.1.10.11/cvs/Linux ia64
Diffstat (limited to 'www-servers/apache')
-rw-r--r--www-servers/apache/ChangeLog5
-rw-r--r--www-servers/apache/Manifest10
-rw-r--r--www-servers/apache/apache-2.2.21-r1.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 68b635561503..bde6e650b923 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.172 2011/10/24 19:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.173 2011/10/29 18:46:16 armin76 Exp $
+
+ 29 Oct 2011; Raúl Porcel <armin76@gentoo.org> apache-2.2.21-r1.ebuild:
+ alpha/ia64/s390/sh/sparc stable wrt #385859
24 Oct 2011; Markus Meier <maekke@gentoo.org> apache-2.2.21-r1.ebuild:
x86 stable, bug #385859
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 7b1ef3d9923d..50b80e70e5f8 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -20,14 +20,14 @@ EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad
EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
EBUILD apache-2.2.17.ebuild 2662 RMD160 504b6e5e1fca0e16802dc07a1244517e7c868b66 SHA1 881c6fa19547502b3d8e33a927d27c707569c8d9 SHA256 5f18d3f92d278467e839898adeb130c13b30be9a4eb9094c6b18a12700ff4332
EBUILD apache-2.2.20.ebuild 2663 RMD160 45ffdb6ac45a8d2227128c3008aa66dfa84ab797 SHA1 c3d254c5239772964241527083a9d703848c8024 SHA256 abf0ff5141cb2335c9e826dfb59101079c559b945b2042da7266741004df4ce7
-EBUILD apache-2.2.21-r1.ebuild 2748 RMD160 a629422dc8ede02665f29bfb2d9f71b446cd26fb SHA1 cf169bb9b98dd601b2b384a1746e2e040abf5783 SHA256 7a26aff0f42e72542d617b39d1711e02d02a64ac5e3a30b2d2460a2e451a6ca7
+EBUILD apache-2.2.21-r1.ebuild 2744 RMD160 44e1572e7aa2a9ae5fdb7b8000ede95591a117ff SHA1 7bb566b7a97d1b021e3db5f7a8d9a2c3a7d9756a SHA256 f9d203b3df8d8e7e40e55a2b9f91dad9fe25aa6d5a1e4656a71455f0369f025f
EBUILD apache-2.2.21.ebuild 2666 RMD160 888196d1e2490b734809bc1f9568ce3c54e58e5d SHA1 78b858ee8ba94444775d157888b013c01b69173b SHA256 9731f01eebf6acdd83c32b982497bc5c22c36bd03387cc192c001a60fc2652e0
-MISC ChangeLog 116228 RMD160 01f75312335829896dcb2afbebd9df6716502f5d SHA1 0bbb9bfe2a5b96e0b4e7ec8416d6bdbad8a01cc3 SHA256 5dc52cb0e4192a28a545dfe6480894e93edf3bfda471fed8d0ae0ed281b6714d
+MISC ChangeLog 116350 RMD160 11e2c4bb4d414a7a836ffd97b62b69941de230ee SHA1 1bee9bb162e27395770ee06b4d29e4b6cc778596 SHA256 fe057155dc961e2115df157816d9e45a4c00bf620fbc8f713dda36a0404a2512
MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk6lwsUACgkQkKaRLQcq0GI30QCfaj+vxyQFTNBZtcASJFNg8tem
-aUwAoIB/0hgeDrVJqimTxv6uh/1s8TKx
-=nm4K
+iEYEARECAAYFAk6sSf8ACgkQuQc30/atMkBKGwCfcZD+HuyC5MfRms8AsohY5ocM
+FfAAoKix9DjNdFHQ5liZG79pJhR9nkiT
+=4LmQ
-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.21-r1.ebuild b/www-servers/apache/apache-2.2.21-r1.ebuild
index ed77a1ca70e9..e1f08fc372d9 100644
--- a/www-servers/apache/apache-2.2.21-r1.ebuild
+++ b/www-servers/apache/apache-2.2.21-r1.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.21-r1.ebuild,v 1.6 2011/10/24 19:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21-r1.ebuild,v 1.7 2011/10/29 18:46:16 armin76 Exp $
# latest gentoo apache files
GENTOO_PATCHSTAMP="20111018"
@@ -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}