Removing mod_auth_kerb-5.0-cache.patch and mod_auth_kerb-5.0-axps1.patch from the...

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/net-www/mod_auth_kerb/ChangeLog b/net-www/mod_auth_kerb/ChangeLog
index 7e2d4f0e14e3169a99e69df10781c07d9c36929c..6fcf627a6b87b6e30e3d523ca7fb392d80d4ad0f 100644 (file)
--- a/net-www/mod_auth_kerb/ChangeLog
+++ b/net-www/mod_auth_kerb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_kerb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.17 2007/01/10 21:59:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.18 2007/01/13 18:59:26 phreak Exp $
+
+  13 Jan 2007; Christian Heim <phreak@gentoo.org>
+  mod_auth_kerb-5.0_rc7-r1.ebuild:
+  Removing mod_auth_kerb-5.0-cache.patch and mod_auth_kerb-5.0-axps1.patch
+  from the patchlist for mod_auth_kerb-5.0-rc7-r1 (thanks to Andrej Kacian for
+  reporting it), as UPSTREAM already included these fixes.
 
   10 Jan 2007; Christian Heim <phreak@gentoo.org>
   mod_auth_kerb-5.0_rc6-r1.ebuild, mod_auth_kerb-5.0_rc7-r1.ebuild:

diff --git a/net-www/mod_auth_kerb/Manifest b/net-www/mod_auth_kerb/Manifest
index 60d6a89a76dd3622ccbffebd77105a88fe79891e..12b4e838aea86e2f09e13902eff32b431f583706 100644 (file)
--- a/net-www/mod_auth_kerb/Manifest
+++ b/net-www/mod_auth_kerb/Manifest
@@ -36,10 +36,10 @@ EBUILD mod_auth_kerb-5.0_rc6.ebuild 994 RMD160 59884098014995847824de37c745f7b59
 MD5 f27c51774dfa20631dfbc8ee83e76267 mod_auth_kerb-5.0_rc6.ebuild 994
 RMD160 59884098014995847824de37c745f7b59396c5df mod_auth_kerb-5.0_rc6.ebuild 994
 SHA256 a46dcfcf816a75f05e19d422a4df210935e5f2aa9fbf41ee51a1625dfee1eb29 mod_auth_kerb-5.0_rc6.ebuild 994
-EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1364 RMD160 f4473a39a0f5663f9bb10172a1b8aeabe37fd2ea SHA1 ceaddcf47fdb64246154617d409df5b175e07809 SHA256 f1ee32c34ff7d985fedc60c9e920ddf2d1b7e5d5501951ad4eedc83c228cd385
-MD5 19babfdbec361269c49980bf67b7ec89 mod_auth_kerb-5.0_rc7-r1.ebuild 1364
-RMD160 f4473a39a0f5663f9bb10172a1b8aeabe37fd2ea mod_auth_kerb-5.0_rc7-r1.ebuild 1364
-SHA256 f1ee32c34ff7d985fedc60c9e920ddf2d1b7e5d5501951ad4eedc83c228cd385 mod_auth_kerb-5.0_rc7-r1.ebuild 1364
+EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1274 RMD160 ab2313e986f8cbc0288c4e47270cdc984f475bd1 SHA1 1ecad03362d81a394831dfd0adee5b40d063179a SHA256 bd5d936ef320865695b1b64868d527af80a6e1a0840d85e635e793e3cf1035ea
+MD5 4d63990dbcf487b29bb8977652a9a7f8 mod_auth_kerb-5.0_rc7-r1.ebuild 1274
+RMD160 ab2313e986f8cbc0288c4e47270cdc984f475bd1 mod_auth_kerb-5.0_rc7-r1.ebuild 1274
+SHA256 bd5d936ef320865695b1b64868d527af80a6e1a0840d85e635e793e3cf1035ea mod_auth_kerb-5.0_rc7-r1.ebuild 1274
 EBUILD mod_auth_kerb-5.0_rc7.ebuild 994 RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d SHA1 6cb92235ea481a3afc0ff3fa0de6b55bcced47d2 SHA256 e8941b81333972497934727dba7de00f49f391261713ed29a633a5cd31a6ffe1
 MD5 5a22278bd688624404ea66a059b8d0c9 mod_auth_kerb-5.0_rc7.ebuild 994
 RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d mod_auth_kerb-5.0_rc7.ebuild 994
