[Heads up] BSD-licensed patch becoming the default RSN.
Xin Li
delphij at delphij.net
Sun Jul 28 07:08:56 UTC 2013
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On 7/27/13 8:08 AM, Pedro Giffuni wrote:
> OK; On further revision ...
>
> On 26.07.2013 20:01, Jan Beich wrote:
>> bsdpatch doesn't list files of the failed hunks with -C and -s
>> option. This may be less convenient if you edit a patch directly
>> rather than regen it after polluting the tree.
>>
>> $ patch -CEfsp0 -i /path/to/varsym.diff 1 out of 1 hunks failed 1
>> out of 2 hunks failed 2 out of 2 hunks failed 1 out of 5 hunks
>> failed 1 out of 1 hunks failed 1 out of 1 hunks failed 1 out of 1
>> hunks failed zsh: exit 1
>>
>> $ gnupatch -CEfsp0 -i /path/to/varsym.diff 1 out of 1 hunks
>> failed--saving rejects to contrib/openbsm/etc/audit_event.rej 1
>> out of 2 hunks failed--saving rejects to
>> lib/libc/sys/Makefile.inc.rej 2 out of 2 hunks failed--saving
>> rejects to sys/security/audit/audit_private.h.rej 1 out of 5
>> hunks failed--saving rejects to sys/security/audit/audit.h.rej 1
>> out of 1 hunks failed--saving rejects to
>> sys/bsm/audit_kevents.h.rej 1 out of 1 hunks failed--saving
>> rejects to sys/kern/syscalls.master.rej 1 out of 1 hunks
>> failed--saving rejects to sys/sys/priv.h.rej zsh: exit 8
> The change came from OpenBSD, which took it from DragonFlyBSD:
>
> http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/patch/patch.c.diff?r1=1.49;r2=1.50
>
>
>
> It was merged as part of some OpenBSD syncing in patch.c
> http://svnweb.freebsd.org/base?view=revision&revision=246091
Ah, thanks for the detective work.
I think the showing the filename would be more reasonable. How about
this?
Sample output:
[delphij at zeta] /usr/src/usr.bin/patch> patch -RCfs < 1.diff
1 out of 1 hunks failed while patching patch.c
[delphij at zeta] /usr/src> svn diff -x -p usr.bin/patch/
Index: usr.bin/patch/patch.c
===================================================================
- --- usr.bin/patch/patch.c (revision 253736)
+++ usr.bin/patch/patch.c (working copy)
@@ -406,8 +406,8 @@ main(int argc, char *argv[])
say("%d out of %d hunks %s--saving
rejects to %s\n",
failed, hunk, skip_rest_of_patch ?
"ignored" : "failed", rejname);
else
- - say("%d out of %d hunks %s\n",
- - failed, hunk, skip_rest_of_patch ?
"ignored" : "failed");
+ say("%d out of %d hunks %s while
patching %s\n",
+ failed, hunk, skip_rest_of_patch ?
"ignored" : "failed", filearg[0]);
if (!check_only && move_file(TMPREJNAME,
rejname) < 0)
trejkeep = true;
}
Cheers,
-----BEGIN PGP SIGNATURE-----
iQEcBAEBCAAGBQJR9MOIAAoJEG80Jeu8UPuzBu8H/AnbhUFoCDI5WNqXzYNi6is3
t989x+Tg01rI1hWimvWnZOWXVVosIP8JZfFydPhd1FHGZ2mxlB8kCpxAO33fhGkO
90v07+qNpA8fIzxNUtb7fbrzEpILRJ2TxzVEeIRHJ3rNzTFIOpJoII+wNSukD3om
Jl3x2OXv0UL1dCyIgvi7MtpwwllpK9mBuZhjQRQjKzh9k9TYW6n5dLsMIoFfvp4s
syXqxAWNdR+couvE8Q1ia9jKi6veE6UP2U6FT43GHTYym8srzWOj0dAXNjyrWqBr
EVIw4oKS9tPv4OAaDVjYhQJwtBdtmbCW3HVQ1OJ+GvH3IK1JlPzVYmIdQt2SAnQ=
=bU/M
-----END PGP SIGNATURE-----
More information about the freebsd-current
mailing list