Closing #28113.

4 files changed, 48 insertions, 15 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index d422ab699315..98b59d622a8c 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.40 2004/01/18 22:59:02 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.41 2004/02/22 10:32:00 aliz Exp $
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> fetchmail-6.2.5.ebuild:
+  Fix kerberos5 support. Closing #28113.
 
   18 Jan 2004; <tuxus@gentoo.org> fetchmail-6.2.3.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 4af50d70e661..8a14bbe28edb 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,20 +1,21 @@
-MD5 25da77f4aaa13bda95925dcb9b934f16 ChangeLog 6477
-MD5 a39c0dfa769bcba7c7a8676ee68689eb fetchmail-5.9.14.ebuild 1929
 MD5 9ea407d1e774ec1451772d95366e7d58 fetchmail-6.2.1-r1.ebuild 1785
+MD5 7a30d799878ecfc4318479e0a7041c43 fetchmail-6.2.4.ebuild 2151
+MD5 a39c0dfa769bcba7c7a8676ee68689eb fetchmail-5.9.14.ebuild 1929
 MD5 bff1d98f24218a2640d5a78339e4fd6f fetchmail-6.2.2-r2.ebuild 2051
 MD5 38bc7d173ecce7222691e9797cc15b92 fetchmail-6.2.3.ebuild 1972
-MD5 7a30d799878ecfc4318479e0a7041c43 fetchmail-6.2.4.ebuild 2151
-MD5 4d977ae1d683a88e4f7c924a0b98fd13 fetchmail-6.2.5.ebuild 2259
+MD5 6db8e58abd14af0fff0ed209bce86f53 fetchmail-6.2.5.ebuild 2329
+MD5 1fa43b76a46d8fd1b8bc67cd361aaf0d ChangeLog 6590
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 f6bb533591550f2f5978892a3e0a6fc6 files/conf.d-fetchmail 359
-MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
-MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
 MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
+MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
+MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
+MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
+MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
+MD5 f6bb533591550f2f5978892a3e0a6fc6 files/conf.d-fetchmail 359
+MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
+MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
+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
-MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
-MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
-MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
-MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
index 3882e9c03796..c7c088ac6786 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-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2003/11/22 01:40:19 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.ebuild,v 1.5 2004/02/22 10:32:00 aliz Exp $
 
 IUSE="ssl nls ipv6 kerberos krb4"
 
@@ -18,16 +18,20 @@ DEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/kth-krb )"
+	krb4? ( app-crypt/kth-krb )
+	sys-devel/autoconf"
 
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-6.2.0-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-kerberos.patch
 }
 
 src_compile() {
+	autoconf
+
 	use amd64 && gnuconfig_update
 
 	local myconf
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch
new file mode 100644
index 000000000000..cdba95285b66
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch
@@ -0,0 +1,25 @@
+--- /tmp/configure.in	2004-02-22 10:23:16.711353561 +0000
++++ configure.in	2004-02-22 10:26:37.916800464 +0000
+@@ -465,15 +465,13 @@
+         else
+           AC_MSG_RESULT([found])
+           ac_krblibs="-lcom_err"
+-           AC_CHECK_LIB(crypto,
+-             krb5_des_string_to_key,
+-             libk5crypto=-lcrypto,
+-                AC_CHECK_LIB(k5crypto,
+-                   krb5_des_string_to_key,
+-                   libk5crypto=-lk5crypto,
+-                      AC_ERROR([Kerberos 5 DES libraries not found]),
+-                   ${LDEFLAGS} ${ac_krblibs}),
+-                 ${LDEFLAGS} ${ac_krblibs})
++           AC_CHECK_LIB(crypto, krb5_des_string_to_key, libk5crypto=-lcrypto,
++             AC_CHECK_LIB(k5crypto, krb5_des_string_to_key, libk5crypto=-lk5crypto,
++               AC_CHECK_LIB(k5crypto, krb5int_des_string_to_key, libk5crypto=-lk5crypto,
++                 AC_ERROR([Kerberos 5 DES libraries not found]),
++               ${LDEFLAGS} ${ac_krblibs}),
++             ${LDEFLAGS} ${ac_krblibs}),
++           ${LDEFLAGS} ${ac_krblibs})
+         fi
+         AC_CHECK_LIB(krb5, krb5_init_context,[],
+            continue,