From be4257dd7ca8f8f93e96e029611b18fa15e7be42 Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Wed, 14 Mar 2007 00:36:51 +0000 Subject: [PATCH] Really fix patch this time Package-Manager: portage-2.1.2-r13 --- net-ftp/yafc/ChangeLog | 6 +++++- net-ftp/yafc/Manifest | 16 ++++++++-------- net-ftp/yafc/files/yafc-1.1.1-gcc4.patch | 9 ++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/net-ftp/yafc/ChangeLog b/net-ftp/yafc/ChangeLog index 1727747a8aa7..0c16899167d7 100644 --- a/net-ftp/yafc/ChangeLog +++ b/net-ftp/yafc/ChangeLog @@ -1,6 +1,10 @@ # 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.23 2007/03/12 22:07:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.24 2007/03/14 00:36:51 masterdriverz Exp $ + + 14 Mar 2007; Charlie Shepherd + files/yafc-1.1.1-gcc4.patch: + Really fix patch this time 12 Mar 2007; Raúl Porcel files/yafc-1.1.1-gcc4.patch, yafc-1.1.1.ebuild: diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest index 53a5421bad23..ffc3f11fcdbf 100644 --- a/net-ftp/yafc/Manifest +++ b/net-ftp/yafc/Manifest @@ -1,7 +1,7 @@ -AUX yafc-1.1.1-gcc4.patch 1117 RMD160 0f8adafa3db6b2e2769395986fca5a1425ece490 SHA1 4d35cbe91365c864ff1293a8e101ca191bac48d3 SHA256 0252799e733c0cb75ac9a7a0196e4a8a0003abfe9c60643aed5f7ec069b874c0 -MD5 80bcad4df3671827ce397c89bd67b118 files/yafc-1.1.1-gcc4.patch 1117 -RMD160 0f8adafa3db6b2e2769395986fca5a1425ece490 files/yafc-1.1.1-gcc4.patch 1117 -SHA256 0252799e733c0cb75ac9a7a0196e4a8a0003abfe9c60643aed5f7ec069b874c0 files/yafc-1.1.1-gcc4.patch 1117 +AUX yafc-1.1.1-gcc4.patch 1081 RMD160 3cea1b44478133ceb35cd5d2dc3b3bed75033e32 SHA1 fd4d7adb1d22f65b9f59c23470fb0bf0357ecb0d SHA256 39626a2362432ae7347a9ae3c2e45e0b0bc27594edfe40d24b6f769059d07504 +MD5 28e9a6235e3fa685ffe0f598c13d819f files/yafc-1.1.1-gcc4.patch 1081 +RMD160 3cea1b44478133ceb35cd5d2dc3b3bed75033e32 files/yafc-1.1.1-gcc4.patch 1081 +SHA256 39626a2362432ae7347a9ae3c2e45e0b0bc27594edfe40d24b6f769059d07504 files/yafc-1.1.1-gcc4.patch 1081 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.ebuild 1397 RMD160 9636ee5e0e6da7c2efb8d024681ddc2b64837b0c SHA1 602bac05f326f7e5d670814fd6712d86ed13a255 SHA256 88cd41dd4321118b79641384b106a989f931d894b4a8e0e5e524102aee39ca4b @@ -12,10 +12,10 @@ EBUILD yafc-1.1.ebuild 761 RMD160 7f96b56bb4eb9ae6663479729f122f8e276370d2 SHA1 MD5 e3d6437c17339f807c5e49e94d9b7324 yafc-1.1.ebuild 761 RMD160 7f96b56bb4eb9ae6663479729f122f8e276370d2 yafc-1.1.ebuild 761 SHA256 7d7b0ef45fb17aaf5b2557b1e95117a1a20fa52da7bdcd67c4d251318e79e1a6 yafc-1.1.ebuild 761 -MISC ChangeLog 2766 RMD160 bc172433b8d050b776c4f250ce64ab1cf75318ff SHA1 6d18d70d6525782a25493a67e178545c2f789bc8 SHA256 0f1bc577725f9790760436d5284415e621c674ab78af1ece764bf5320bfdbc65 -MD5 03dca9a7fb2a7172c74b019e28c9a2f3 ChangeLog 2766 -RMD160 bc172433b8d050b776c4f250ce64ab1cf75318ff ChangeLog 2766 -SHA256 0f1bc577725f9790760436d5284415e621c674ab78af1ece764bf5320bfdbc65 ChangeLog 2766 +MISC ChangeLog 2892 RMD160 24eb39a8c7ecd2fbd8558b3b835f5c63bc7fbcc9 SHA1 e15751335d69d479ae286a9cb67a916c982d11de SHA256 cd74c1849f070ab8802354ce02ab22efe145444474917e7b658f49f76f4e2910 +MD5 69a8ee7feab18a589fe1221c9fbd03e4 ChangeLog 2892 +RMD160 24eb39a8c7ecd2fbd8558b3b835f5c63bc7fbcc9 ChangeLog 2892 +SHA256 cd74c1849f070ab8802354ce02ab22efe145444474917e7b658f49f76f4e2910 ChangeLog 2892 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 index 2bf7b454c34c..4054d737c6ee 100644 --- a/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch +++ b/net-ftp/yafc/files/yafc-1.1.1-gcc4.patch @@ -1,17 +1,16 @@ -diff -ur lib/gssapi.c lib/gssapi.c ---- lib/gssapi.c.orig 2007-03-12 22:12:21.000000000 +0100 -+++ lib/gssapi.c 2007-03-12 22:12:36.000000000 +0100 +--- lib/gssapi.c.orig 2007-03-14 00:28:48.000000000 +0000 ++++ lib/gssapi.c 2007-03-14 00:30:13.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 -- 2.26.2