Subject: CVS commit: [netbsd-4] src
To: None <source-changes@NetBSD.org>
From: Pavel Cahyna <pavel@netbsd.org>
List: source-changes
Date: 05/07/2007 17:05:38
Module Name:	src
Committed By:	pavel
Date:		Mon May  7 17:05:38 UTC 2007

Modified Files:
	src/dist/ipf [netbsd-4]: BugReport HISTORY ip_fil.c ip_htable.c
	    ip_htable.h ip_irc_pxy.c ip_lookup.c ip_lookup.h ip_pool.c
	    ip_pool.h ip_pptp_pxy.c ip_rpcb_pxy.c ip_scan.c ip_scan.h ip_sync.c
	    ip_sync.h ipf.h mlfk_ipl.c mlo_ipl.c radix_ipf.h
	src/dist/ipf/iplang [netbsd-4]: iplang_y.y
	src/dist/ipf/ipsend [netbsd-4]: 44arp.c arp.c ip.c iptests.c resend.c
	    sdlpi.c sock.c
	src/dist/ipf/lib [netbsd-4]: Makefile addicmp.c addipopt.c bcopywrap.c
	    binprint.c buildopts.c checkrev.c count4bits.c count6bits.c debug.c
	    facpri.c facpri.h fill6bits.c flags.c gethost.c getifname.c
	    getnattype.c getport.c getportproto.c getproto.c getsumd.c
	    hostname.c icmpcode.c initparse.c ionames.c ipf_dotuning.c
	    ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c ipft_td.c ipft_tx.c
	    ipoptsec.c kmem.c kmem.h kmemcpywrap.c kvatoname.c load_hash.c
	    load_hashnode.c load_pool.c load_poolnode.c mutex_emul.c
	    nametokva.c nat_setgroupmap.c ntomask.c optname.c optprint.c
	    optprintv6.c optvalue.c portname.c print_toif.c printactivenat.c
	    printaps.c printbuf.c printfr.c printfraginfo.c printhash.c
	    printhashnode.c printhostmap.c printhostmask.c printifname.c
	    printip.c printlog.c printmask.c printnat.c printpacket.c
	    printpacket6.c printpool.c printpoolnode.c printportcmp.c
	    printproto.c printsbuf.c printstate.c printtunable.c remove_hash.c
	    remove_hashnode.c remove_pool.c remove_poolnode.c resetlexer.c
	    rwlock_emul.c tcp_flags.c tcpflags.c tcpoptnames.c v6ionames.c
	    v6optvalue.c var.c verbose.c
	src/dist/ipf/test [netbsd-4]: test.format vfycksum.pl
	src/dist/ipf/test/expected [netbsd-4]: n10 n12 n8 n9 ni10 ni11 ni12
	    ni13 ni14 ni15 ni16 ni19 ni20 ni6 ni7 ni8 ni9 p2
	src/dist/ipf/test/input [netbsd-4]: ni13 ni14 ni16
	src/dist/ipf/tools [netbsd-4]: Makefile ipf.c ipf_y.y ipfcomp.c ipfs.c
	    ipfstat.c ipftest.c ipmon.c ipmon_y.y ipnat.c ipnat_y.y ippool.c
	    ippool_y.y ipscan_y.y ipsyncm.c ipsyncs.c lex_var.h lexer.c lexer.h
	src/regress/sys/kern/ipf [netbsd-4]: Makefile natipftest test.format
	    vfycksum.pl
	src/regress/sys/kern/ipf/expected [netbsd-4]: f12 f13 i12 ipv6.1 n10
	    n12 n4 n6 n8 n9 ni1 ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni19 ni2
	    ni20 ni3 ni4 ni5 ni6 ni7 ni8 ni9 p2
	src/regress/sys/kern/ipf/input [netbsd-4]: f13 ipv6.1 ni1 ni13 ni14
	    ni16 ni3 ni4 ni5
	src/regress/sys/kern/ipf/regress [netbsd-4]: ni1.nat
	src/sys/dist/ipf/netinet [netbsd-4]: fil.c ip_auth.c ip_auth.h
	    ip_compat.h ip_fil.h ip_fil_netbsd.c ip_frag.c ip_frag.h
	    ip_ftp_pxy.c ip_h323_pxy.c ip_htable.c ip_htable.h ip_ipsec_pxy.c
	    ip_irc_pxy.c ip_log.c ip_lookup.c ip_lookup.h ip_nat.c ip_nat.h
	    ip_pool.c ip_pool.h ip_pptp_pxy.c ip_proxy.c ip_proxy.h
	    ip_raudio_pxy.c ip_rcmd_pxy.c ip_rpcb_pxy.c ip_scan.c ip_scan.h
	    ip_state.c ip_state.h ip_sync.c ip_sync.h ipl.h
	src/usr.sbin/ipf/libipf [netbsd-4]: Makefile
