Date: Sat, 29 Jan 2005 15:54:03 +0800 From: sam wun <sam.wun@authtec.com> To: freebsd-pf@freebsd.org, max@love2party.net Subject: rej files Message-ID: <41FB411B.1020904@authtec.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Hi, I download carp patches from http://people.freebsd.org/~mlaier/CARP/20050110-carp.diff <http://people.freebsd.org/%7Emlaier/CARP/20050110-carp.diff>, and applied this patch to 5.3 stable (which I download and extracted with command "cvs co -r RELENG_5 src"). It generates a few rej files. Please see attached file for detail. Thanks Sam [-- Attachment #2 --] Script started on Sat Jan 29 15:50:45 2005 ./ README games/ libexec/ tools/ ../ UPDATING gnu/ release/ typescript COPYRIGHT UPDATING.64BTT include/ rescue/ usr.bin/ CVS/ bin/ installworld_newk* sbin/ usr.sbin/ MAINTAINERS contrib/ installworld_oldk* secure/ Makefile crypto/ kerberos5/ share/ Makefile.inc1 etc/ lib/ sys/ root@gateway [1m[3:50pm][m [/usr/src]# patch -p0 < /usr/local/patches/20050110-carp.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/etc/protocols ./etc/protocols |--- ../dist/etc/protocols Sat Nov 6 20:43:53 2004 |+++ ./etc/protocols Fri Dec 3 21:58:17 2004 -------------------------- Patching file ./etc/protocols using Plan A... Hunk #1 succeeded at 119. Hunk #2 succeeded at 142. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sbin/ifconfig/Makefile ./sbin/ifconfig/Makefile |--- ../dist/sbin/ifconfig/Makefile Thu Dec 9 01:50:11 2004 |+++ ./sbin/ifconfig/Makefile Thu Dec 9 02:35:40 2004 -------------------------- Patching file ./sbin/ifconfig/Makefile using Plan A... Hunk #1 failed at 23. 1 out of 1 hunks failed--saving rejects to ./sbin/ifconfig/Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sbin/ifconfig/ifcarp.c ./sbin/ifconfig/ifcarp.c |--- ../dist/sbin/ifconfig/ifcarp.c Thu Jan 1 01:00:00 1970 |+++ ./sbin/ifconfig/ifcarp.c Fri Dec 10 01:00:07 2004 -------------------------- (Creating file ./sbin/ifconfig/ifcarp.c...) Patching file ./sbin/ifconfig/ifcarp.c 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: -------------------------- |diff -ruP ../dist/sbin/ifconfig/ifpfsync.c ./sbin/ifconfig/ifpfsync.c |--- ../dist/sbin/ifconfig/ifpfsync.c Thu Jan 1 01:00:00 1970 |+++ ./sbin/ifconfig/ifpfsync.c Fri Dec 10 01:00:07 2004 -------------------------- (Creating file ./sbin/ifconfig/ifpfsync.c...) Patching file ./sbin/ifconfig/ifpfsync.c 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: -------------------------- |diff -ruP ../dist/sys/conf/files ./sys/conf/files |--- ../dist/sys/conf/files Mon Jan 10 13:55:45 2005 |+++ ./sys/conf/files Mon Jan 10 16:14:01 2005 -------------------------- Patching file ./sys/conf/files using Plan A... Hunk #1 failed at 279. Hunk #2 failed at 1469. 2 out of 2 hunks failed--saving rejects to ./sys/conf/files.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/conf/options ./sys/conf/options |--- ../dist/sys/conf/options Thu Dec 9 01:50:13 2004 |+++ ./sys/conf/options Thu Dec 9 02:09:53 2004 -------------------------- Patching file ./sys/conf/options using Plan A... Hunk #1 succeeded at 608 (offset 3 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/i386/conf/CARP ./sys/i386/conf/CARP |--- ../dist/sys/i386/conf/CARP Thu Jan 1 01:00:00 1970 |+++ ./sys/i386/conf/CARP Sat Nov 6 20:00:09 2004 -------------------------- (Creating file ./sys/i386/conf/CARP...) Patching file ./sys/i386/conf/CARP 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: -------------------------- |diff -ruP ../dist/sys/net/if.c ./sys/net/if.c |--- ../dist/sys/net/if.c Mon Jan 10 13:57:09 2005 |+++ ./sys/net/if.c Mon Jan 10 16:15:31 2005 -------------------------- Patching file ./sys/net/if.c using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 79 with fuzz 2. Hunk #3 succeeded at 529 (offset -4 lines). Hunk #4 succeeded at 939 (offset -4 lines). Hunk #5 succeeded at 961 (offset -4 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/net/if_ethersubr.c ./sys/net/if_ethersubr.c |--- ../dist/sys/net/if_ethersubr.c Mon Jan 10 13:57:10 2005 |+++ ./sys/net/if_ethersubr.c Mon Jan 10 16:15:32 2005 -------------------------- Patching file ./sys/net/if_ethersubr.c using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 74. Hunk #3 succeeded at 320. Hunk #4 succeeded at 659 (offset 44 lines). Hunk #5 succeeded at 694 (offset 44 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/net/if_media.h ./sys/net/if_media.h |--- ../dist/sys/net/if_media.h Mon Jan 10 13:57:10 2005 |+++ ./sys/net/if_media.h Mon Jan 10 16:15:33 2005 -------------------------- Patching file ./sys/net/if_media.h using Plan A... Hunk #1 succeeded at 227. Hunk #2 succeeded at 304. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/net/if_types.h ./sys/net/if_types.h |--- ../dist/sys/net/if_types.h Mon Jan 10 13:57:11 2005 |+++ ./sys/net/if_types.h Mon Jan 10 16:15:34 2005 -------------------------- Patching file ./sys/net/if_types.h using Plan A... Hunk #1 succeeded at 247. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/net/if_var.h ./sys/net/if_var.h |--- ../dist/sys/net/if_var.h Mon Jan 10 13:57:11 2005 |+++ ./sys/net/if_var.h Mon Jan 10 16:15:34 2005 -------------------------- Patching file ./sys/net/if_var.h using Plan A... Hunk #1 succeeded at 68. Hunk #2 succeeded at 149 (offset 2 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet/if_ether.c ./sys/netinet/if_ether.c |--- ../dist/sys/netinet/if_ether.c Mon Jan 10 13:57:23 2005 |+++ ./sys/netinet/if_ether.c Mon Jan 10 16:15:50 2005 -------------------------- Patching file ./sys/netinet/if_ether.c using Plan A... Hunk #1 succeeded at 39. Hunk #2 succeeded at 68. Hunk #3 succeeded at 550. Hunk #4 succeeded at 569. Hunk #5 succeeded at 601. Hunk #6 succeeded at 727. Hunk #7 succeeded at 754. Hunk #8 succeeded at 892. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet/if_ether.h ./sys/netinet/if_ether.h |--- ../dist/sys/netinet/if_ether.h Mon Jan 10 13:57:23 2005 |+++ ./sys/netinet/if_ether.h Mon Jan 10 16:15:50 2005 -------------------------- Patching file ./sys/netinet/if_ether.h using Plan A... Hunk #1 succeeded at 112. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet/in.h ./sys/netinet/in.h |--- ../dist/sys/netinet/in.h Mon Jan 10 13:57:23 2005 |+++ ./sys/netinet/in.h Mon Jan 10 16:15:50 2005 -------------------------- Patching file ./sys/netinet/in.h using Plan A... Hunk #1 succeeded at 230. Hunk #2 succeeded at 352 (offset -6 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet/in_proto.c ./sys/netinet/in_proto.c |--- ../dist/sys/netinet/in_proto.c Mon Jan 10 13:57:23 2005 |+++ ./sys/netinet/in_proto.c Mon Jan 10 16:15:50 2005 -------------------------- Patching file ./sys/netinet/in_proto.c using Plan A... Hunk #1 succeeded at 36 (offset 1 line). Hunk #2 succeeded at 92 with fuzz 2 (offset 1 line). Hunk #3 failed at 243. Hunk #4 succeeded at 297 with fuzz 1 (offset -5 lines). 1 out of 4 hunks failed--saving rejects to ./sys/netinet/in_proto.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet/ip_carp.c ./sys/netinet/ip_carp.c |--- ../dist/sys/netinet/ip_carp.c Thu Jan 1 01:00:00 1970 |+++ ./sys/netinet/ip_carp.c Fri Dec 3 21:58:18 2004 -------------------------- (Creating file ./sys/netinet/ip_carp.c...) Patching file ./sys/netinet/ip_carp.c 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: -------------------------- |diff -ruP ../dist/sys/netinet/ip_carp.h ./sys/netinet/ip_carp.h |--- ../dist/sys/netinet/ip_carp.h Thu Jan 1 01:00:00 1970 |+++ ./sys/netinet/ip_carp.h Sat Nov 6 18:13:47 2004 -------------------------- (Creating file ./sys/netinet/ip_carp.h...) Patching file ./sys/netinet/ip_carp.h 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: -------------------------- |diff -ruP ../dist/sys/netinet/ip_input.c ./sys/netinet/ip_input.c |--- ../dist/sys/netinet/ip_input.c Mon Jan 10 13:57:24 2005 |+++ ./sys/netinet/ip_input.c Mon Jan 10 16:15:52 2005 -------------------------- Patching file ./sys/netinet/ip_input.c using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 67. Hunk #3 succeeded at 513. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/in6.c ./sys/netinet6/in6.c |--- ../dist/sys/netinet6/in6.c Mon Jan 10 13:57:27 2005 |+++ ./sys/netinet6/in6.c Mon Jan 10 16:15:54 2005 -------------------------- Patching file ./sys/netinet6/in6.c using Plan A... Hunk #1 succeeded at 206. Hunk #2 succeeded at 226. Hunk #3 succeeded at 1549. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/in6_ifattach.c ./sys/netinet6/in6_ifattach.c |--- ../dist/sys/netinet6/in6_ifattach.c Mon Jan 10 13:57:27 2005 |+++ ./sys/netinet6/in6_ifattach.c Mon Jan 10 16:15:55 2005 -------------------------- Patching file ./sys/netinet6/in6_ifattach.c using Plan A... Hunk #1 succeeded at 671. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/in6_proto.c ./sys/netinet6/in6_proto.c |--- ../dist/sys/netinet6/in6_proto.c Mon Jan 10 13:57:27 2005 |+++ ./sys/netinet6/in6_proto.c Mon Jan 10 16:15:55 2005 -------------------------- Patching file ./sys/netinet6/in6_proto.c using Plan A... Hunk #1 succeeded at 64. Hunk #2 succeeded at 122. Hunk #3 succeeded at 246. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/in6_var.h ./sys/netinet6/in6_var.h |--- ../dist/sys/netinet6/in6_var.h Mon Jan 10 13:57:27 2005 |+++ ./sys/netinet6/in6_var.h Mon Jan 10 16:15:55 2005 -------------------------- Patching file ./sys/netinet6/in6_var.h using Plan A... Hunk #1 succeeded at 578. Hunk #2 succeeded at 606. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/nd6.c ./sys/netinet6/nd6.c |--- ../dist/sys/netinet6/nd6.c Mon Jan 10 13:57:29 2005 |+++ ./sys/netinet6/nd6.c Mon Jan 10 16:15:57 2005 -------------------------- Patching file ./sys/netinet6/nd6.c using Plan A... Hunk #1 succeeded at 2025. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/netinet6/nd6_nbr.c ./sys/netinet6/nd6_nbr.c |--- ../dist/sys/netinet6/nd6_nbr.c Mon Jan 10 13:57:29 2005 |+++ ./sys/netinet6/nd6_nbr.c Mon Jan 10 16:15:57 2005 -------------------------- Patching file ./sys/netinet6/nd6_nbr.c using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 61. Hunk #3 succeeded at 100. Hunk #4 succeeded at 199. Hunk #5 succeeded at 901. Hunk #6 succeeded at 962. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/sys/sys/mbuf.h ./sys/sys/mbuf.h |--- ../dist/sys/sys/mbuf.h Thu Dec 9 01:50:39 2004 |+++ ./sys/sys/mbuf.h Thu Dec 9 02:10:17 2004 -------------------------- Patching file ./sys/sys/mbuf.h using Plan A... Hunk #1 succeeded at 643 (offset -1 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/usr.bin/netstat/inet.c ./usr.bin/netstat/inet.c |--- ../dist/usr.bin/netstat/inet.c Sat Nov 6 21:03:43 2004 |+++ ./usr.bin/netstat/inet.c Fri Dec 3 21:58:18 2004 -------------------------- Patching file ./usr.bin/netstat/inet.c using Plan A... Hunk #1 succeeded at 51. Hunk #2 succeeded at 524. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/usr.bin/netstat/main.c ./usr.bin/netstat/main.c |--- ../dist/usr.bin/netstat/main.c Mon Jan 10 13:57:57 2005 |+++ ./usr.bin/netstat/main.c Mon Jan 10 16:16:24 2005 -------------------------- Patching file ./usr.bin/netstat/main.c using Plan A... Hunk #1 succeeded at 136. Hunk #2 succeeded at 173. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruP ../dist/usr.bin/netstat/netstat.h ./usr.bin/netstat/netstat.h |--- ../dist/usr.bin/netstat/netstat.h Sat Nov 6 21:03:44 2004 |+++ ./usr.bin/netstat/netstat.h Sat Nov 6 18:13:49 2004 -------------------------- Patching file ./usr.bin/netstat/netstat.h using Plan A... Hunk #1 succeeded at 71. done root@gateway [1m[3:50pm][m [/usr/src]# exit exit Script done on Sat Jan 29 15:51:01 2005
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41FB411B.1020904>