Add fix for gcc-4; thanks to P Nienaber for reporting; bug 127634

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 66 insertions, 11 deletions

diff --git a/net-ftp/yafc/ChangeLog b/net-ftp/yafc/ChangeLog
index 4b3afe66416b..66e145d7408a 100644
--- a/net-ftp/yafc/ChangeLog
+++ b/net-ftp/yafc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/yafc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.19 2006/07/08 14:09:15 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.20 2006/12/09 11:09:28 masterdriverz Exp $
+
+  09 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/yafc-1.1.1-gcc4.patch, yafc-1.1.1.ebuild:
+  Add fix for gcc-4; thanks to P Nienaber for reporting; bug 127634
 
   08 Jul 2006; Lars Weiler <pylon@gentoo.org> yafc-1.1.1.ebuild:
   Stable on ppc; it's better for our default unicode-support.
diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index 2f32d28d0fc5..6cc108cfbd5e 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,3 +1,7 @@
+AUX yafc-1.1.1-gcc4.patch 1029 RMD160 c5e5c33b10111c082cf928d04fcd0e160933ee8f SHA1 4a52a22a643ca4a143bf62260a12ddad73f0c418 SHA256 412c63b5acde59aff3b329005b4e6467bfb3c640ffe42cf457ae23bb635eb582
+MD5 00a0f66a4a9fdec6d7126e054a502074 files/yafc-1.1.1-gcc4.patch 1029
+RMD160 c5e5c33b10111c082cf928d04fcd0e160933ee8f files/yafc-1.1.1-gcc4.patch 1029
+SHA256 412c63b5acde59aff3b329005b4e6467bfb3c640ffe42cf457ae23bb635eb582 files/yafc-1.1.1-gcc4.patch 1029
 DIST yafc-1.0.tar.bz2 441536 RMD160 1d10c4a37e5487343714c72924110756dc0c0d13 SHA1 4ca79e67687267756fd59ab3e2d24b38171b2166 SHA256 eeb60f0b1ef316cdb7ce32a573b9894d9e4df96168d15b8ad028dfa1295ab5fd
 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
@@ -5,18 +9,18 @@ EBUILD yafc-1.0.ebuild 801 RMD160 f43979bf1ee5d1deb9be24c57d1ddc6be0c3607d SHA1
 MD5 44011aac929360f02f786a44321d861a yafc-1.0.ebuild 801
 RMD160 f43979bf1ee5d1deb9be24c57d1ddc6be0c3607d yafc-1.0.ebuild 801
 SHA256 b13e6ed3b116d60423b7de87ef1a44d41f85250d5c31edb3a737c70f4514c49a yafc-1.0.ebuild 801
-EBUILD yafc-1.1.1.ebuild 1320 RMD160 54a0f44192ef479f2a93b8c3c83e4774f2262fdf SHA1 089d19284156ba63aabec8dc133bb0ae996a0e5d SHA256 e4c3321112d1360181183a4eef2a6d943c56bec68426f025865303a2ce1c13d2
-MD5 4c8c2ce516c36cde9f181c6112035f6b yafc-1.1.1.ebuild 1320
-RMD160 54a0f44192ef479f2a93b8c3c83e4774f2262fdf yafc-1.1.1.ebuild 1320
-SHA256 e4c3321112d1360181183a4eef2a6d943c56bec68426f025865303a2ce1c13d2 yafc-1.1.1.ebuild 1320
+EBUILD yafc-1.1.1.ebuild 1404 RMD160 411589f684ca62a7992a5762a5b77bae76498584 SHA1 b4ac8341bde1eb5a0022e9fa819c8f464437229b SHA256 6a6da0f7527c47e52038870256cca24fa994481b736c852d7f5002e4d8483283
+MD5 03d0305e443946ce6efbf3372cd77185 yafc-1.1.1.ebuild 1404
+RMD160 411589f684ca62a7992a5762a5b77bae76498584 yafc-1.1.1.ebuild 1404
+SHA256 6a6da0f7527c47e52038870256cca24fa994481b736c852d7f5002e4d8483283 yafc-1.1.1.ebuild 1404
 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 2184 RMD160 f927e57b3f4de9516fecdbaf8ed60d764dd97784 SHA1 cd15df5d0211fc3f5c0b01d5c58b4922d5504cc2 SHA256 da44e33453f711307f9902f77c9d1f152bafdfdff9269ec8fc7d708d185bb46d
