I believe you have a stale file somewhere. We are not patching ip_input.c on RELENG_6_1.
Scott On 1/11/07, Angelo Turetta <[EMAIL PROTECTED]> wrote:
I'm experimenting with RELENG_1/FreeBSD-RELENG_6, and I noticed a couple patches fail (error excerpt at the bottom) I'm a little paranoid about error-less builds, so please accept the attached patch that fixes the failures (you need to apply from /home/pfsense/tools) Angelo. ======================================= error log -------------------------- |Index: dev/ral/if_ral.c |=================================================================== |RCS file: /home/ncvs/src/sys/dev/ral/Attic/if_ral.c,v |retrieving revision 1.10.2.7 |diff -u -r1.10.2.7 if_ral.c |--- dev/ral/if_ral.c 25 Feb 2006 00:50:19 -0000 1.10.2.7 |+++ dev/ral/if_ral.c 3 Jun 2006 20:19:06 -0000 -------------------------- No file to patch. Skipping... Hunk #1 ignored at 1517. Hunk #2 ignored at 2109. Hunk #3 ignored at 2145. (...) Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: net/bpf.h |=================================================================== |RCS file: /home/ncvs/src/sys/net/bpf.h,v |retrieving revision 1.39.2.1 |diff -u -r1.39.2.1 bpf.h |--- net/bpf.h 29 Sep 2005 23:48:04 -0000 1.39.2.1 |+++ net/bpf.h 3 Jun 2006 21:30:52 -0000 -------------------------- Patching file net/bpf.h using Plan A... Hunk #1 failed at 34. Hunk #2 succeeded at 615 (offset 12 lines). Hunk #3 succeeded at 638 (offset 12 lines). 1 out of 3 hunks failed--saving rejects to net/bpf.h.rej (.....) Patching ip_input.c.diff ./cvsup_current: cannot open /home/pfsense/tools/patches/RELENG_6/ip_input.c.diff: No such file or directory --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