Added Files:
	src/dist/ipf/BSD [netbsd-4]: ipfadm-rcd
	src/dist/ipf/lib [netbsd-4]: alist_free.c alist_new.c load_file.c
	    load_http.c load_url.c printhash_live.c printhashdata.c
	    printpool_live.c printpooldata.c
	src/dist/ipf/test/expected [netbsd-4]: ip2 ni23 p5
	src/dist/ipf/test/input [netbsd-4]: ip2.data ni23 p5
	src/dist/ipf/test/regress [netbsd-4]: ip2 ni23.ipf ni23.nat p5.ipf
	    p5.pool
	src/regress/sys/kern/ipf/expected [netbsd-4]: ip2 ni23 p5
	src/regress/sys/kern/ipf/input [netbsd-4]: ip2.data ni23 p5
	src/regress/sys/kern/ipf/regress [netbsd-4]: ip2 ni23.ipf ni23.nat
	    p5.ipf p5.pool
Removed Files:
	src/dist/ipf/lib [netbsd-4]: extras.c genmask.c getline.c hexdump.c
	    hostmask.c hostnum.c loglevel.c natparse.c parse.c portnum.c
	    ports.c ratoi.c ratoui.c to_interface.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #614):
	dist/ipf/BugReport			sync with ipfilter-4-1-20-pullup
	dist/ipf/HISTORY			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_fil.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_htable.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_htable.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_irc_pxy.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_lookup.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_lookup.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_pool.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_pool.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_pptp_pxy.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_rpcb_pxy.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_scan.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_scan.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_sync.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ip_sync.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/ipf.h				sync with ipfilter-4-1-20-pullup
	dist/ipf/mlfk_ipl.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/mlo_ipl.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/radix_ipf.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/BSD/ipfadm-rcd			sync with ipfilter-4-1-20-pullup
	dist/ipf/iplang/iplang_y.y		sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/44arp.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/arp.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/ip.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/iptests.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/resend.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/sdlpi.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/ipsend/sock.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/Makefile			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/addicmp.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/addipopt.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/alist_free.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/alist_new.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/bcopywrap.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/binprint.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/buildopts.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/checkrev.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/count4bits.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/count6bits.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/debug.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/facpri.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/facpri.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/fill6bits.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/flags.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/gethost.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getifname.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getnattype.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getport.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getportproto.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getproto.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/getsumd.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/hostname.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/icmpcode.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/initparse.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ionames.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipf_dotuning.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_ef.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_hx.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_pc.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_sn.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_td.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipft_tx.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ipoptsec.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/kmem.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/kmem.h			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/kmemcpywrap.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/kvatoname.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_file.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_hash.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_hashnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_http.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_pool.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_poolnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/load_url.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/mutex_emul.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/nametokva.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/nat_setgroupmap.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/ntomask.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/optname.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/optprint.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/optprintv6.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/optvalue.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/portname.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/print_toif.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printactivenat.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printaps.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printbuf.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printfr.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printfraginfo.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhash.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhash_live.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhashdata.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhashnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhostmap.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printhostmask.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printifname.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printip.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printlog.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printmask.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printnat.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpacket.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpacket6.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpool.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpool_live.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpooldata.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printpoolnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printportcmp.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printproto.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printsbuf.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printstate.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/printtunable.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/remove_hash.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/remove_hashnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/remove_pool.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/remove_poolnode.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/resetlexer.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/rwlock_emul.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/tcp_flags.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/tcpflags.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/tcpoptnames.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/v6ionames.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/v6optvalue.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/var.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/verbose.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/test/test.format		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/vfycksum.pl		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ip2		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/n10		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/n12		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/n8		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/n9		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni10		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni11		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni12		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni13		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni14		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni15		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni16		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni19		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni20		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni23		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni6		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni7		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni8		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/ni9		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/p2		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/expected/p5		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/ip2.data		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/ni13		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/ni14		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/ni16		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/ni23		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/input/p5			sync with ipfilter-4-1-20-pullup
	dist/ipf/test/regress/ip2		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/regress/ni23.ipf		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/regress/ni23.nat		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/regress/p5.ipf		sync with ipfilter-4-1-20-pullup
	dist/ipf/test/regress/p5.pool		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/Makefile			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipf.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipf_y.y			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipfcomp.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipfs.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipfstat.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipftest.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipmon.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipmon_y.y		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipnat.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipnat_y.y		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ippool.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ippool_y.y		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipscan_y.y		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipsyncm.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/ipsyncs.c		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/lex_var.h		sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/lexer.c			sync with ipfilter-4-1-20-pullup
	dist/ipf/tools/lexer.h			sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/fil.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_auth.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_auth.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_compat.h	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_fil.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_fil_netbsd.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_frag.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_frag.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_ftp_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_h323_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_htable.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_htable.h	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_ipsec_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_irc_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_log.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_lookup.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_lookup.h	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_nat.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_nat.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_pool.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_pool.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_pptp_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_proxy.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_proxy.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_raudio_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_rcmd_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_rpcb_pxy.c	sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_scan.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_scan.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_state.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_state.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_sync.c		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ip_sync.h		sync with ipfilter-4-1-20-pullup
	sys/dist/ipf/netinet/ipl.h		sync with ipfilter-4-1-20-pullup
	usr.sbin/ipf/libipf/Makefile		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/Makefile		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/natipftest		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/test.format	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/vfycksum.pl	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/f12	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/f13	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/i12	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ip2	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ipv6.1	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n10	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n12	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n4	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n6	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n8	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/n9	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni1	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni10	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni11	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni12	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni13	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni14	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni15	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni16	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni19	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni2	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni20	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni23	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni3	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni4	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni5	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni6	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni7	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni8	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/ni9	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/p2	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/expected/p5	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/f13		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ip2.data	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ipv6.1	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni1		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni13		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni14		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni16		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni23		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni3		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni4		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/ni5		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/input/p5		sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/ip2	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/ni1.nat	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/ni23.ipf	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/ni23.nat	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/p5.ipf	sync with ipfilter-4-1-20-pullup
	regress/sys/kern/ipf/regress/p5.pool	sync with ipfilter-4-1-20-pullup
	dist/ipf/lib/extras.c			delete
	dist/ipf/lib/genmask.c			delete
	dist/ipf/lib/getline.c			delete
	dist/ipf/lib/hexdump.c			delete
	dist/ipf/lib/hostmask.c			delete
	dist/ipf/lib/hostnum.c			delete
	dist/ipf/lib/loglevel.c			delete
	dist/ipf/lib/natparse.c			delete
	dist/ipf/lib/parse.c			delete
	dist/ipf/lib/portnum.c			delete
	dist/ipf/lib/ports.c			delete
	dist/ipf/lib/ratoi.c			delete
	dist/ipf/lib/ratoui.c			delete
	dist/ipf/lib/to_interface.c		delete