-MD5 7f6588966e8e59e3d9b89ed59a5809c9 ChangeLog 2184
-RMD160 f927e57b3f4de9516fecdbaf8ed60d764dd97784 ChangeLog 2184
-SHA256 da44e33453f711307f9902f77c9d1f152bafdfdff9269ec8fc7d708d185bb46d ChangeLog 2184
+MISC ChangeLog 2371 RMD160 2f076782236f3fac00e345e1816b8a1923fbf8d2 SHA1 80ef1924e9acf6b9b6171e49813f326240aabe71 SHA256 f05852e7d5266108ac440c8da8b5c511b9f4b5711047f5f465ea08543e36924f
+MD5 c094a7c14ae212e1b626c07f43d83c99 ChangeLog 2371
+RMD160 2f076782236f3fac00e345e1816b8a1923fbf8d2 ChangeLog 2371
+SHA256 f05852e7d5266108ac440c8da8b5c511b9f4b5711047f5f465ea08543e36924f ChangeLog 2371
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
diff --git a/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch b/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch
new file mode 100644
index 000000000000..9e0735f32d02
--- /dev/null
+++ b/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch
@@ -0,0 +1,41 @@
+--- lib/krb4.c	2002-12-05 22:12:37.000000000 +0000
++++ lib/krb4.c	2006-12-09 10:49:28.000000000 +0000
+@@ -62,24 +62,6 @@
+ };
+ 
+ static int
+-krb_get_int(void *f, u_int32_t *to, int size, int lsb)
+-{
+-    int i;
+-    unsigned char *from = (unsigned char *)f;
+-
+-    *to = 0;
+-    if(lsb){
+-        for(i = size-1; i >= 0; i--)
+-            *to = (*to << 8) | from[i];
+-    }else{
+-        for(i = 0; i < size; i++)
+-            *to = (*to << 8) | from[i];
+-    }
+-    return size;
+-}
+-
+-
+-static int
+ krb4_check_prot(void *app_data, int level)
+ {
+     if(level == prot_confidential)
+--- lib/gssapi.c	2002-12-05 22:12:36.000000000 +0000
++++ lib/gssapi.c	2006-12-09 10:50:18.000000000 +0000
+@@ -72,11 +72,6 @@
+ static gss_OID_desc gss_c_nt_hostbased_service_oid_desc =
+ {10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"};
+ 
+-static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc;
+-
+-
+-
+-
+ /*RCSID("$Id: gssapi.c,v 1.5 2002/12/05 22:12:36 mhe Exp $");*/
+ 
+ struct gss_data {
diff --git a/net-ftp/yafc/yafc-1.1.1.ebuild b/net-ftp/yafc/yafc-1.1.1.ebuild
index d60d648adbc0..fc29f2b8a1f9 100644
--- a/net-ftp/yafc/yafc-1.1.1.ebuild
+++ b/net-ftp/yafc/yafc-1.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.ebuild,v 1.3 2006/07/08 14:09:15 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1.ebuild,v 1.4 2006/12/09 11:09:28 masterdriverz Exp $
 
-inherit flag-o-matic
+inherit eutils
 
 DESCRIPTION="Console ftp client with a lot of nifty features"
 HOMEPAGE="http://yafc.sourceforge.net/"
@@ -20,6 +20,12 @@ DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )
 RDEPEND=">=net-misc/openssh-3.0
 	${DEPEND}"
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
 src_compile() {
 	local myconf=""
 	use krb4 && myconf="${myconf} --with-krb4=/usr/athena" \