Patch to fix deprecated mit-krb5 function call. Bug #97263.

(Portage version: 2.0.51.22-r1)

6 files changed, 41 insertions, 19 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index cdec70f1d642..8cea399f4b6c 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.59 2005/05/31 17:36:20 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.60 2005/07/01 16:35:11 ticho Exp $
+
+  01 Jul 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/fetchmail-6.2.5-mit-krb5-1.4.patch, fetchmail-6.2.5.ebuild,
+  fetchmail-6.2.5-r1.ebuild, fetchmail-6.2.5-r2.ebuild:
+  Added a patch to remove a deprecated function call from sources if
+  >=mit-krb5-1.4 is installed. Closes bug #97263, reported by Tomasz
+  Mloduchowski <mlodutb at mit.edu>.
 
   31 May 2005; Andrej Kacian <ticho@gentoo.org> fetchmail-6.2.5-r2.ebuild:
   Made ebuild compatible with Gentoo/FreeBSD (bug #92401, by Diego Pettenò
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index e1b310f615d6..cb607b545f0d 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 faaffbf24a8f1845717127119690cbc9 fetchmail-6.2.1-r1.ebuild 1773
 MD5 4699605e930914b11ab0b894d5b8c545 fetchmail-6.2.4.ebuild 2143
 MD5 0e3513a92097cbf36de0d981f0c6489e fetchmail-5.9.14.ebuild 1897
 MD5 93696635908b3e9f12e791de449a82c8 fetchmail-6.2.2-r2.ebuild 2043
 MD5 8a5a81b6cd89c3cf5fe341accd3ed708 fetchmail-6.2.3.ebuild 1962
-MD5 f43b4b5b36e564d8d7af772dc9b2cac7 fetchmail-6.2.5-r2.ebuild 2555
-MD5 47387ea53567967ca0058104cba62288 fetchmail-6.2.5.ebuild 2443
-MD5 1e9d30d413939c86a67d1e2808ac3944 ChangeLog 9230
+MD5 75ed9fa89e40a69f9d9c80b9bb157f56 fetchmail-6.2.5-r2.ebuild 2722
+MD5 08627ff62eecc9738c8b7c38a10d0a2d fetchmail-6.2.5.ebuild 2610
+MD5 83bb3a0f1c7a5fdc34c744ad4b631e12 ChangeLog 9579
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 15c2c7669d67b58e452bf2e5879fecde fetchmail-6.2.5-r1.ebuild 2567
+MD5 b415149de455fe51fb82c4879a58183f fetchmail-6.2.5-r1.ebuild 2734
 MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
@@ -24,14 +21,8 @@ MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
 MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
 MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch 526
 MD5 44ab8af6373e139c7c4b8b8df77b0658 files/fetchmail 591
+MD5 9fdac9fcc5797bfb643d850abe200105 files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
 MD5 32b3f4317fd807e171da3cd6c27217c2 files/fetchmail-6.2.5-kerberos.patch 1143
 MD5 b8f3ceb78e16e9c26c34908229893659 files/digest-fetchmail-6.2.3 68
 MD5 c1c69ebb34b0848d22249ae32b770061 files/digest-fetchmail-6.2.4 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCnKCwQlM6RnzZP+IRAuQ+AJsFGJ65AvpVtvPrX/w9RFtSJxcweACdH9JT
-tnJQ2BAkxineTBfGHtn9Unw=
-=0tnh
------END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
index b665514b87ff..e181861d6961 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild,v 1.4 2005/04/28 18:22:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild,v 1.5 2005/07/01 16:35:11 ticho Exp $
 
 inherit eutils gnuconfig
 
@@ -30,6 +30,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
 	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
 	epatch ${FILESDIR}/${P}-broken-headers.patch || die
+	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
+	if has_version '>=app-crypt/mit-krb5-1.4' ; then
+		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
+	fi
 }
 
 src_compile() {
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
index 85fbfda0877c..3973f934ac1e 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild,v 1.4 2005/05/31 17:36:20 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild,v 1.5 2005/07/01 16:35:11 ticho Exp $
 
 inherit eutils gnuconfig
 
@@ -32,6 +32,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
 	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
 	epatch ${FILESDIR}/${P}-broken-headers.patch || die
+	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
+	if has_version '>=app-crypt/mit-krb5-1.4' ; then
+		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
+	fi
 
 	autoconf
 	gnuconfig_update
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
index f5d14d9eadc9..554c236c1f6b 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.ebuild,v 1.19 2004/11/03 04:24:04 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.ebuild,v 1.20 2005/07/01 16:35:11 ticho Exp $
 
 inherit eutils gnuconfig
 
@@ -28,6 +28,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-kerberos.patch
 	# patch fixes bug #40126 (tomk@gentoo.org 2004-08-07)
 	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
+	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
+	if has_version '>=app-crypt/mit-krb5-1.4' ; then
+		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
+	fi
 }
 
 src_compile() {
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-mit-krb5-1.4.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-mit-krb5-1.4.patch
new file mode 100644
index 000000000000..f77ff400e858
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-mit-krb5-1.4.patch
@@ -0,0 +1,12 @@
+Don't use this libkrb5 private function.
+
+--- fetchmail-6.2.5/driver.c	2005-03-16 18:46:27.755452749 -0500
++++ fetchmail-6.2.5/driver.c	2005-03-16 18:46:29.964164309 -0500
+@@ -210,7 +210,6 @@
+     krb5_auth_context auth_context = NULL;
+ 
+     krb5_init_context(&context);
+-    krb5_init_ets(context);
+     krb5_auth_con_init(context, &auth_context);
+ 
+     if (retval = krb5_cc_default(context, &ccdef)) {