Update IPFilter to 4.1.20.
(Using a helper tag ipfilter-4-1-20-pullup created on HEAD.)


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.1.28.1 src/dist/ipf/BugReport
cvs rdiff -r1.20 -r1.20.4.1 src/dist/ipf/HISTORY
cvs rdiff -r1.7 -r1.7.4.1 src/dist/ipf/ip_fil.c
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/dist/ipf/ip_htable.c \
    src/dist/ipf/ip_sync.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/dist/ipf/ip_htable.h
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 src/dist/ipf/ip_irc_pxy.c \
    src/dist/ipf/ip_pool.c src/dist/ipf/ip_pptp_pxy.c
cvs rdiff -r1.2 -r1.2.2.1 src/dist/ipf/ip_lookup.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 src/dist/ipf/ip_lookup.h \
    src/dist/ipf/ip_pool.h src/dist/ipf/ip_scan.h src/dist/ipf/radix_ipf.h
cvs rdiff -r1.1.1.4 -r1.1.1.4.12.1 src/dist/ipf/ip_rpcb_pxy.c
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/dist/ipf/ip_scan.c \
    src/dist/ipf/ip_sync.c
cvs rdiff -r1.11 -r1.11.4.1 src/dist/ipf/ipf.h
cvs rdiff -r1.1.1.8 -r1.1.1.8.4.1 src/dist/ipf/mlfk_ipl.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.12.1 src/dist/ipf/mlo_ipl.c
cvs rdiff -r0 -r1.1.1.1.2.1 src/dist/ipf/BSD/ipfadm-rcd
cvs rdiff -r1.9 -r1.9.4.1 src/dist/ipf/iplang/iplang_y.y
cvs rdiff -r1.5 -r1.5.12.1 src/dist/ipf/ipsend/44arp.c \
    src/dist/ipf/ipsend/sdlpi.c
