On 25.10.2007, Darren Reed wrote: > Please try the attached patch. #pwd /var/tmp ls ip_* ip_filter4.1.28 #patch <28a.patch all patches failed... ++++ Script started on Mon Oct 29 17:29:30 2007 release# popdwd[Katch -p4 < ip_fil_freebsd.c.patch[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K[K <28a.patch Hmm... Looks like a context diff to me... The text leading up to this was: -------------------------- |Only in ip_fil4.1.28a/BSD: NetBSD-4.99.33-i386 |Only in ip_fil4.1.28a/BSD: tools |diff -cr ip_fil4.1.28/fil.c ip_fil4.1.28a/fil.c |*** ip_fil4.1.28/fil.c Wed Oct 10 02:27:20 2007 |--- ip_fil4.1.28a/fil.c Sat Oct 20 22:30:01 2007 -------------------------- Patching file ip_fil4.1.28/fil.c using Plan A... (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #1 failed at 7019. Hunk #2 failed at 7034. Hunk #3 failed at 7176. Hunk #4 failed at 7183. 4 out of 4 hunks failed--saving rejects to ip_fil4.1.28/fil.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |diff -cr ip_fil4.1.28/ip_fil_freebsd.c ip_fil4.1.28a/ip_fil_freebsd.c |*** ip_fil4.1.28/ip_fil_freebsd.c Thu Sep 20 05:51:50 2007 |--- ip_fil4.1.28a/ip_fil_freebsd.c Sat Oct 20 22:29:37 2007 -------------------------- Patching file ip_fil4.1.28/ip_fil_freebsd.c using Plan A... (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #1 failed at 345. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/ip_fil_freebsd.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |diff -cr ip_fil4.1.28/ip_fil_netbsd.c ip_fil4.1.28a/ip_fil_netbsd.c |*** ip_fil4.1.28/ip_fil_netbsd.c Sat Sep 15 20:33:58 2007 |--- ip_fil4.1.28a/ip_fil_netbsd.c Sat Oct 20 22:52:03 2007 -------------------------- Patching file ip_fil4.1.28/ip_fil_netbsd.c using Plan A... (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #1 failed at 406. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/ip_fil_netbsd.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |diff -cr ip_fil4.1.28/ip_nat.c ip_fil4.1.28a/ip_nat.c |*** ip_fil4.1.28/ip_nat.c Tue Oct 16 03:08:10 2007 |--- ip_fil4.1.28a/ip_nat.c Sat Oct 20 22:48:19 2007 -------------------------- Patching file ip_fil4.1.28/ip_nat.c using Plan A... Hunk #1 failed at 187. (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #2 failed at 817. Hunk #3 failed at 888. Hunk #4 failed at 1190. Hunk #5 failed at 1201. Hunk #6 failed at 1213. Hunk #7 failed at 1229. Hunk #8 failed at 1247. Hunk #9 failed at 1267. Hunk #10 failed at 1287. Hunk #11 failed at 1361. 11 out of 11 hunks failed--saving rejects to ip_fil4.1.28/ip_nat.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |diff -cr ip_fil4.1.28/ip_pool.c ip_fil4.1.28a/ip_pool.c |*** ip_fil4.1.28/ip_pool.c Wed Oct 10 02:45:37 2007 |--- ip_fil4.1.28a/ip_pool.c Wed Oct 24 19:59:13 2007 -------------------------- Patching file ip_fil4.1.28/ip_pool.c using Plan A... Hunk #1 failed at 977. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/ip_pool.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |Only in ip_fil4.1.28a: ip_rules.h |diff -cr ip_fil4.1.28/ip_state.c ip_fil4.1.28a/ip_state.c |*** ip_fil4.1.28/ip_state.c Tue Oct 16 02:33:23 2007 |--- ip_fil4.1.28a/ip_state.c Sat Oct 20 22:47:57 2007 -------------------------- Patching file ip_fil4.1.28/ip_state.c using Plan A... (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #1 failed at 653. Hunk #2 failed at 672. Hunk #3 failed at 683. 3 out of 3 hunks failed--saving rejects to ip_fil4.1.28/ip_state.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |Only in ip_fil4.1.28a: ipf |Only in ip_fil4.1.28a: ipftest |Only in ip_fil4.1.28a: ipmon |Only in ip_fil4.1.28a: ipnat |Only in ip_fil4.1.28a: ippool |Only in ip_fil4.1.28a: ipscan |Only in ip_fil4.1.28a: ipsyncm |Only in ip_fil4.1.28a: ipsyncs |diff -cr ip_fil4.1.28/lib/getproto.c ip_fil4.1.28a/lib/getproto.c |*** ip_fil4.1.28/lib/getproto.c Fri Jun 16 10:21:00 2006 |--- ip_fil4.1.28a/lib/getproto.c Sat Oct 20 22:59:02 2007 -------------------------- Patching file ip_fil4.1.28/lib/getproto.c using Plan A... Hunk #1 failed at 23. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/lib/getproto.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |diff -cr ip_fil4.1.28/lib/printproto.c ip_fil4.1.28a/lib/printproto.c |*** ip_fil4.1.28/lib/printproto.c Fri Jun 16 10:21:14 2006 |--- ip_fil4.1.28a/lib/printproto.c Sat Oct 20 22:59:49 2007 -------------------------- Patching file ip_fil4.1.28/lib/printproto.c using Plan A... Hunk #1 failed at 29. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/lib/printproto.c.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |Only in ip_fil4.1.28a/net: done |Only in ip_fil4.1.28a/net: radix_ipf.h |Only in ip_fil4.1.28a/netinet: bpf-ipf.h |Only in ip_fil4.1.28a/netinet: done |Only in ip_fil4.1.28a/netinet: ip_auth.h |Only in ip_fil4.1.28a/netinet: ip_compat.h |Only in ip_fil4.1.28a/netinet: ip_fil.h |Only in ip_fil4.1.28a/netinet: ip_frag.h |Only in ip_fil4.1.28a/netinet: ip_ftp_pxy.c |Only in ip_fil4.1.28a/netinet: ip_h323_pxy.c |Only in ip_fil4.1.28a/netinet: ip_htable.h |Only in ip_fil4.1.28a/netinet: ip_ipsec_pxy.c |Only in ip_fil4.1.28a/netinet: ip_irc_pxy.c |Only in ip_fil4.1.28a/netinet: ip_lookup.h |Only in ip_fil4.1.28a/netinet: ip_nat.h |Only in ip_fil4.1.28a/netinet: ip_netbios_pxy.c |Only in ip_fil4.1.28a/netinet: ip_pool.h |Only in ip_fil4.1.28a/netinet: ip_pptp_pxy.c |Only in ip_fil4.1.28a/netinet: ip_proxy.h |Only in ip_fil4.1.28a/netinet: ip_raudio_pxy.c |Only in ip_fil4.1.28a/netinet: ip_rcmd_pxy.c |Only in ip_fil4.1.28a/netinet: ip_rpcb_pxy.c |Only in ip_fil4.1.28a/netinet: ip_rules.h |Only in ip_fil4.1.28a/netinet: ip_scan.h |Only in ip_fil4.1.28a/netinet: ip_state.h |Only in ip_fil4.1.28a/netinet: ip_sync.h |Only in ip_fil4.1.28a/netinet: ipf.h |Only in ip_fil4.1.28a/netinet: ipl.h |Only in ip_fil4.1.28a/netinet: ipmon.h |Only in ip_fil4.1.28a/netinet: ipt.h |Only in ip_fil4.1.28a/netinet: kmem.h |Only in ip_fil4.1.28a/netinet: linux.h |Only in ip_fil4.1.28a/netinet: md5.h |Only in ip_fil4.1.28a/netinet: opts.h |Only in ip_fil4.1.28a/netinet: pcap-ipf.h |Only in ip_fil4.1.28a/netinet: radix_ipf.h |Only in ip_fil4.1.28a/netinet: snoop.h |Only in ip_fil4.1.28a/netinet: tcpip.h |Only in ip_fil4.1.28a/test/expected: i19 |Only in ip_fil4.1.28a/test: f1 |Only in ip_fil4.1.28a/test: f10 |Only in ip_fil4.1.28a/test: f11 |Only in ip_fil4.1.28a/test: f12 |Only in ip_fil4.1.28a/test: f13 |Only in ip_fil4.1.28a/test: f14 |Only in ip_fil4.1.28a/test: f15 |Only in ip_fil4.1.28a/test: f16 |Only in ip_fil4.1.28a/test: f17 |Only in ip_fil4.1.28a/test: f18 |Only in ip_fil4.1.28a/test: f19 |Only in ip_fil4.1.28a/test: f2 |Only in ip_fil4.1.28a/test: f20 |Only in ip_fil4.1.28a/test: f24 |Only in ip_fil4.1.28a/test: f3 |Only in ip_fil4.1.28a/test: f4 |Only in ip_fil4.1.28a/test: f5 |Only in ip_fil4.1.28a/test: f6 |Only in ip_fil4.1.28a/test: f7 |Only in ip_fil4.1.28a/test: f8 |Only in ip_fil4.1.28a/test: f9 |Only in ip_fil4.1.28a/test: i1 |Only in ip_fil4.1.28a/test: i10 |Only in ip_fil4.1.28a/test: i11 |Only in ip_fil4.1.28a/test: i12 |Only in ip_fil4.1.28a/test: i13 |Only in ip_fil4.1.28a/test: i14 |Only in ip_fil4.1.28a/test: i15 |Only in ip_fil4.1.28a/test: i16 |Only in ip_fil4.1.28a/test: i17 |Only in ip_fil4.1.28a/test: i18 |Only in ip_fil4.1.28a/test: i19 |Only in ip_fil4.1.28a/test: i2 |Only in ip_fil4.1.28a/test: i20 |Only in ip_fil4.1.28a/test: i21 |Only in ip_fil4.1.28a/test: i3 |Only in ip_fil4.1.28a/test: i4 |Only in ip_fil4.1.28a/test: i5 |Only in ip_fil4.1.28a/test: i6 |Only in ip_fil4.1.28a/test: i7 |Only in ip_fil4.1.28a/test: i8 |Only in ip_fil4.1.28a/test: i9 |Only in ip_fil4.1.28a/test: in1 |Only in ip_fil4.1.28a/test: in2 |Only in ip_fil4.1.28a/test: in3 |Only in ip_fil4.1.28a/test: in4 |Only in ip_fil4.1.28a/test: in5 |Only in ip_fil4.1.28a/test: in6 |diff -cr ip_fil4.1.28/test/input/n9 ip_fil4.1.28a/test/input/n9 |*** ip_fil4.1.28/test/input/n9 Mon May 17 08:46:32 2004 |--- ip_fil4.1.28a/test/input/n9 Sat Oct 20 22:56:06 2007 -------------------------- Patching file ip_fil4.1.28/test/input/n9 using Plan A... Hunk #1 failed at 1. (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #2 failed at 7. Hunk #3 failed at 15. Hunk #4 failed at 23. 4 out of 4 hunks failed--saving rejects to ip_fil4.1.28/test/input/n9.rej Hmm... The next patch looks like a context diff to me... The text leading up to this was: -------------------------- |Only in ip_fil4.1.28a/test: ip1 |Only in ip_fil4.1.28a/test: ip2 |Only in ip_fil4.1.28a/test: ipf5 |Only in ip_fil4.1.28a/test: ipv6.1 |Only in ip_fil4.1.28a/test: ipv6.2 |Only in ip_fil4.1.28a/test: ipv6.3 |Only in ip_fil4.1.28a/test: ipv6.5 |Only in ip_fil4.1.28a/test: ipv6.6 |Only in ip_fil4.1.28a/test: l1 |Only in ip_fil4.1.28a/test: n1 |Only in ip_fil4.1.28a/test: n10 |Only in ip_fil4.1.28a/test: n11 |Only in ip_fil4.1.28a/test: n12 |Only in ip_fil4.1.28a/test: n13 |Only in ip_fil4.1.28a/test: n14 |Only in ip_fil4.1.28a/test: n16 |Only in ip_fil4.1.28a/test: n2 |Only in ip_fil4.1.28a/test: n3 |Only in ip_fil4.1.28a/test: n4 |Only in ip_fil4.1.28a/test: n5 |Only in ip_fil4.1.28a/test: n6 |Only in ip_fil4.1.28a/test: n7 |Only in ip_fil4.1.28a/test: n8 |Only in ip_fil4.1.28a/test: n9 |Only in ip_fil4.1.28a/test: ni1 |Only in ip_fil4.1.28a/test: ni10 |Only in ip_fil4.1.28a/test: ni11 |Only in ip_fil4.1.28a/test: ni12 |Only in ip_fil4.1.28a/test: ni13 |Only in ip_fil4.1.28a/test: ni14 |Only in ip_fil4.1.28a/test: ni15 |Only in ip_fil4.1.28a/test: ni16 |Only in ip_fil4.1.28a/test: ni19 |Only in ip_fil4.1.28a/test: ni2 |Only in ip_fil4.1.28a/test: ni20 |Only in ip_fil4.1.28a/test: ni21 |Only in ip_fil4.1.28a/test: ni23 |Only in ip_fil4.1.28a/test: ni3 |Only in ip_fil4.1.28a/test: ni4 |Only in ip_fil4.1.28a/test: ni5 |Only in ip_fil4.1.28a/test: ni6 |Only in ip_fil4.1.28a/test: ni7 |Only in ip_fil4.1.28a/test: ni8 |Only in ip_fil4.1.28a/test: ni9 |Only in ip_fil4.1.28a/test: p1 |Only in ip_fil4.1.28a/test: p2 |Only in ip_fil4.1.28a/test: p3 |Only in ip_fil4.1.28a/test: p5 |Only in ip_fil4.1.28a/test: results |diff -cr ip_fil4.1.28/tools/ipmon.c ip_fil4.1.28a/tools/ipmon.c |*** ip_fil4.1.28/tools/ipmon.c Thu Sep 20 05:51:56 2007 |--- ip_fil4.1.28a/tools/ipmon.c Sat Oct 20 23:02:04 2007 -------------------------- Patching file ip_fil4.1.28/tools/ipmon.c using Plan A... (Fascinating--this is really a new-style context diff but without the telltale extra asterisks on the *** line that usually indicate the new style...) Hunk #1 failed at 419. 1 out of 1 hunks failed--saving rejects to ip_fil4.1.28/tools/ipmon.c.rej done release# exirt[K[Kt exit Script done on Mon Oct 29 17:29:48 2007 -- With all regards, Victor M. Blood. mailto: freebsd_at_masm.elcom.ru FTN: 2:5024/1.95_at_Fidonet.org, ICQ#3567656Received on Mon Oct 29 2007 - 17:29:11 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:20 UTC