NetBSD Problem Report #39291
From www@NetBSD.org Tue Aug 5 09:43:52 2008
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by narn.NetBSD.org (Postfix) with ESMTP id 0CF8E63B8A2
for <gnats-bugs@gnats.netbsd.org>; Tue, 5 Aug 2008 09:43:52 +0000 (UTC)
Message-Id: <20080805094351.D584663B853@narn.NetBSD.org>
Date: Tue, 5 Aug 2008 09:43:51 +0000 (UTC)
From: sdrake@ihug.co.nz
Reply-To: sdrake@ihug.co.nz
To: gnats-bugs@NetBSD.org
Subject: junck patchdiff output
X-Send-Pr-Version: www-1.0
>Number: 39291
>Category: pkg
>Synopsis: junck patchdiff output
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: wiz
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Aug 05 09:45:00 +0000 2008
>Closed-Date: Fri Dec 05 06:40:43 +0000 2008
>Last-Modified: Fri Dec 05 06:40:43 +0000 2008
>Originator: Steven Drake
>Release: pkgsrc-2008Q2
>Organization:
>Environment:
Linux idran.drake.org.nz 2.6.26.1 #1 PREEMPT Sun Aug 3 22:31:36 NZST 2008 i686 pentium4 i386 GNU/Linux
>Description:
Package pkgtools/pkgdiff.
After running mkpatches the patchdiff output contains lines showing differences between the patch control/meta line.
I.e. where the timestamps are different (missing in one patch not in the other or differnet timezones) or where one patch was made with the -p patch option and the other wasn't.
>How-To-Repeat:
$ cd devel/cvsgraph
$ make patch
.....
$ mkpathes
$ patchdiff
Comparing patches/patch-aa to work/.newpatches/patch-aa
3,5c3,5
< --- Makefile.in.orig Fri Aug 6 18:30:24 2004
< +++ Makefile.in Fri Aug 6 18:31:18 2004
< @@ -10,6 +10,7 @@
---
> --- Makefile.in.orig 2004-07-15 09:42:58.000000000 +0000
> +++ Makefile.in
> @@ -10,6 +10,7 @@ RM = rm -f
13c13
< @@ -34,7 +35,7 @@
---
> @@ -34,7 +35,7 @@ GENOBJS = $(GENSRCS:.c=.o)
>Fix:
Try this patch.
--- files/patchdiff.pl.orig
+++ files/patchdiff.pl
@@ -98,6 +98,9 @@
$diff=`diff $orig{$patch} $new{$patch}`;
$diff=~s/^\dc\d\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m;
$diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
+ $diff=~s/^\dc\d\n..---.*\n---\n..---.*\n//m;
+ $diff=~s/^[\d,]*c[\d,]*\n.( --- [^ \t\n]*).*\n.( \+\+\+ [^ \t\n]*).*\n.(@@.*@@).*\n---\n.\1.*\n.\2.*\n.\3.*\n//m;
+ $diff=~s/^\d*c\d*\n.( @@.*@@).*\n---\n.\1.*\n//mg;
if ($diff) {
print "Comparing $orig{$patch} to $new{$patch}\n$diff";
}
--
uuencoded version:
begin 644 -
M+2TM(&9I;&5S+W!A=&-H9&EF9BYP;"YO<FEG"BLK*R!F:6QE<R]P871C:&1I
M9F8N<&P*0$`@+3DX+#8@*SDX+#D@0$`*("`@("`@("`D9&EF9CU@9&EF9B`D
M;W)I9WLD<&%T8VA]("1N97=[)'!A=&-H?6`["B`@("`@("`@)&1I9F8]?G,O
M7EQD8UQD7&XN+EPD6TY=971"4T0N*EPD7&XM+2U<;BXN7"1;3EUE=$)31"XJ
M7"1<;B\O;3L*("`@("`@("`D9&EF9CU^<R]>7&1C7&1<;BXN7"M<*UPK+BI<
M;BTM+5QN+BY<*UPK7"LN*EQN+R]M.PHK("`@("`@("1D:69F/7YS+UY<9&-<
M9%QN+BXM+2TN*EQN+2TM7&XN+BTM+2XJ7&XO+VT["BL@("`@("`@)&1I9F8]
M?G,O7EM<9"Q=*F-;7&0L72I<;BXH("TM+2!;7B!<=%QN72HI+BI<;BXH(%PK
M7"M<*R!;7B!<=%QN72HI+BI<;BXH0$`N*D!`*2XJ7&XM+2U<;BY<,2XJ7&XN
M7#(N*EQN+EPS+BI<;B\O;3L**R`@("`@("`D9&EF9CU^<R]>7&0J8UQD*EQN
M+B@@0$`N*D!`*2XJ7&XM+2U<;BY<,2XJ7&XO+VUG.PH@("`@("`@(&EF("@D
M9&EF9BD@>PH@("`@("`@("`@("`@<')I;G0@(D-O;7!A<FEN9R`D;W)I9WLD
K<&%T8VA]('1O("1N97=[)'!A=&-H?5QN)&1I9F8B.PH@("`@("`@('T*"@``
`
end
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->wiz
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Fri, 08 Aug 2008 14:38:44 +0000
Responsible-Changed-Why:
Over to maintainer.
State-Changed-From-To: open->feedback
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Wed, 05 Nov 2008 23:19:27 +0000
State-Changed-Why:
Thanks for the contribution.
In the cases I tried, I didn't see much difference with your regex,
so I came up with some of my own. Please try pkgdiff-0.121 to see them.
In case you have further suggestions, please include samples
of the diffs that are removed for checking. Thank you!
From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/39291 CVS commit: pkgsrc/pkgtools/pkgdiff
Date: Wed, 5 Nov 2008 23:18:18 +0000 (UTC)
Module Name: pkgsrc
Committed By: wiz
Date: Wed Nov 5 23:18:18 UTC 2008
Modified Files:
pkgsrc/pkgtools/pkgdiff: Makefile
pkgsrc/pkgtools/pkgdiff/files: patchdiff.pl
Log Message:
Ignore more uninteresting output.
Tries to address PR 39291.
Welcome to 0.121.
To generate a diff of this commit:
cvs rdiff -r1.65 -r1.66 pkgsrc/pkgtools/pkgdiff/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: feedback->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Fri, 05 Dec 2008 06:40:43 +0000
State-Changed-Why:
Feedback timeout.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.