cvs rdiff -r1.5 -r1.5.4.1 src/dist/ipf/ipsend/arp.c
cvs rdiff -r1.7 -r1.7.12.1 src/dist/ipf/ipsend/ip.c
cvs rdiff -r1.10 -r1.10.4.1 src/dist/ipf/ipsend/iptests.c
cvs rdiff -r1.7 -r1.7.4.1 src/dist/ipf/ipsend/resend.c
cvs rdiff -r1.9.4.1 -r1.9.4.2 src/dist/ipf/ipsend/sock.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 src/dist/ipf/lib/Makefile \
    src/dist/ipf/lib/ipft_pc.c src/dist/ipf/lib/optprint.c \
    src/dist/ipf/lib/printhostmap.c src/dist/ipf/lib/printlog.c
cvs rdiff -r1.8 -r1.8.4.1 src/dist/ipf/lib/addicmp.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/dist/ipf/lib/addipopt.c \
    src/dist/ipf/lib/bcopywrap.c src/dist/ipf/lib/binprint.c \
    src/dist/ipf/lib/buildopts.c src/dist/ipf/lib/checkrev.c \
    src/dist/ipf/lib/count4bits.c src/dist/ipf/lib/count6bits.c \
    src/dist/ipf/lib/debug.c src/dist/ipf/lib/facpri.h \
    src/dist/ipf/lib/fill6bits.c src/dist/ipf/lib/flags.c \
    src/dist/ipf/lib/getifname.c src/dist/ipf/lib/getnattype.c \
    src/dist/ipf/lib/getsumd.c src/dist/ipf/lib/initparse.c \
    src/dist/ipf/lib/ionames.c src/dist/ipf/lib/ipft_ef.c \
    src/dist/ipf/lib/ipft_sn.c src/dist/ipf/lib/ipft_td.c \
    src/dist/ipf/lib/ipoptsec.c src/dist/ipf/lib/kmem.h \
    src/dist/ipf/lib/kmemcpywrap.c src/dist/ipf/lib/kvatoname.c \
    src/dist/ipf/lib/load_hashnode.c src/dist/ipf/lib/load_poolnode.c \
    src/dist/ipf/lib/mutex_emul.c src/dist/ipf/lib/nametokva.c \
    src/dist/ipf/lib/nat_setgroupmap.c src/dist/ipf/lib/ntomask.c \
    src/dist/ipf/lib/optname.c src/dist/ipf/lib/optprintv6.c \
    src/dist/ipf/lib/optvalue.c src/dist/ipf/lib/portname.c \
    src/dist/ipf/lib/print_toif.c src/dist/ipf/lib/printaps.c \
    src/dist/ipf/lib/printfraginfo.c src/dist/ipf/lib/printhashnode.c \
    src/dist/ipf/lib/printhostmask.c src/dist/ipf/lib/printifname.c \
    src/dist/ipf/lib/printip.c src/dist/ipf/lib/printmask.c \
    src/dist/ipf/lib/printpacket6.c src/dist/ipf/lib/printpoolnode.c \
    src/dist/ipf/lib/printportcmp.c src/dist/ipf/lib/printtunable.c \
    src/dist/ipf/lib/remove_hash.c src/dist/ipf/lib/remove_hashnode.c \
    src/dist/ipf/lib/remove_pool.c src/dist/ipf/lib/remove_poolnode.c \
    src/dist/ipf/lib/resetlexer.c src/dist/ipf/lib/rwlock_emul.c \
    src/dist/ipf/lib/tcp_flags.c src/dist/ipf/lib/tcpflags.c \
    src/dist/ipf/lib/tcpoptnames.c src/dist/ipf/lib/v6optvalue.c \
    src/dist/ipf/lib/verbose.c
