summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2012-04-06 10:35:51 +0000
committerMarkus Meier <maekke@gentoo.org>2012-04-06 10:35:51 +0000
commit4a83cca7d1cee4c2cd4389d7ae57e1d8b0c81088 (patch)
tree8ea3e1163fb78fe0ffa7aecdc8125ee574f43284 /www-servers/apache
parentStabilise sampleicc-1.6.6 on amd64 and x86. Drop older. (diff)
downloadhistorical-4a83cca7d1cee4c2cd4389d7ae57e1d8b0c81088.tar.gz
historical-4a83cca7d1cee4c2cd4389d7ae57e1d8b0c81088.tar.bz2
historical-4a83cca7d1cee4c2cd4389d7ae57e1d8b0c81088.zip
arm stable, bug #401761
Package-Manager: portage-2.1.10.55/cvs/Linux i686
Diffstat (limited to 'www-servers/apache')
-rw-r--r--www-servers/apache/ChangeLog5
-rw-r--r--www-servers/apache/Manifest12
-rw-r--r--www-servers/apache/apache-2.2.22.ebuild4
3 files changed, 12 insertions, 9 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index a76083cb03b1..981ffb8a43a5 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/apache
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.185 2012/04/04 18:42:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.186 2012/04/06 10:35:51 maekke Exp $
+
+ 06 Apr 2012; Markus Meier <maekke@gentoo.org> apache-2.2.22.ebuild:
+ arm stable, bug #401761
04 Apr 2012; Jeroen Roovers <jer@gentoo.org> apache-2.4.1-r2.ebuild:
Fix quoting issues.
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e742d74d7e60..4e57c8bc980a 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -10,15 +10,15 @@ DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb
DIST httpd-2.4.1.tar.bz2 4101303 RMD160 6d21d828028ce1cff8648fb29c8eb1b75fd96451 SHA1 23beffce77529971e09d0fb1e760cadf80afa4e6 SHA256 7f1118cb0a1f9b505cdb9b7e854854fa2050d6ed0875b65e994bb35f267a0cca
EBUILD apache-2.2.21-r1.ebuild 2754 RMD160 0aff5594a9a8d5155255eacc08463a4e4ac8d21a SHA1 46b377446354d5f139eb1f6572b108025267a3cc SHA256 fab891049f8d174c592348c6fff981a19908a79908fe039f390627d0d2fb9cc5
EBUILD apache-2.2.21-r2.ebuild 2711 RMD160 1debb13ca577ca8f799f15be22a22d1c0c484c0f SHA1 76f455ec29b823bb65ace1872409abbe45c5cf60 SHA256 3bfcafd961393ecdaeff2d596f53ac636dc5764da69f39cc20d72fec72fdc83f
-EBUILD apache-2.2.22.ebuild 2917 RMD160 3f87cbd49e1635f31b4ac3d4a3dcafefe411a95d SHA1 466b112c518c31b21dedefe6e85f37c1e7b938d7 SHA256 97c542761f977f6dab7001a5962050784ac426ea4e3c8e62cdd91e202185793b
+EBUILD apache-2.2.22.ebuild 2919 RMD160 ac556f94c2c8418e74097df4e61ed771addb9680 SHA1 a4acbbee361512b6ec7682a0ebd4075a8d975525 SHA256 94d3201cd2ba921824e26ab0299f296f7d7264e79199b54d72c399a33eac88eb
EBUILD apache-2.4.1-r2.ebuild 3732 RMD160 595b2313fc1befc3f18100e8197620201de78287 SHA1 1ebae50a3567e766b70a4ed684f33e45c731dac7 SHA256 24defe329311af5dacf6d51f4f036780b12fe99b41ffbfa56f18b684e694e2ab
-MISC ChangeLog 13235 RMD160 29631175c73494862eed0784eb5dca478419d610 SHA1 54141caa1a4f994cd8609c009c36ac391685dda0 SHA256 c991d457d90eae6a5de4d900bb914fa7afc0168a60b6c3cba769bd82ac1c7025
+MISC ChangeLog 13335 RMD160 cad6e22d7a4305ccd976624c5cd4171887587c47 SHA1 7dbe87045f56657dee5becccb087e9b5f3b5b9a5 SHA256 e33e9ae0e3cc835b1e9d62bac1467bfdb8aea6662482822da284631245ce5600
MISC ChangeLog-2008 105137 RMD160 0ee2162a0e57feab08fd8ee0c04b43bcf63ba9b4 SHA1 28bc5fda825c08a5a2b1d03dbfbc128d083507cf SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf
MISC metadata.xml 932 RMD160 ee4ba8303731f1bb451fa96f30095dd380d7a824 SHA1 39f5bd400764a3f55b51ee17de547bc547e6c78d SHA256 f221f82c988695a174827e069157102017e724bdaae01e55f604479484e4cbaa
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk98lgQACgkQVWmRsqeSphPH9gCeOVYU0nGcGBt50fL5glM+6m7d
-dwIAmwdS2M0kKlG9LX/RFuS17EtAsfs+
-=rRRU
+iEYEARECAAYFAk9+x7QACgkQkKaRLQcq0GIGpwCcDfA5CfVNh8FOxES7dG03GP5z
+AhwAn02BowHiCMDA/Iwdhc1VV7vnU6C7
+=EJ4N
-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.22.ebuild b/www-servers/apache/apache-2.2.22.ebuild
index fc733dfd2020..bcc2ff65bd68 100644
--- a/www-servers/apache/apache-2.2.22.ebuild
+++ b/www-servers/apache/apache-2.2.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.22.ebuild,v 1.4 2012/04/04 18:38:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.22.ebuild,v 1.5 2012/04/06 10:35:51 maekke Exp $
EAPI="2"
@@ -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}