diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2007-09-02 14:48:10 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2007-09-02 14:48:10 +0000 |
| commit | 2a9dcf343acda1b6b39d2416b8ae1fc14b23bf17 (patch) | |
| tree | 8ec86dba11f8d044d2e8072db6823a58f934a84e /www-servers | |
| parent | alpha stable wrt #190775, thanks to Tobias Klausmann for testing (diff) | |
| download | historical-2a9dcf343acda1b6b39d2416b8ae1fc14b23bf17.tar.gz historical-2a9dcf343acda1b6b39d2416b8ae1fc14b23bf17.tar.bz2 historical-2a9dcf343acda1b6b39d2416b8ae1fc14b23bf17.zip | |
fix #190966
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/apache/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/apache/Manifest | 26 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.0.59-r5.ebuild | 5 |
3 files changed, 24 insertions, 15 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 7e1e3b531761..e21bff844072 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,14 +1,14 @@ # ChangeLog for www-servers/apache # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.14 2007/09/02 14:03:27 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.15 2007/09/02 14:48:10 hollow Exp $ + + 02 Sep 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.0.59-r5.ebuild: + fix #190966 02 Sep 2007; nixnut <nixnut@gentoo.org> apache-2.0.59-r5.ebuild, apache-2.2.4-r12.ebuild: Stable on ppc wrt bug 190331 - 02 Sep 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.0.59-r5.ebuild: - fix #190966 - 31 Aug 2007; Christoph Mende <angelos@gentoo.org> apache-2.2.4-r12.ebuild: Stable on amd64 wrt bug #190331 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 03521f84d170..f8c5c1885d12 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518 DIST gentoo-apache-2.0.59-r5-20070828.tar.bz2 63913 RMD160 c0cfc72d0316b0a977296a08932bebe6a7547c7b SHA1 e7e7ae28b0427c9b61895f3356307df5d6bcc324 SHA256 fa188f4f7e26b7277a8a1858c449766bc997c1f9cf1ee2a5f9fdbfda5dabcccb @@ -13,18 +16,18 @@ EBUILD apache-2.0.59-r2.ebuild 14093 RMD160 eee8d8679b13720e68c3ddd5dd9b3dec0996 MD5 e6e116e6998d69e12d2e918994f922a6 apache-2.0.59-r2.ebuild 14093 RMD160 eee8d8679b13720e68c3ddd5dd9b3dec09960764 apache-2.0.59-r2.ebuild 14093 SHA256 35c4371b02d57a5fd6869695f2b0757d447fccc27c7b3783f4c7613909b806ca apache-2.0.59-r2.ebuild 14093 -EBUILD apache-2.0.59-r5.ebuild 14133 RMD160 4d22dc039cd509e58aa72a020b9552dfe46c8111 SHA1 8419cd993b6f901e3c51d6cd905465559179274f SHA256 5fa3fd92b7b22a6c3021c1fc825506592875c8179579b4f32b68807c08ebac98 -MD5 eedc8d6fa6bd78d42e0c752d9891a279 apache-2.0.59-r5.ebuild 14133 -RMD160 4d22dc039cd509e58aa72a020b9552dfe46c8111 apache-2.0.59-r5.ebuild 14133 -SHA256 5fa3fd92b7b22a6c3021c1fc825506592875c8179579b4f32b68807c08ebac98 apache-2.0.59-r5.ebuild 14133 +EBUILD apache-2.0.59-r5.ebuild 14139 RMD160 f3535b6f953236da615eb5c953172383be6d6ba2 SHA1 817c917b45136f389ea2fb0d0fbefac31e770601 SHA256 71bb142da031070d0f36b99ed51bfba807d924ab2c10f41d67fe1f1ee876875d +MD5 cc540a798877bff9b4b8e996af78eb36 apache-2.0.59-r5.ebuild 14139 +RMD160 f3535b6f953236da615eb5c953172383be6d6ba2 apache-2.0.59-r5.ebuild 14139 +SHA256 71bb142da031070d0f36b99ed51bfba807d924ab2c10f41d67fe1f1ee876875d apache-2.0.59-r5.ebuild 14139 EBUILD apache-2.2.4-r12.ebuild 15120 RMD160 4eefdecc0439a80c1175b3b7390a8062c59fefb6 SHA1 6e43e754ce70a76b84b7c042bce4e01ffbf21c4d SHA256 7d20add4d8d659722bb1fb8848472b07324c46c1babcd9ddf79f66fd7667e1d4 MD5 f1397a62b6bb663c91c89c34e0730ac9 apache-2.2.4-r12.ebuild 15120 RMD160 4eefdecc0439a80c1175b3b7390a8062c59fefb6 apache-2.2.4-r12.ebuild 15120 SHA256 7d20add4d8d659722bb1fb8848472b07324c46c1babcd9ddf79f66fd7667e1d4 apache-2.2.4-r12.ebuild 15120 -MISC ChangeLog 95589 RMD160 396bd2c27b90b5fb5fcb520b2e226f1e90b0950f SHA1 6f3168bfbd0272fcdfa32b1fcbe89cc3a0901d04 SHA256 00365062e57dd5f391a7cadb15a87ed4cfd67a4b7d0693816b755e23bb6a608d -MD5 b6c89378cb10f3d202c6d6a9b5ea4ab3 ChangeLog 95589 -RMD160 396bd2c27b90b5fb5fcb520b2e226f1e90b0950f ChangeLog 95589 -SHA256 00365062e57dd5f391a7cadb15a87ed4cfd67a4b7d0693816b755e23bb6a608d ChangeLog 95589 +MISC ChangeLog 95589 RMD160 cb13486626e6b98e848236291bae4a6c4865153c SHA1 a7861cd0b54d08b1990c048b1f22acbdbd90e804 SHA256 18d5b1825dbb6b5c87dca0ec66801e4606a5ba28abad7988c7b2ed8097e9c777 +MD5 9413700b835d6efbebfb0c5acdc22192 ChangeLog 95589 +RMD160 cb13486626e6b98e848236291bae4a6c4865153c ChangeLog 95589 +SHA256 18d5b1825dbb6b5c87dca0ec66801e4606a5ba28abad7988c7b2ed8097e9c777 ChangeLog 95589 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551 @@ -41,3 +44,10 @@ SHA256 fa34c2ed61bffcd60f9ab545475f5045420105e88a6310786fd1dda5cc198880 files/di MD5 6f3a8e960a7a6d99e7ef2f8e1e6e45ea files/digest-apache-2.2.4-r12 539 RMD160 78e11a1319c0b7e34f209bc7b2f632bf58a5dffa files/digest-apache-2.2.4-r12 539 SHA256 11c48e69c33b119d3890350bfda7fa96943c00014bfd9039f8ede53a556275c5 files/digest-apache-2.2.4-r12 539 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.6 (GNU/Linux) + +iD8DBQFG2s00mPFBzbX68WERAqBeAJ9/1fl5nQdDvfb7Of+13zZb74Hu0ACfT2tR +bm2t5ZKfSAVHVq4NT8XXk6U= +=/an7 +-----END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.0.59-r5.ebuild b/www-servers/apache/apache-2.0.59-r5.ebuild index 715cf9962ab2..1abfa9430b49 100644 --- a/www-servers/apache/apache-2.0.59-r5.ebuild +++ b/www-servers/apache/apache-2.0.59-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r5.ebuild,v 1.4 2007/09/02 14:03:27 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r5.ebuild,v 1.5 2007/09/02 14:48:10 hollow Exp $ inherit eutils flag-o-matic gnuconfig multilib @@ -32,8 +32,6 @@ RDEPEND="dev-lang/perl !mips? ( ldap? ( =net-nds/openldap-2* ) )" DEPEND="${RDEPEND} >=sys-devel/autoconf-2.59-r4" -PDEPEND="${PDEPEND} - app-admin/apache-tools" S="${WORKDIR}/httpd-${PV}" @@ -79,6 +77,7 @@ src_unpack() { || die "sed failed" EPATCH_SUFFIX="patch" + EPATCH_EXCLUDE="03_all_gentoo-apache-tools.patch" epatch ${GENTOO_PATCHDIR}/patches/[0-8]* || die "internal ebuild error" # security patches are version based |