cvs rdiff -r0 -r1.1.1.1.2.1 src/dist/ipf/lib/alist_free.c \
    src/dist/ipf/lib/alist_new.c src/dist/ipf/lib/load_file.c \
    src/dist/ipf/lib/load_http.c src/dist/ipf/lib/load_url.c \
    src/dist/ipf/lib/printhash_live.c src/dist/ipf/lib/printhashdata.c \
    src/dist/ipf/lib/printpool_live.c src/dist/ipf/lib/printpooldata.c
cvs rdiff -r1.1.1.1 -r0 src/dist/ipf/lib/extras.c src/dist/ipf/lib/genmask.c \
    src/dist/ipf/lib/getline.c src/dist/ipf/lib/hostmask.c \
    src/dist/ipf/lib/loglevel.c src/dist/ipf/lib/ratoi.c \
    src/dist/ipf/lib/ratoui.c src/dist/ipf/lib/to_interface.c
cvs rdiff -r1.3 -r1.3.4.1 src/dist/ipf/lib/facpri.c \
    src/dist/ipf/lib/getproto.c src/dist/ipf/lib/ipf_dotuning.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.12.1 src/dist/ipf/lib/gethost.c \
    src/dist/ipf/lib/printactivenat.c src/dist/ipf/lib/printhash.c \
    src/dist/ipf/lib/printpool.c
cvs rdiff -r1.5 -r1.5.4.1 src/dist/ipf/lib/getport.c \
    src/dist/ipf/lib/v6ionames.c
cvs rdiff -r1.5 -r1.5.12.1 src/dist/ipf/lib/getportproto.c \
    src/dist/ipf/lib/printbuf.c
cvs rdiff -r1.2 -r0 src/dist/ipf/lib/hexdump.c
cvs rdiff -r1.2 -r1.2.4.1 src/dist/ipf/lib/hostname.c
cvs rdiff -r1.5 -r0 src/dist/ipf/lib/hostnum.c src/dist/ipf/lib/portnum.c \
    src/dist/ipf/lib/ports.c
cvs rdiff -r1.6 -r1.6.4.1 src/dist/ipf/lib/icmpcode.c \
    src/dist/ipf/lib/ipft_hx.c src/dist/ipf/lib/ipft_tx.c
cvs rdiff -r1.4 -r1.4.4.1 src/dist/ipf/lib/kmem.c
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/dist/ipf/lib/load_hash.c \
    src/dist/ipf/lib/load_pool.c src/dist/ipf/lib/printpacket.c
cvs rdiff -r1.3 -r0 src/dist/ipf/lib/natparse.c src/dist/ipf/lib/parse.c
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 src/dist/ipf/lib/printfr.c \
    src/dist/ipf/lib/printnat.c src/dist/ipf/lib/printstate.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/dist/ipf/lib/printproto.c
