Apply patch for heimdal fix, Bug #113052 --- thanks to jmbsvicetto (Jorge M.

B. S. Vicetto).
Package-Manager: portage-2.1.3.9

4 files changed, 54 insertions, 21 deletions

diff --git a/net-ftp/yafc/ChangeLog b/net-ftp/yafc/ChangeLog
index 1ec835c106ed..4c669651fc01 100644
--- a/net-ftp/yafc/ChangeLog
+++ b/net-ftp/yafc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/yafc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.32 2007/06/19 13:28:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.33 2007/09/23 15:32:56 fmccor Exp $
+
+  23 Sep 2007; Ferris McCormick <fmccor@gentoo.org>
+  +files/yafc-1.1.1-heimdal_gssapi_fix.patch, yafc-1.1.1-r1.ebuild:
+  Apply patch for heimdal fix, Bug #113052 --- thanks to jmbsvicetto (Jorge M.
+  B. S. Vicetto).
 
   19 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> yafc-1.1.1-r1.ebuild:
   Stable on sparc wrt #173646
diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index cfce4c7f08fe..987be50bccad 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX yafc-1.1.1-gcc4.patch 1059 RMD160 b7e5b088236c9fa587e42ab17e9d8abb9db43f16 SHA1 17215e5bb968d0d10ca590faff93cef87c81d2da SHA256 1b58aa3f23e4255265955c3ed96cb2fdcde34624ae52dc25646d60cf5006f9ce
 MD5 ac0ed9a84bc4fe0dd9c83fbff5ed8c8a files/yafc-1.1.1-gcc4.patch 1059
 RMD160 b7e5b088236c9fa587e42ab17e9d8abb9db43f16 files/yafc-1.1.1-gcc4.patch 1059
 SHA256 1b58aa3f23e4255265955c3ed96cb2fdcde34624ae52dc25646d60cf5006f9ce files/yafc-1.1.1-gcc4.patch 1059
+AUX yafc-1.1.1-heimdal_gssapi_fix.patch 1030 RMD160 60ee14973731048e0f376e0c5655d61ae9495563 SHA1 9fdf8abc123d944c905e0ae54255b4527cd66809 SHA256 8b3e1ccd89345089bc8ae2233ca3cbae0dcb570a6ba8ec5738f6d5657901a530
+MD5 e6cb34cab828ee7de3588c2654e0a06d files/yafc-1.1.1-heimdal_gssapi_fix.patch 1030
+RMD160 60ee14973731048e0f376e0c5655d61ae9495563 files/yafc-1.1.1-heimdal_gssapi_fix.patch 1030
+SHA256 8b3e1ccd89345089bc8ae2233ca3cbae0dcb570a6ba8ec5738f6d5657901a530 files/yafc-1.1.1-heimdal_gssapi_fix.patch 1030
 DIST yafc-1.1.1.tar.bz2 858991 RMD160 1a1af7f618e9fada90b23390e64ec0ee4c8ed370 SHA1 d88132e1b389d74533f9eaa94f1a6d02787c03c8 SHA256 ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6
 DIST yafc-1.1.tar.bz2 463528 RMD160 7db932512d818316623fcd732cea4a7a1f3195cc SHA1 982510548434ea4d4f659ebb0ea2dae3b2f29533 SHA256 5eb28b04f2e3166bddc2b3555d7e316278b0405c36284bec07a0c008ca7e94f5
-EBUILD yafc-1.1.1-r1.ebuild 1268 RMD160 bb775fa7a1cf5a36a9e6e0c0ad956fb67fb28165 SHA1 42e5152ec9c314eeda955bb6a473d26fbb9e91b9 SHA256 7aa4dce5f3ab2ca97b6b49473de9121c9ec5f570fced72db5a78ec46c2b5c6fb
-MD5 6258cbd3b3c37a6cb52007a5b7a39cc0 yafc-1.1.1-r1.ebuild 1268
-RMD160 bb775fa7a1cf5a36a9e6e0c0ad956fb67fb28165 yafc-1.1.1-r1.ebuild 1268
-SHA256 7aa4dce5f3ab2ca97b6b49473de9121c9ec5f570fced72db5a78ec46c2b5c6fb yafc-1.1.1-r1.ebuild 1268
+EBUILD yafc-1.1.1-r1.ebuild 1355 RMD160 f2e91e587a520dfd54d57676c26f29d94c89ad14 SHA1 132d79a6c0364ce5e13d9624fd4de896f13b265f SHA256 57e91cd2fe7d0ff14cf667a709df532af539ce51dda0ec1cabd3b8864c42c29d
+MD5 0bd1fc0cb622fd67a4623cb7a8125c0a yafc-1.1.1-r1.ebuild 1355
+RMD160 f2e91e587a520dfd54d57676c26f29d94c89ad14 yafc-1.1.1-r1.ebuild 1355
+SHA256 57e91cd2fe7d0ff14cf667a709df532af539ce51dda0ec1cabd3b8864c42c29d yafc-1.1.1-r1.ebuild 1355
 EBUILD yafc-1.1.ebuild 761 RMD160 7f96b56bb4eb9ae6663479729f122f8e276370d2 SHA1 3bdeb242671942eb3cd592d2e7cc391f2f4f29b0 SHA256 7d7b0ef45fb17aaf5b2557b1e95117a1a20fa52da7bdcd67c4d251318e79e1a6
 MD5 e3d6437c17339f807c5e49e94d9b7324 yafc-1.1.ebuild 761
 RMD160 7f96b56bb4eb9ae6663479729f122f8e276370d2 yafc-1.1.ebuild 761
 SHA256 7d7b0ef45fb17aaf5b2557b1e95117a1a20fa52da7bdcd67c4d251318e79e1a6 yafc-1.1.ebuild 761
