Date: Sat, 27 Jul 2013 10:08:17 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Jan Beich <jbeich@tormail.org> Cc: FreeBSD Current <freebsd-current@freebsd.org>, Xin Li <delphij@delphij.net> Subject: Re: [Heads up] BSD-licensed patch becoming the default RSN. Message-ID: <51F3E261.9090903@FreeBSD.org> In-Reply-To: <1V2ssp-000Nrk-Q8@internal.tormail.org> References: <51F2E627.9090907@FreeBSD.org> <1V2ssp-000Nrk-Q8@internal.tormail.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 Cheers, Pedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51F3E261.9090903>