Log: Update textproc/kmfl-sil-galatia to 1.03 Removed: files/patch-GrkPolyComp.KMN Added: files/patch-GrkPolyComp103.KMN
Responsible Changed From-To: freebsd-ports-bugs->scheidell I'll take it
State Changed From-To: open->feedback I had two problems with this. #1, the patch to remove files/patch-GrkPolyComp.KMN didn't actually remove the file. #2, the patch for files/patch-GrkPolyComp103.KMN doesn't apply cleanly: http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=8-scheidell_AMD64&id=509#103 could you make sure you update your portstree, verity the patches and resubmit the patch? Thanks.
On 1/13/12 5:49 AM, Nikola Lecic wrote: > As far as I know, patches created with 'cvs diff -Nu' are not supposed > to delete files. They leave files empty and it's up to the committer > My tree is up-to-date and the patch applies cleanly. There is some > lines in the patch that differ from the original only in trailing > spaces; maybe Gnats distorted some characters? Please try this file: GNATS has been known to do that. (and, patch -E will delete empty files), but in the first case, there was a huge *.rej file left over from the PR patch > http://anthesphoria.net/tmp/kmfl-sil-galatia-1.0.3.patch.gz trying now:. must have been GNATS: this patch applies against cvs just fine. running in tinder now. patch -EuIi /tmp/kmfl-sil-galatia-1.0.3.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: Makefile |=================================================================== |RCS file: /home/ncvs/ports/textproc/kmfl-sil-galatia/Makefile,v |retrieving revision 1.5 |diff -u -r1.5 Makefile |--- Makefile 29 May 2011 13:28:24 -0000 1.5 |+++ Makefile 12 Jan 2012 12:53:40 -0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 18. Hunk #3 succeeded at 31. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: distinfo |=================================================================== |RCS file: /home/ncvs/ports/textproc/kmfl-sil-galatia/distinfo,v |retrieving revision 1.2 |diff -u -r1.2 distinfo |--- distinfo 29 May 2011 13:28:24 -0000 1.2 |+++ distinfo 12 Jan 2012 12:35:40 -0000 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-GrkPolyComp.KMN |=================================================================== |RCS file: files/patch-GrkPolyComp.KMN |diff -N files/patch-GrkPolyComp.KMN |--- files/patch-GrkPolyComp.KMN 4 Nov 2009 10:28:43 -0000 1.2 |+++ /dev/null 1 Jan 1970 00:00:00 -0000 -------------------------- Patching file files/patch-GrkPolyComp.KMN using Plan A... Hunk #1 succeeded at 0. Removing files/patch-GrkPolyComp.KMN (empty after patching). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-GrkPolyComp103.KMN |=================================================================== |RCS file: files/patch-GrkPolyComp103.KMN |diff -N files/patch-GrkPolyComp103.KMN |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ files/patch-GrkPolyComp103.KMN 12 Jan 2012 12:48:51 -0000 -------------------------- (Creating file files/patch-GrkPolyComp103.KMN...) Patching file files/patch-GrkPolyComp103.KMN using Plan A... Hunk #1 succeeded at 1. done -- Michael Scheidell, CTO o: 561-999-5000 d: 561-948-2259 >*| *SECNAP Network Security Corporation * Best Mobile Solutions Product of 2011 * Best Intrusion Prevention Product * Hot Company Finalist 2011 * Best Email Security Product * Certified SNORT Integrator
On Fri, Jan 13, 2012 at 03:26:52AM +0000 in <201201130326.q0D3QqJW007471@freefall.freebsd.org> scheidell@FreeBSD.org wrote: > I had two problems with this. > #1, the patch to remove files/patch-GrkPolyComp.KMN didn't actually remove the file. As far as I know, patches created with 'cvs diff -Nu' are not supposed to delete files. They leave files empty and it's up to the committer to remove them from the CVS (and for maintainers to note that in the PR description). The examples of the same practice from my past PRs: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/140239 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/136360 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/127895 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/118272 > #2, the patch for files/patch-GrkPolyComp103.KMN doesn't apply cleanly: > > http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=8-scheidell_AMD64&id=509#103 > > could you make sure you update your portstree, verity the patches and resubmit the patch? My tree is up-to-date and the patch applies cleanly. There is some lines in the patch that differ from the original only in trailing spaces; maybe Gnats distorted some characters? Please try this file: http://anthesphoria.net/tmp/kmfl-sil-galatia-1.0.3.patch.gz Thanks, -- Nikola Lecic fingerprint : FEF3 66AF C90E EDC3 D878 7CDC 956D F4AB A377 1C9B
scheidell 2012-01-13 13:07:48 UTC FreeBSD ports repository Modified files: textproc/kmfl-sil-galatia Makefile distinfo Added files: textproc/kmfl-sil-galatia/files patch-GrkPolyComp103.KMN Removed files: textproc/kmfl-sil-galatia/files patch-GrkPolyComp.KMN Log: - Update to 1.03 PR: ports/164052 Submitted by: nikola.lecic@anthesphoria.net (maintainer) Approved by: gabor (mentor, implicit) Revision Changes Path 1.6 +9 -9 ports/textproc/kmfl-sil-galatia/Makefile 1.3 +2 -2 ports/textproc/kmfl-sil-galatia/distinfo 1.3 +0 -43 ports/textproc/kmfl-sil-galatia/files/patch-GrkPolyComp.KMN (dead) 1.1 +42 -0 ports/textproc/kmfl-sil-galatia/files/patch-GrkPolyComp103.KMN (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, Thanks.