cvs rdiff -r1.2 -r1.2.12.1 src/dist/ipf/lib/printsbuf.c
cvs rdiff -r1.4 -r1.4.12.1 src/dist/ipf/lib/var.c
cvs rdiff -r1.1.1.6 -r1.1.1.6.4.1 src/dist/ipf/test/test.format
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/dist/ipf/test/vfycksum.pl
cvs rdiff -r0 -r1.1.1.1.2.1 src/dist/ipf/test/expected/ip2 \
    src/dist/ipf/test/expected/p5
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/dist/ipf/test/expected/n10
cvs rdiff -r1.1.1.1 -r1.1.1.1.12.1 src/dist/ipf/test/expected/n12
cvs rdiff -r1.1.1.2 -r1.1.1.2.12.1 src/dist/ipf/test/expected/n8 \
    src/dist/ipf/test/expected/n9 src/dist/ipf/test/expected/ni10 \
    src/dist/ipf/test/expected/ni11 src/dist/ipf/test/expected/ni6
cvs rdiff -r1.1.1.1 -r1.1.1.1.14.1 src/dist/ipf/test/expected/ni12 \
    src/dist/ipf/test/expected/ni7 src/dist/ipf/test/expected/ni8 \
    src/dist/ipf/test/expected/ni9
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/dist/ipf/test/expected/ni13 \
    src/dist/ipf/test/expected/ni14 src/dist/ipf/test/expected/ni15 \
    src/dist/ipf/test/expected/ni16 src/dist/ipf/test/expected/ni19 \
    src/dist/ipf/test/expected/ni20
cvs rdiff -r0 -r1.1.1.2.2.1 src/dist/ipf/test/expected/ni23
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 src/dist/ipf/test/expected/p2
cvs rdiff -r0 -r1.1.1.1.2.1 src/dist/ipf/test/input/ip2.data \
    src/dist/ipf/test/input/ni23 src/dist/ipf/test/input/p5
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/dist/ipf/test/input/ni13 \
    src/dist/ipf/test/input/ni14 src/dist/ipf/test/input/ni16
cvs rdiff -r0 -r1.1.1.1.2.1 src/dist/ipf/test/regress/ip2 \
    src/dist/ipf/test/regress/ni23.ipf src/dist/ipf/test/regress/ni23.nat \
    src/dist/ipf/test/regress/p5.ipf src/dist/ipf/test/regress/p5.pool
cvs rdiff -r1.1.1.2 -r1.1.1.2.12.1 src/dist/ipf/tools/Makefile \
    src/dist/ipf/tools/ipmon_y.y
cvs rdiff -r1.2 -r1.2.4.1 src/dist/ipf/tools/ipf.c \
    src/dist/ipf/tools/ipfcomp.c
cvs rdiff -r1.20 -r1.20.2.1 src/dist/ipf/tools/ipf_y.y
cvs rdiff -r1.7 -r1.7.4.1 src/dist/ipf/tools/ipfs.c
cvs rdiff -r1.12 -r1.12.4.1 src/dist/ipf/tools/ipfstat.c
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/dist/ipf/tools/ipftest.c
cvs rdiff -r1.8 -r1.8.4.1 src/dist/ipf/tools/ipmon.c
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/dist/ipf/tools/ipnat.c \
    src/dist/ipf/tools/ipsyncm.c src/dist/ipf/tools/ipsyncs.c
