Fix gcc4 patch

Package-Manager: portage-2.1.2_rc3-r1

diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index 6cc108cfbd5eb790166e5a40bd723b5c08391094..d5ddd66db6bbc656ef66e03c3ba2fa910fef86cb 100644 (file)
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,7 +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
+AUX yafc-1.1.1-gcc4.patch 1111 RMD160 214508c755f01cfb5ccf3fc3f22ab15456e77e53 SHA1 5f7cbaf8cf65eff226cfa17cbe34609aeea25d75 SHA256 65128d99077b029d32b966095f1969647b0924bc9c61111f1efd65ec822fa26b
+MD5 683d646aa781455ff5206dd1cd495c46 files/yafc-1.1.1-gcc4.patch 1111
+RMD160 214508c755f01cfb5ccf3fc3f22ab15456e77e53 files/yafc-1.1.1-gcc4.patch 1111
+SHA256 65128d99077b029d32b966095f1969647b0924bc9c61111f1efd65ec822fa26b files/yafc-1.1.1-gcc4.patch 1111
 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

diff --git a/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch b/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch
index 9e0735f32d0210b903586d36b2b0b0a165427eb2..a6b8da8164406884fe3733f69c683e4d7f320b0a 100644 (file)
--- a/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch
+++ b/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch
@@ -1,5 +1,21 @@
+diff -ur lib/gssapi.c lib/gssapi.c
+--- lib/gssapi.c       2002-12-05 22:12:36.000000000 +0000
++++ lib/gssapi.c       2006-12-16 13:24:24.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 -ur lib/krb4.c /tmp/yafc-1.1.1/lib/krb4.c
 --- lib/krb4.c 2002-12-05 22:12:37.000000000 +0000
-+++ lib/krb4.c 2006-12-09 10:49:28.000000000 +0000
++++ lib/krb4.c 2006-12-16 13:23:46.000000000 +0000
 @@ -62,24 +62,6 @@
  };
  
@@ -25,17 +41,3 @@
  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 {