@@ -48,10 +48,10 @@ EBUILD mod_auth_kerb-5.3.ebuild 990 RMD160 bbda8b2899044236f1998883e30de1a8321bb
 MD5 b9ded4dd06eec4a770f372c014a05fa8 mod_auth_kerb-5.3.ebuild 990
 RMD160 bbda8b2899044236f1998883e30de1a8321bbcc6 mod_auth_kerb-5.3.ebuild 990
 SHA256 8099dac3a3b101658b80680d09cdcdc3c719f1800dec320fe104ae93951ff42b mod_auth_kerb-5.3.ebuild 990
-MISC ChangeLog 3013 RMD160 0ef85f2844fc34e9f908d3a7ae04df1b65d3212f SHA1 7bb404623ce8a18e58ad9c91e6960bbdc39b1ee6 SHA256 48e4f3b4998b7a2741c6199d4e84c20afc8ed5ba8f7dce242e9a1d64a0428bb5
-MD5 d64071e20e7a21a99eaccef712a38615 ChangeLog 3013
-RMD160 0ef85f2844fc34e9f908d3a7ae04df1b65d3212f ChangeLog 3013
-SHA256 48e4f3b4998b7a2741c6199d4e84c20afc8ed5ba8f7dce242e9a1d64a0428bb5 ChangeLog 3013
+MISC ChangeLog 3312 RMD160 e0eec4c5c5c4e6734e752477f21a7d0983e6ae54 SHA1 3528b3a218aec8943cd77cba7bbe230f3262c324 SHA256 6fd8dacc97e005488b73724e776b560bce0ff63ee5e685357a6b5031bb6cb922
+MD5 aae3a8a18969d08c4d5f823db0bbeab3 ChangeLog 3312
+RMD160 e0eec4c5c5c4e6734e752477f21a7d0983e6ae54 ChangeLog 3312
+SHA256 6fd8dacc97e005488b73724e776b560bce0ff63ee5e685357a6b5031bb6cb922 ChangeLog 3312
 MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3
 MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231
 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231
@@ -74,7 +74,7 @@ SHA256 7a09875fc28474a3531327dad26f07afc4ed8ad73b27b6600583c046d3a618bc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpWGlyuNVb5qfaOYRAlZJAJ0avPkD4S47MAfm7fsYKNNixtb8eQCfWQ0R
-W7Ni8L0RWlFEJOw2zdxcLos=
-=5n5g
+iD8DBQFFqSs1yuNVb5qfaOYRAlruAJ9R/kQ5w8JlqwZ6J/2jW4stdArEQwCfZySU
+xoqYs9Ya07aUJY7M2ojY7FU=
+=5OHX
 -----END PGP SIGNATURE-----

diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
index 5b8390042784f988cf286f45c9b7ce2cc1debb48..975cf3277c13d92b4d9b2172cc4335769dfbe771 100644 (file)
--- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
+++ b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.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/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild,v 1.2 2007/01/10 21:59:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild,v 1.3 2007/01/13 18:59:26 phreak Exp $
 
 MY_PV="${PV/_rc/rc}"
 
@@ -40,8 +40,6 @@ src_unpack() {
        epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch"
        epatch "${FILESDIR}/${PN}-5.0-gcc4.patch"
        if use apache2 ; then
-               epatch "${FILESDIR}/${PN}-5.0-axps1.patch"
-               epatch "${FILESDIR}/${PN}-5.0-cache.patch"
                epatch "${FILESDIR}/${PN}-5.0-exports.patch"
        fi