-MISC ChangeLog 3859 RMD160 7f11a9f5168be435164abd223c146754a265fce0 SHA1 115c97fbcbce45cb766f8af6fd2caac967814b76 SHA256 abe13d377351f39fba5eb76fe51505c9caaab33b7beb46c9d2cc98656d7c9119
-MD5 3429b7c9c42300654ed8751215c4e1bd ChangeLog 3859
-RMD160 7f11a9f5168be435164abd223c146754a265fce0 ChangeLog 3859
-SHA256 abe13d377351f39fba5eb76fe51505c9caaab33b7beb46c9d2cc98656d7c9119 ChangeLog 3859
+MISC ChangeLog 4075 RMD160 b1ad5423b93e9331fdff3df024fbfb650ad11776 SHA1 83469896446aa97a5ff1e86a15209e148e7e1f1a SHA256 d754daa709748530f90a20562c2fdfecb20e4ae61ab8d4a0004813e04e69d27f
+MD5 99dba45a68cc6b6d89a9716191771a50 ChangeLog 4075
+RMD160 b1ad5423b93e9331fdff3df024fbfb650ad11776 ChangeLog 4075
+SHA256 d754daa709748530f90a20562c2fdfecb20e4ae61ab8d4a0004813e04e69d27f ChangeLog 4075
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -29,10 +30,3 @@ SHA256 eaf8eafa6f122f5dec9ffca188eb7d87df9feebe357599bb4e9f93dae8092895 files/di
 MD5 3ee2e68447905fa413d245081d46858d files/digest-yafc-1.1.1-r1 235
 RMD160 6b75ac71be32473dded249d37208455373d43376 files/digest-yafc-1.1.1-r1 235
 SHA256 5563b99056b271620a14ac46bf8a37fc58814c2e797b9314383365a7e8e87b52 files/digest-yafc-1.1.1-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGd9nsKRy60XGEcJIRAse9AKCFTuHUppiEiWI5nZyA1t3IkA4JIwCfcX4M
-X6D5GLdJW2x3p//ZYZlWugc=
-=3lAb
------END PGP SIGNATURE-----
diff --git a/net-ftp/yafc/files/yafc-1.1.1-heimdal_gssapi_fix.patch b/net-ftp/yafc/files/yafc-1.1.1-heimdal_gssapi_fix.patch
new file mode 100644
index 000000000000..f6e35a8dcfec
--- /dev/null
+++ b/net-ftp/yafc/files/yafc-1.1.1-heimdal_gssapi_fix.patch
@@ -0,0 +1,30 @@
+diff -udNr yafc-1.1.1/cf/kerberos.m4 yafc-1.1.1-r1/cf/kerberos.m4
+--- yafc-1.1.1/cf/kerberos.m4	2002-12-05 17:10:55.000000000 -0500
++++ yafc-1.1.1-r1/cf/kerberos.m4	2005-11-20 02:26:35.000000000 -0500
+@@ -285,6 +285,10 @@
+           [
+ #include <gssapi/gssapi.h>
+           ])
++		AC_CHECK_HEADERS([gssapi/krb5_err.h],,,
++		  [
++#include <gssapi/krb5_err.h>
++		  ])
+       fi
+     fi
+     if test "$yafc_found_gssapi_inc" = "yes"; then
+diff -udNr yafc-1.1.1/lib/gssapi.c yafc-1.1.1-r1/lib/gssapi.c
+--- yafc-1.1.1/lib/gssapi.c	2005-11-20 02:30:15.375703984 -0500
++++ yafc-1.1.1-r1/lib/gssapi.c	2005-11-20 02:29:43.000000000 -0500
+@@ -51,6 +51,12 @@
+ # if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+ #   include <gssapi/gssapi_krb5.h>
+ # endif
++ /* This is needed in Gentoo's Heimdal install which correctly creates
++  * symlinks to match MIT's distribution locations for gssapi/*.h
++  */
++# if defined(HAVE_GSSAPI_KRB5_ERR_H)
++#   include <gssapi/krb5_err.h>
++# endif
+ #else
+ # error "Need gssapi.h from either Heimdal or MIT krb5"
+ #endif
diff --git a/net-ftp/yafc/yafc-1.1.1-r1.ebuild b/net-ftp/yafc/yafc-1.1.1-r1.ebuild
index 0a07d7920363..916643f5e776 100644
--- a/net-ftp/yafc/yafc-1.1.1-r1.ebuild
+++ b/net-ftp/yafc/yafc-1.1.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1-r1.ebuild,v 1.5 2007/06/19 13:28:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1-r1.ebuild,v 1.6 2007/09/23 15:32:56 fmccor Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Console ftp client with a lot of nifty features"
 HOMEPAGE="http://yafc.sourceforge.net/"
@@ -23,6 +23,10 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch ${FILESDIR}/${P}-heimdal_gssapi_fix.patch
+
+	AT_M4DIR="cf"
+	eautoreconf
 }
 
 src_compile() {