cvs rdiff -r1.14 -r1.14.4.1 src/dist/ipf/tools/ipnat_y.y
cvs rdiff -r1.4 -r1.4.12.1 src/dist/ipf/tools/ippool.c
cvs rdiff -r1.2 -r1.2.2.1 src/dist/ipf/tools/ippool_y.y
cvs rdiff -r1.2 -r1.2.12.1 src/dist/ipf/tools/ipscan_y.y
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/dist/ipf/tools/lex_var.h
cvs rdiff -r1.11 -r1.11.12.1 src/dist/ipf/tools/lexer.c
cvs rdiff -r1.3 -r1.3.12.1 src/dist/ipf/tools/lexer.h
cvs rdiff -r1.11 -r1.11.4.1 src/regress/sys/kern/ipf/Makefile
cvs rdiff -r1.4 -r1.4.4.1 src/regress/sys/kern/ipf/natipftest
cvs rdiff -r1.1.1.6 -r1.1.1.6.4.1 src/regress/sys/kern/ipf/test.format
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/regress/sys/kern/ipf/vfycksum.pl
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/regress/sys/kern/ipf/expected/f12
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/regress/sys/kern/ipf/expected/f13 \
    src/regress/sys/kern/ipf/expected/n4
cvs rdiff -r1.3 -r1.3.4.1 src/regress/sys/kern/ipf/expected/i12
cvs rdiff -r0 -r1.1.1.1.2.1 src/regress/sys/kern/ipf/expected/ip2 \
    src/regress/sys/kern/ipf/expected/p5
cvs rdiff -r1.1.1.2 -r1.1.1.2.10.1 src/regress/sys/kern/ipf/expected/ipv6.1 \
    src/regress/sys/kern/ipf/expected/n8 src/regress/sys/kern/ipf/expected/n9 \
    src/regress/sys/kern/ipf/expected/ni6
cvs rdiff -r1.1.1.1 -r1.1.1.1.16.1 src/regress/sys/kern/ipf/expected/n10
cvs rdiff -r1.1.1.1 -r1.1.1.1.10.1 src/regress/sys/kern/ipf/expected/n12
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 src/regress/sys/kern/ipf/expected/n6 \
    src/regress/sys/kern/ipf/expected/p2
cvs rdiff -r1.1.1.3 -r1.1.1.3.10.1 src/regress/sys/kern/ipf/expected/ni1 \
    src/regress/sys/kern/ipf/expected/ni2 \
    src/regress/sys/kern/ipf/expected/ni4
cvs rdiff -r1.2 -r1.2.10.1 src/regress/sys/kern/ipf/expected/ni10 \
    src/regress/sys/kern/ipf/expected/ni11 \
    src/regress/sys/kern/ipf/expected/ni3
cvs rdiff -r1.1.1.1 -r1.1.1.1.12.1 src/regress/sys/kern/ipf/expected/ni12 \
    src/regress/sys/kern/ipf/expected/ni7 \
    src/regress/sys/kern/ipf/expected/ni8 \
    src/regress/sys/kern/ipf/expected/ni9
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/regress/sys/kern/ipf/expected/ni13 \
    src/regress/sys/kern/ipf/expected/ni14 \
    src/regress/sys/kern/ipf/expected/ni15 \
    src/regress/sys/kern/ipf/expected/ni16
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 src/regress/sys/kern/ipf/expected/ni19 \
    src/regress/sys/kern/ipf/expected/ni20
cvs rdiff -r0 -r1.1.1.2.2.1 src/regress/sys/kern/ipf/expected/ni23
cvs rdiff -r1.4 -r1.4.4.1 src/regress/sys/kern/ipf/expected/ni5
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 src/regress/sys/kern/ipf/input/f13
cvs rdiff -r0 -r1.1.1.1.2.1 src/regress/sys/kern/ipf/input/ip2.data \
    src/regress/sys/kern/ipf/input/ni23 src/regress/sys/kern/ipf/input/p5
cvs rdiff -r1.2 -r1.2.10.1 src/regress/sys/kern/ipf/input/ipv6.1 \
    src/regress/sys/kern/ipf/input/ni3
cvs rdiff -r1.1.1.3 -r1.1.1.3.10.1 src/regress/sys/kern/ipf/input/ni1 \
    src/regress/sys/kern/ipf/input/ni5
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/regress/sys/kern/ipf/input/ni13 \
    src/regress/sys/kern/ipf/input/ni14 src/regress/sys/kern/ipf/input/ni16
cvs rdiff -r1.1.1.2 -r1.1.1.2.10.1 src/regress/sys/kern/ipf/input/ni4
cvs rdiff -r0 -r1.3.2.1 src/regress/sys/kern/ipf/regress/ip2
cvs rdiff -r1.1.1.1 -r1.1.1.1.18.1 src/regress/sys/kern/ipf/regress/ni1.nat
cvs rdiff -r0 -r1.1.1.1.2.1 src/regress/sys/kern/ipf/regress/ni23.ipf \
    src/regress/sys/kern/ipf/regress/ni23.nat \
    src/regress/sys/kern/ipf/regress/p5.ipf \
    src/regress/sys/kern/ipf/regress/p5.pool
cvs rdiff -r1.28 -r1.28.2.1 src/sys/dist/ipf/netinet/fil.c \
    src/sys/dist/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -r1.8 -r1.8.12.1 src/sys/dist/ipf/netinet/ip_auth.c \
    src/sys/dist/ipf/netinet/ip_rcmd_pxy.c
cvs rdiff -r1.3 -r1.3.12.1 src/sys/dist/ipf/netinet/ip_auth.h \
    src/sys/dist/ipf/netinet/ip_frag.h src/sys/dist/ipf/netinet/ip_lookup.h \
    src/sys/dist/ipf/netinet/ip_pool.h src/sys/dist/ipf/netinet/ip_scan.h
cvs rdiff -r1.11 -r1.11.12.1 src/sys/dist/ipf/netinet/ip_compat.h
cvs rdiff -r1.6 -r1.6.12.1 src/sys/dist/ipf/netinet/ip_fil.h \
    src/sys/dist/ipf/netinet/ip_pptp_pxy.c src/sys/dist/ipf/netinet/ipl.h
cvs rdiff -r1.5 -r1.5.2.1 src/sys/dist/ipf/netinet/ip_frag.c
cvs rdiff -r1.10 -r1.10.12.1 src/sys/dist/ipf/netinet/ip_ftp_pxy.c
cvs rdiff -r1.4 -r1.4.12.1 src/sys/dist/ipf/netinet/ip_h323_pxy.c \
    src/sys/dist/ipf/netinet/ip_proxy.h src/sys/dist/ipf/netinet/ip_sync.h
cvs rdiff -r1.6 -r1.6.4.1 src/sys/dist/ipf/netinet/ip_htable.c
cvs rdiff -r1.2 -r1.2.24.1 src/sys/dist/ipf/netinet/ip_htable.h
cvs rdiff -r1.5 -r1.5.12.1 src/sys/dist/ipf/netinet/ip_ipsec_pxy.c \
    src/sys/dist/ipf/netinet/ip_log.c src/sys/dist/ipf/netinet/ip_state.h \
    src/sys/dist/ipf/netinet/ip_sync.c
cvs rdiff -r1.7 -r1.7.12.1 src/sys/dist/ipf/netinet/ip_irc_pxy.c \
    src/sys/dist/ipf/netinet/ip_nat.h
cvs rdiff -r1.7 -r1.7.2.1 src/sys/dist/ipf/netinet/ip_lookup.c
cvs rdiff -r1.19.2.1 -r1.19.2.2 src/sys/dist/ipf/netinet/ip_nat.c
cvs rdiff -r1.7 -r1.7.4.1 src/sys/dist/ipf/netinet/ip_pool.c
cvs rdiff -r1.11 -r1.11.6.1 src/sys/dist/ipf/netinet/ip_proxy.c
cvs rdiff -r1.3 -r1.3.24.1 src/sys/dist/ipf/netinet/ip_raudio_pxy.c
cvs rdiff -r1.9 -r1.9.6.1 src/sys/dist/ipf/netinet/ip_rpcb_pxy.c
cvs rdiff -r1.6.12.1 -r1.6.12.2 src/sys/dist/ipf/netinet/ip_scan.c
cvs rdiff -r1.15.2.1 -r1.15.2.2 src/sys/dist/ipf/netinet/ip_state.c
cvs rdiff -r1.6 -r1.6.4.1 src/usr.sbin/ipf/libipf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.