CVS commit: src

["Darren Reed" <darrenr%netbsd.org@localhost>]

Module Name:    src
Committed By:   darrenr
Date:           Sun Jul 22 13:46:48 UTC 2012

Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv17191

Log Message:
Import IPFilter 5.1.2

Status:

Vendor Tag:     DARRENR
Release Tags:   v5-1-2
                
U src/external/bsd/ipf/dist/BNF
U src/external/bsd/ipf/dist/HISTORY
U src/external/bsd/ipf/dist/IPFILTER.LICENCE
U src/external/bsd/ipf/dist/README
U src/external/bsd/ipf/dist/STYLE.TXT
U src/external/bsd/ipf/dist/WhatsNew40.txt
U src/external/bsd/ipf/dist/WhatsNew50.txt
U src/external/bsd/ipf/dist/ip_dns_pxy.c
U src/external/bsd/ipf/dist/ip_dstlist.c
U src/external/bsd/ipf/dist/ip_dstlist.h
C src/external/bsd/ipf/dist/ip_fil.c
U src/external/bsd/ipf/dist/ip_fil_compat.c
U src/external/bsd/ipf/dist/ip_htable.c
U src/external/bsd/ipf/dist/ip_htable.h
U src/external/bsd/ipf/dist/ip_irc_pxy.c
U src/external/bsd/ipf/dist/ip_lookup.c
U src/external/bsd/ipf/dist/ip_lookup.h
U src/external/bsd/ipf/dist/ip_nat6.c
U src/external/bsd/ipf/dist/ip_pool.c
U src/external/bsd/ipf/dist/ip_pool.h
U src/external/bsd/ipf/dist/ip_pptp_pxy.c
U src/external/bsd/ipf/dist/ip_rpcb_pxy.c
C src/external/bsd/ipf/dist/ip_scan.c
U src/external/bsd/ipf/dist/ip_scan.h
U src/external/bsd/ipf/dist/ip_sync.c
U src/external/bsd/ipf/dist/ip_sync.h
U src/external/bsd/ipf/dist/ip_tftp_pxy.c
U src/external/bsd/ipf/dist/ipf.h
U src/external/bsd/ipf/dist/ipf_rb.h
U src/external/bsd/ipf/dist/ipmon.h
U src/external/bsd/ipf/dist/ipt.h
U src/external/bsd/ipf/dist/kmem.h
U src/external/bsd/ipf/dist/md5.c
U src/external/bsd/ipf/dist/md5.h
U src/external/bsd/ipf/dist/mkfilters
U src/external/bsd/ipf/dist/mln_rule.c
U src/external/bsd/ipf/dist/opts.h
U src/external/bsd/ipf/dist/pcap-ipf.h
C src/external/bsd/ipf/dist/radix_ipf.c
U src/external/bsd/ipf/dist/radix_ipf.h
U src/external/bsd/ipf/dist/snoop.h
U src/external/bsd/ipf/dist/todo
U src/external/bsd/ipf/dist/FWTK/ftp-gw.diff
U src/external/bsd/ipf/dist/FWTK/Index
U src/external/bsd/ipf/dist/FWTK/README
U src/external/bsd/ipf/dist/FWTK/README.ipfilter
U src/external/bsd/ipf/dist/FWTK/fwtk_transparent.diff
U src/external/bsd/ipf/dist/FWTK/fwtkp
U src/external/bsd/ipf/dist/etc/protocols
U src/external/bsd/ipf/dist/etc/services
U src/external/bsd/ipf/dist/iplang/BNF
U src/external/bsd/ipf/dist/iplang/iplang.h
U src/external/bsd/ipf/dist/iplang/iplang.tst
U src/external/bsd/ipf/dist/iplang/iplang_l.l
U src/external/bsd/ipf/dist/iplang/iplang_y.y
U src/external/bsd/ipf/dist/ipsd/README
U src/external/bsd/ipf/dist/ipsd/ipsd.c
U src/external/bsd/ipf/dist/ipsd/ipsd.h
U src/external/bsd/ipf/dist/ipsd/ipsdr.c
U src/external/bsd/ipf/dist/ipsd/linux.h
U src/external/bsd/ipf/dist/ipsd/sbpf.c
U src/external/bsd/ipf/dist/ipsd/sdlpi.c
U src/external/bsd/ipf/dist/ipsd/slinux.c
U src/external/bsd/ipf/dist/ipsd/snit.c
U src/external/bsd/ipf/dist/ipsd/Celler/ip_compat.h
U src/external/bsd/ipf/dist/ipsend/44arp.c
U src/external/bsd/ipf/dist/ipsend/Crashable
U src/external/bsd/ipf/dist/ipsend/arp.c
U src/external/bsd/ipf/dist/ipsend/dlcommon.c
U src/external/bsd/ipf/dist/ipsend/dltest.h
C src/external/bsd/ipf/dist/ipsend/ip.c
U src/external/bsd/ipf/dist/ipsend/ipresend.1
U src/external/bsd/ipf/dist/ipsend/ipresend.c
U src/external/bsd/ipf/dist/ipsend/ipsend.1
U src/external/bsd/ipf/dist/ipsend/ipsend.5
U src/external/bsd/ipf/dist/ipsend/ipsend.c
U src/external/bsd/ipf/dist/ipsend/ipsend.h
U src/external/bsd/ipf/dist/ipsend/ipsopt.c
U src/external/bsd/ipf/dist/ipsend/iptest.1
U src/external/bsd/ipf/dist/ipsend/iptest.c
C src/external/bsd/ipf/dist/ipsend/iptests.c
U src/external/bsd/ipf/dist/ipsend/larp.c
U src/external/bsd/ipf/dist/ipsend/linux.h
U src/external/bsd/ipf/dist/ipsend/lsock.c
U src/external/bsd/ipf/dist/ipsend/resend.c
C src/external/bsd/ipf/dist/ipsend/sbpf.c
U src/external/bsd/ipf/dist/ipsend/sdlpi.c
U src/external/bsd/ipf/dist/ipsend/sirix.c
U src/external/bsd/ipf/dist/ipsend/snit.c
U src/external/bsd/ipf/dist/ipsend/slinux.c
C src/external/bsd/ipf/dist/ipsend/sock.c
U src/external/bsd/ipf/dist/ipsend/sockraw.c
U src/external/bsd/ipf/dist/l4check/http.check
U src/external/bsd/ipf/dist/l4check/http.ok
U src/external/bsd/ipf/dist/l4check/l4check.c
U src/external/bsd/ipf/dist/l4check/l4check.conf
U src/external/bsd/ipf/dist/lib/printpooldata.c
U src/external/bsd/ipf/dist/lib/addicmp.c
U src/external/bsd/ipf/dist/lib/addipopt.c
U src/external/bsd/ipf/dist/lib/alist_free.c
U src/external/bsd/ipf/dist/lib/alist_new.c
U src/external/bsd/ipf/dist/lib/allocmbt.c
U src/external/bsd/ipf/dist/lib/assigndefined.c
U src/external/bsd/ipf/dist/lib/bcopywrap.c
U src/external/bsd/ipf/dist/lib/binprint.c
U src/external/bsd/ipf/dist/lib/buildopts.c
U src/external/bsd/ipf/dist/lib/checkrev.c
U src/external/bsd/ipf/dist/lib/connecttcp.c
U src/external/bsd/ipf/dist/lib/count4bits.c
U src/external/bsd/ipf/dist/lib/count6bits.c
U src/external/bsd/ipf/dist/lib/debug.c
U src/external/bsd/ipf/dist/lib/dupmbt.c
U src/external/bsd/ipf/dist/lib/facpri.c
U src/external/bsd/ipf/dist/lib/facpri.h
U src/external/bsd/ipf/dist/lib/familyname.c
U src/external/bsd/ipf/dist/lib/fill6bits.c
U src/external/bsd/ipf/dist/lib/findword.c
U src/external/bsd/ipf/dist/lib/flags.c
U src/external/bsd/ipf/dist/lib/ftov.c
U src/external/bsd/ipf/dist/lib/freembt.c
U src/external/bsd/ipf/dist/lib/genmask.c
U src/external/bsd/ipf/dist/lib/gethost.c
U src/external/bsd/ipf/dist/lib/geticmptype.c
U src/external/bsd/ipf/dist/lib/getifname.c
U src/external/bsd/ipf/dist/lib/getnattype.c
U src/external/bsd/ipf/dist/lib/getport.c
U src/external/bsd/ipf/dist/lib/getportproto.c
U src/external/bsd/ipf/dist/lib/getproto.c
U src/external/bsd/ipf/dist/lib/getsumd.c
U src/external/bsd/ipf/dist/lib/hostname.c
U src/external/bsd/ipf/dist/lib/icmpcode.c
U src/external/bsd/ipf/dist/lib/icmptypename.c
U src/external/bsd/ipf/dist/lib/icmptypes.c
U src/external/bsd/ipf/dist/lib/initparse.c
U src/external/bsd/ipf/dist/lib/interror.c
U src/external/bsd/ipf/dist/lib/ionames.c
U src/external/bsd/ipf/dist/lib/ipf_dotuning.c
U src/external/bsd/ipf/dist/lib/ipf_perror.c
U src/external/bsd/ipf/dist/lib/ipft_hx.c
U src/external/bsd/ipf/dist/lib/ipft_pc.c
U src/external/bsd/ipf/dist/lib/ipft_tx.c
U src/external/bsd/ipf/dist/lib/kmem.c
U src/external/bsd/ipf/dist/lib/ipoptsec.c
U src/external/bsd/ipf/dist/lib/kmem.h
U src/external/bsd/ipf/dist/lib/kmemcpywrap.c
U src/external/bsd/ipf/dist/lib/kvatoname.c
U src/external/bsd/ipf/dist/lib/load_dstlist.c
U src/external/bsd/ipf/dist/lib/load_dstlistnode.c
U src/external/bsd/ipf/dist/lib/load_file.c
U src/external/bsd/ipf/dist/lib/load_hash.c
U src/external/bsd/ipf/dist/lib/load_hashnode.c
C src/external/bsd/ipf/dist/lib/load_http.c
U src/external/bsd/ipf/dist/lib/load_pool.c
U src/external/bsd/ipf/dist/lib/load_poolnode.c
U src/external/bsd/ipf/dist/lib/load_url.c
U src/external/bsd/ipf/dist/lib/mb_hexdump.c
U src/external/bsd/ipf/dist/lib/msgdsize.c
U src/external/bsd/ipf/dist/lib/mutex_emul.c
U src/external/bsd/ipf/dist/lib/nametokva.c
U src/external/bsd/ipf/dist/lib/nat_setgroupmap.c
U src/external/bsd/ipf/dist/lib/ntomask.c
U src/external/bsd/ipf/dist/lib/optname.c
U src/external/bsd/ipf/dist/lib/optprint.c
U src/external/bsd/ipf/dist/lib/optprintv6.c
U src/external/bsd/ipf/dist/lib/optvalue.c
U src/external/bsd/ipf/dist/lib/parsefields.c
U src/external/bsd/ipf/dist/lib/parseipfexpr.c
U src/external/bsd/ipf/dist/lib/parsewhoisline.c
U src/external/bsd/ipf/dist/lib/poolio.c
U src/external/bsd/ipf/dist/lib/portname.c
U src/external/bsd/ipf/dist/lib/prependmbt.c
U src/external/bsd/ipf/dist/lib/print_toif.c
U src/external/bsd/ipf/dist/lib/printactiveaddr.c
C src/external/bsd/ipf/dist/lib/printactivenat.c
U src/external/bsd/ipf/dist/lib/printaddr.c
C src/external/bsd/ipf/dist/lib/printaps.c
U src/external/bsd/ipf/dist/lib/printbuf.c
U src/external/bsd/ipf/dist/lib/printdstl_live.c
U src/external/bsd/ipf/dist/lib/printdstlist.c
U src/external/bsd/ipf/dist/lib/printdstlistdata.c
U src/external/bsd/ipf/dist/lib/printdstlistnode.c
U src/external/bsd/ipf/dist/lib/printdstlistpolicy.c
U src/external/bsd/ipf/dist/lib/printfieldhdr.c
U src/external/bsd/ipf/dist/lib/printfr.c
U src/external/bsd/ipf/dist/lib/printfraginfo.c
U src/external/bsd/ipf/dist/lib/printhash.c
U src/external/bsd/ipf/dist/lib/printhash_live.c
U src/external/bsd/ipf/dist/lib/printhashdata.c
U src/external/bsd/ipf/dist/lib/printhashnode.c
U src/external/bsd/ipf/dist/lib/printhost.c
U src/external/bsd/ipf/dist/lib/printhostmap.c
U src/external/bsd/ipf/dist/lib/printhostmask.c
U src/external/bsd/ipf/dist/lib/printifname.c
U src/external/bsd/ipf/dist/lib/printip.c
U src/external/bsd/ipf/dist/lib/printipfexpr.c
U src/external/bsd/ipf/dist/lib/printlog.c
U src/external/bsd/ipf/dist/lib/printlookup.c
U src/external/bsd/ipf/dist/lib/printmask.c
U src/external/bsd/ipf/dist/lib/printnat.c
U src/external/bsd/ipf/dist/lib/printnataddr.c
U src/external/bsd/ipf/dist/lib/printnatfield.c
U src/external/bsd/ipf/dist/lib/printnatside.c
U src/external/bsd/ipf/dist/lib/printpacket.c
U src/external/bsd/ipf/dist/lib/printpacket6.c
U src/external/bsd/ipf/dist/lib/printpool.c
U src/external/bsd/ipf/dist/lib/printpool_live.c
U src/external/bsd/ipf/dist/lib/printpoolnode.c
U src/external/bsd/ipf/dist/lib/printpoolfield.c
U src/external/bsd/ipf/dist/lib/printportcmp.c
U src/external/bsd/ipf/dist/lib/printproto.c
U src/external/bsd/ipf/dist/lib/printsbuf.c
U src/external/bsd/ipf/dist/lib/printstate.c
U src/external/bsd/ipf/dist/lib/printstatefields.c
U src/external/bsd/ipf/dist/lib/printtcpflags.c
U src/external/bsd/ipf/dist/lib/printtqtable.c
U src/external/bsd/ipf/dist/lib/printtunable.c
U src/external/bsd/ipf/dist/lib/printunit.c
U src/external/bsd/ipf/dist/lib/remove_hash.c
U src/external/bsd/ipf/dist/lib/remove_hashnode.c
U src/external/bsd/ipf/dist/lib/remove_pool.c
U src/external/bsd/ipf/dist/lib/remove_poolnode.c
U src/external/bsd/ipf/dist/lib/resetlexer.c
U src/external/bsd/ipf/dist/lib/rwlock_emul.c
U src/external/bsd/ipf/dist/lib/save_execute.c
U src/external/bsd/ipf/dist/lib/save_file.c
U src/external/bsd/ipf/dist/lib/save_nothing.c
U src/external/bsd/ipf/dist/lib/save_syslog.c
U src/external/bsd/ipf/dist/lib/save_v1trap.c
U src/external/bsd/ipf/dist/lib/save_v2trap.c
U src/external/bsd/ipf/dist/lib/tcpflags.c
U src/external/bsd/ipf/dist/lib/tcpoptnames.c
U src/external/bsd/ipf/dist/lib/v6ionames.c
U src/external/bsd/ipf/dist/lib/v6optvalue.c
U src/external/bsd/ipf/dist/lib/var.c
U src/external/bsd/ipf/dist/lib/verbose.c
U src/external/bsd/ipf/dist/lib/vtof.c
U src/external/bsd/ipf/dist/man/Makefile
C src/external/bsd/ipf/dist/man/ipf.4
C src/external/bsd/ipf/dist/man/ipf.5
U src/external/bsd/ipf/dist/man/ipf.8
U src/external/bsd/ipf/dist/man/ipfilter.4
U src/external/bsd/ipf/dist/man/ipfilter.4.mandoc
U src/external/bsd/ipf/dist/man/ipfilter.5
U src/external/bsd/ipf/dist/man/ipfs.8
C src/external/bsd/ipf/dist/man/ipfstat.8
U src/external/bsd/ipf/dist/man/ipftest.1
U src/external/bsd/ipf/dist/man/ipl.4
U src/external/bsd/ipf/dist/man/ipmon.5
U src/external/bsd/ipf/dist/man/ipmon.8
U src/external/bsd/ipf/dist/man/ipnat.4
C src/external/bsd/ipf/dist/man/ipnat.5
U src/external/bsd/ipf/dist/man/ipnat.8
C src/external/bsd/ipf/dist/man/ippool.5
U src/external/bsd/ipf/dist/man/ippool.8
U src/external/bsd/ipf/dist/man/ipscan.5
U src/external/bsd/ipf/dist/man/ipscan.8
U src/external/bsd/ipf/dist/man/mkfilters.1
U src/external/bsd/ipf/dist/perl/Ipfanaly.pl
U src/external/bsd/ipf/dist/perl/Isbgraph
U src/external/bsd/ipf/dist/perl/LICENSE
U src/external/bsd/ipf/dist/perl/Services
U src/external/bsd/ipf/dist/perl/ipf-mrtg.pl
U src/external/bsd/ipf/dist/perl/ipfmeta.pl
U src/external/bsd/ipf/dist/perl/logfilter.pl
U src/external/bsd/ipf/dist/perl/plog
U src/external/bsd/ipf/dist/sys/tree.h
U src/external/bsd/ipf/dist/rules/BASIC.NAT
U src/external/bsd/ipf/dist/rules/BASIC_1.FW
U src/external/bsd/ipf/dist/rules/BASIC_2.FW
U src/external/bsd/ipf/dist/rules/example.1
U src/external/bsd/ipf/dist/rules/example.10
U src/external/bsd/ipf/dist/rules/example.11
U src/external/bsd/ipf/dist/rules/example.12
U src/external/bsd/ipf/dist/rules/example.13
U src/external/bsd/ipf/dist/rules/example.2
U src/external/bsd/ipf/dist/rules/example.3
U src/external/bsd/ipf/dist/rules/example.4
U src/external/bsd/ipf/dist/rules/example.5
U src/external/bsd/ipf/dist/rules/example.6
U src/external/bsd/ipf/dist/rules/example.7
U src/external/bsd/ipf/dist/rules/example.8
U src/external/bsd/ipf/dist/rules/example.9
U src/external/bsd/ipf/dist/rules/example.sr
U src/external/bsd/ipf/dist/rules/firewall
U src/external/bsd/ipf/dist/rules/ftp-proxy
U src/external/bsd/ipf/dist/rules/ftppxy
U src/external/bsd/ipf/dist/rules/ip_rules
U src/external/bsd/ipf/dist/rules/ipmon.conf
U src/external/bsd/ipf/dist/rules/nat.eg
U src/external/bsd/ipf/dist/rules/nat-setup
U src/external/bsd/ipf/dist/rules/pool.conf
U src/external/bsd/ipf/dist/rules/server
U src/external/bsd/ipf/dist/rules/tcpstate
U src/external/bsd/ipf/dist/samples/ipfilter-pb.gif
U src/external/bsd/ipf/dist/samples/proxy.c
U src/external/bsd/ipf/dist/samples/relay.c
U src/external/bsd/ipf/dist/samples/userauth.c
U src/external/bsd/ipf/dist/tools/BNF.ipf
U src/external/bsd/ipf/dist/tools/BNF.ipnat
U src/external/bsd/ipf/dist/tools/ipf.c
U src/external/bsd/ipf/dist/tools/ipf_y.y
C src/external/bsd/ipf/dist/tools/ipfcomp.c
U src/external/bsd/ipf/dist/tools/ipfs.c
C src/external/bsd/ipf/dist/tools/ipfstat.c
U src/external/bsd/ipf/dist/tools/ipfsyncd.c
C src/external/bsd/ipf/dist/tools/ipftest.c
C src/external/bsd/ipf/dist/tools/ipmon.c
U src/external/bsd/ipf/dist/tools/ipmon_y.y
U src/external/bsd/ipf/dist/tools/ipnat.c
U src/external/bsd/ipf/dist/tools/ipnat_y.y
C src/external/bsd/ipf/dist/tools/ippool.c
U src/external/bsd/ipf/dist/tools/ippool_y.y
U src/external/bsd/ipf/dist/tools/ipscan_y.y
U src/external/bsd/ipf/dist/tools/ipsyncm.c
U src/external/bsd/ipf/dist/tools/ipsyncs.c
U src/external/bsd/ipf/dist/tools/lex_var.h
U src/external/bsd/ipf/dist/tools/lexer.c
U src/external/bsd/ipf/dist/tools/lexer.h
C src/sys/external/bsd/ipf/netinet/fil.c
C src/sys/external/bsd/ipf/netinet/ip_auth.c
C src/sys/external/bsd/ipf/netinet/ip_auth.h
C src/sys/external/bsd/ipf/netinet/ip_compat.h
C src/sys/external/bsd/ipf/netinet/ip_dns_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_dstlist.c
C src/sys/external/bsd/ipf/netinet/ip_dstlist.h
C src/sys/external/bsd/ipf/netinet/ip_fil.h
C src/sys/external/bsd/ipf/netinet/ip_fil_compat.c
C src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
C src/sys/external/bsd/ipf/netinet/ip_frag.c
C src/sys/external/bsd/ipf/netinet/ip_frag.h
C src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_htable.c
C src/sys/external/bsd/ipf/netinet/ip_htable.h
C src/sys/external/bsd/ipf/netinet/ip_ipsec_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_irc_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_log.c
C src/sys/external/bsd/ipf/netinet/ip_lookup.c
C src/sys/external/bsd/ipf/netinet/ip_lookup.h
C src/sys/external/bsd/ipf/netinet/ip_nat.c
C src/sys/external/bsd/ipf/netinet/ip_nat6.c
C src/sys/external/bsd/ipf/netinet/ip_nat.h
C src/sys/external/bsd/ipf/netinet/ip_netbios_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_pool.c
C src/sys/external/bsd/ipf/netinet/ip_pool.h
C src/sys/external/bsd/ipf/netinet/ip_pptp_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_proxy.c
C src/sys/external/bsd/ipf/netinet/ip_proxy.h
C src/sys/external/bsd/ipf/netinet/ip_raudio_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_rcmd_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_rpcb_pxy.c
C src/sys/external/bsd/ipf/netinet/ip_scan.c
C src/sys/external/bsd/ipf/netinet/ip_scan.h
C src/sys/external/bsd/ipf/netinet/ip_state.c
C src/sys/external/bsd/ipf/netinet/ip_state.h
C src/sys/external/bsd/ipf/netinet/ip_sync.c
C src/sys/external/bsd/ipf/netinet/ip_sync.h
C src/sys/external/bsd/ipf/netinet/ip_tftp_pxy.c
C src/sys/external/bsd/ipf/netinet/ipf_rb.h
C src/sys/external/bsd/ipf/netinet/ipl.h
C src/sys/external/bsd/ipf/netinet/radix_ipf.c
C src/sys/external/bsd/ipf/netinet/radix_ipf.h
C src/tests/ipf/input/f10
C src/tests/ipf/input/f1
C src/tests/ipf/input/ip2.data
C src/tests/ipf/input/f11
C src/tests/ipf/input/f12
C src/tests/ipf/input/f13
C src/tests/ipf/input/f14
C src/tests/ipf/input/f15
C src/tests/ipf/input/f16
C src/tests/ipf/input/f17
C src/tests/ipf/input/f18
C src/tests/ipf/input/f19
C src/tests/ipf/input/f2
C src/tests/ipf/input/f20
C src/tests/ipf/input/f21
C src/tests/ipf/input/f22
C src/tests/ipf/input/f24
C src/tests/ipf/input/f25
C src/tests/ipf/input/f26
C src/tests/ipf/input/f27
C src/tests/ipf/input/f28
C src/tests/ipf/input/f29
C src/tests/ipf/input/f3
C src/tests/ipf/input/f30
C src/tests/ipf/input/f4
C src/tests/ipf/input/f5
C src/tests/ipf/input/f6
C src/tests/ipf/input/f7
C src/tests/ipf/input/f8
C src/tests/ipf/input/f9
C src/tests/ipf/input/ipv6.1
C src/tests/ipf/input/ipv6.2
C src/tests/ipf/input/ipv6.3
C src/tests/ipf/input/ipv6.4
C src/tests/ipf/input/ipv6.5
C src/tests/ipf/input/p5
C src/tests/ipf/input/ipv6.6
C src/tests/ipf/input/l1
C src/tests/ipf/input/n1
C src/tests/ipf/input/n10
C src/tests/ipf/input/n100
C src/tests/ipf/input/n101
C src/tests/ipf/input/n102
C src/tests/ipf/input/n103
C src/tests/ipf/input/n104
C src/tests/ipf/input/n105
C src/tests/ipf/input/n106
C src/tests/ipf/input/n10_6
C src/tests/ipf/input/n11
C src/tests/ipf/input/n11_6
C src/tests/ipf/input/n12
C src/tests/ipf/input/n12_6
C src/tests/ipf/input/n13
C src/tests/ipf/input/n13_6
C src/tests/ipf/input/n14
C src/tests/ipf/input/n14_6
C src/tests/ipf/input/n15
C src/tests/ipf/input/n15_6
C src/tests/ipf/input/n16
C src/tests/ipf/input/n17
C src/tests/ipf/input/n17_6
C src/tests/ipf/input/n18
C src/tests/ipf/input/n1_6
C src/tests/ipf/input/n2
C src/tests/ipf/input/n200
C src/tests/ipf/input/n2_6
C src/tests/ipf/input/n3
C src/tests/ipf/input/n4
C src/tests/ipf/input/n4_6
C src/tests/ipf/input/n5
C src/tests/ipf/input/n5_6
C src/tests/ipf/input/n6
C src/tests/ipf/input/n6_6
C src/tests/ipf/input/n7
C src/tests/ipf/input/n7_6
C src/tests/ipf/input/n8
C src/tests/ipf/input/n8_6
C src/tests/ipf/input/n9
C src/tests/ipf/input/n9_6
C src/tests/ipf/input/ni1
C src/tests/ipf/input/ni10
C src/tests/ipf/input/ni11
C src/tests/ipf/input/ni12
C src/tests/ipf/input/ni13
C src/tests/ipf/input/ni14
C src/tests/ipf/input/ni15
C src/tests/ipf/input/ni16
C src/tests/ipf/input/ni17
C src/tests/ipf/input/ni18
C src/tests/ipf/input/ni19
C src/tests/ipf/input/ni2
C src/tests/ipf/input/ni20
C src/tests/ipf/input/ni21
C src/tests/ipf/input/ni23
C src/tests/ipf/input/ni3
C src/tests/ipf/input/ni4
C src/tests/ipf/input/ni5
C src/tests/ipf/input/ni6
C src/tests/ipf/input/ni7
C src/tests/ipf/input/ni8
C src/tests/ipf/input/ni9
C src/tests/ipf/input/p1
C src/tests/ipf/input/p10
C src/tests/ipf/input/p11
C src/tests/ipf/input/p12
C src/tests/ipf/input/p13
C src/tests/ipf/input/p2
C src/tests/ipf/input/p3
C src/tests/ipf/input/p4
C src/tests/ipf/input/p6
C src/tests/ipf/input/p7
C src/tests/ipf/input/p9
C src/tests/ipf/regress/f28.ipf
C src/tests/ipf/regress/bpf-f1
C src/tests/ipf/regress/bpf1
C src/tests/ipf/regress/f1
C src/tests/ipf/regress/f10
C src/tests/ipf/regress/f11
C src/tests/ipf/regress/f12
C src/tests/ipf/regress/f13
C src/tests/ipf/regress/f14
C src/tests/ipf/regress/f15
C src/tests/ipf/regress/f16
C src/tests/ipf/regress/f17
C src/tests/ipf/regress/f18
C src/tests/ipf/regress/f19
C src/tests/ipf/regress/f2
C src/tests/ipf/regress/f20
C src/tests/ipf/regress/f21
C src/tests/ipf/regress/f22
C src/tests/ipf/regress/f24
C src/tests/ipf/regress/f25
C src/tests/ipf/regress/f26
C src/tests/ipf/regress/f27
C src/tests/ipf/regress/ni1.ipf
C src/tests/ipf/regress/f28.pool
C src/tests/ipf/regress/f29.ipf
C src/tests/ipf/regress/f29.pool
C src/tests/ipf/regress/f3
C src/tests/ipf/regress/f30
C src/tests/ipf/regress/f4
C src/tests/ipf/regress/f5
C src/tests/ipf/regress/f6
C src/tests/ipf/regress/f7
C src/tests/ipf/regress/f8
C src/tests/ipf/regress/f9
C src/tests/ipf/regress/i1
C src/tests/ipf/regress/i10
C src/tests/ipf/regress/i11
C src/tests/ipf/regress/i12
C src/tests/ipf/regress/i13
C src/tests/ipf/regress/i14
C src/tests/ipf/regress/i15
C src/tests/ipf/regress/i16
C src/tests/ipf/regress/i17
C src/tests/ipf/regress/i18
C src/tests/ipf/regress/i19
C src/tests/ipf/regress/i2
C src/tests/ipf/regress/i20
C src/tests/ipf/regress/i21
C src/tests/ipf/regress/i22
C src/tests/ipf/regress/i23
C src/tests/ipf/regress/i3
C src/tests/ipf/regress/i4
C src/tests/ipf/regress/i5
C src/tests/ipf/regress/i6
C src/tests/ipf/regress/i7
C src/tests/ipf/regress/i8
C src/tests/ipf/regress/i9
C src/tests/ipf/regress/in1
C src/tests/ipf/regress/in100
C src/tests/ipf/regress/in101
C src/tests/ipf/regress/in102
C src/tests/ipf/regress/in2
C src/tests/ipf/regress/in3
C src/tests/ipf/regress/in4
C src/tests/ipf/regress/in5
C src/tests/ipf/regress/in6
C src/tests/ipf/regress/in7
C src/tests/ipf/regress/ip1
C src/tests/ipf/regress/ip2
C src/tests/ipf/regress/ip3
C src/tests/ipf/regress/ipv6.1
C src/tests/ipf/regress/ipv6.2
C src/tests/ipf/regress/ipv6.3
C src/tests/ipf/regress/ipv6.4
C src/tests/ipf/regress/ipv6.5
C src/tests/ipf/regress/l1
C src/tests/ipf/regress/ipv6.6
C src/tests/ipf/regress/n1
C src/tests/ipf/regress/n10
C src/tests/ipf/regress/n100
C src/tests/ipf/regress/n101
C src/tests/ipf/regress/n102
C src/tests/ipf/regress/n103
C src/tests/ipf/regress/n104
C src/tests/ipf/regress/n105
C src/tests/ipf/regress/n106
C src/tests/ipf/regress/n10_6
C src/tests/ipf/regress/n11
C src/tests/ipf/regress/n11_6
C src/tests/ipf/regress/n12
C src/tests/ipf/regress/n12_6
C src/tests/ipf/regress/n13
C src/tests/ipf/regress/n13_6
C src/tests/ipf/regress/n14
C src/tests/ipf/regress/n14_6
C src/tests/ipf/regress/n15
C src/tests/ipf/regress/n15_6
C src/tests/ipf/regress/n16
C src/tests/ipf/regress/n16_6
C src/tests/ipf/regress/n17
C src/tests/ipf/regress/n17_6
C src/tests/ipf/regress/n18
C src/tests/ipf/regress/n1_6
C src/tests/ipf/regress/n2
C src/tests/ipf/regress/n200
C src/tests/ipf/regress/n2_6
C src/tests/ipf/regress/n3
C src/tests/ipf/regress/n4
C src/tests/ipf/regress/n4_6
C src/tests/ipf/regress/n5
C src/tests/ipf/regress/n5_6
C src/tests/ipf/regress/n6
C src/tests/ipf/regress/n6_6
C src/tests/ipf/regress/n7
C src/tests/ipf/regress/n7_6
C src/tests/ipf/regress/n8
C src/tests/ipf/regress/n8_6
C src/tests/ipf/regress/n9
C src/tests/ipf/regress/n9_6
C src/tests/ipf/regress/ni1.nat
C src/tests/ipf/regress/ni10.ipf
C src/tests/ipf/regress/ni10.nat
C src/tests/ipf/regress/ni11.ipf
C src/tests/ipf/regress/ni11.nat
C src/tests/ipf/regress/ni12.ipf
C src/tests/ipf/regress/ni12.nat
C src/tests/ipf/regress/ni13.ipf
C src/tests/ipf/regress/ni13.nat
C src/tests/ipf/regress/ni14.ipf
C src/tests/ipf/regress/ni14.nat
C src/tests/ipf/regress/ni15.ipf
C src/tests/ipf/regress/ni15.nat
C src/tests/ipf/regress/ni16.ipf
C src/tests/ipf/regress/ni16.nat
C src/tests/ipf/regress/ni17.ipf
C src/tests/ipf/regress/ni17.nat
C src/tests/ipf/regress/ni18.ipf
C src/tests/ipf/regress/ni18.nat
C src/tests/ipf/regress/ni19.ipf
C src/tests/ipf/regress/ni19.nat
C src/tests/ipf/regress/ni2.ipf
C src/tests/ipf/regress/ni2.nat
C src/tests/ipf/regress/ni20.ipf
C src/tests/ipf/regress/ni20.nat
C src/tests/ipf/regress/ni21.ipf
C src/tests/ipf/regress/ni21.nat
C src/tests/ipf/regress/ni23.ipf
C src/tests/ipf/regress/ni23.nat
C src/tests/ipf/regress/ni3.ipf
C src/tests/ipf/regress/ni3.nat
C src/tests/ipf/regress/ni4.ipf
C src/tests/ipf/regress/ni4.nat
C src/tests/ipf/regress/ni5.ipf
C src/tests/ipf/regress/ni5.nat
C src/tests/ipf/regress/ni6.ipf
C src/tests/ipf/regress/ni6.nat
C src/tests/ipf/regress/ni7.ipf
C src/tests/ipf/regress/ni7.nat
C src/tests/ipf/regress/ni8.ipf
C src/tests/ipf/regress/ni8.nat
C src/tests/ipf/regress/ni9.ipf
C src/tests/ipf/regress/ni9.nat
C src/tests/ipf/regress/p1.ipf
C src/tests/ipf/regress/p1.pool
C src/tests/ipf/regress/p10.nat
C src/tests/ipf/regress/p10.pool
C src/tests/ipf/regress/p11.nat
C src/tests/ipf/regress/p11.pool
C src/tests/ipf/regress/p12.nat
C src/tests/ipf/regress/p12.pool
C src/tests/ipf/regress/p13.ipf
C src/tests/ipf/regress/p13.pool
C src/tests/ipf/regress/p2.ipf
C src/tests/ipf/regress/p3.ipf
C src/tests/ipf/regress/p3.pool
C src/tests/ipf/regress/p4.nat
C src/tests/ipf/regress/p4.pool
C src/tests/ipf/regress/p5.ipf
C src/tests/ipf/regress/p5.pool
C src/tests/ipf/regress/p6.ipf
C src/tests/ipf/regress/p6.pool
C src/tests/ipf/regress/p6.whois
C src/tests/ipf/regress/p7.nat
C src/tests/ipf/regress/p7.pool
C src/tests/ipf/regress/p9.nat
C src/tests/ipf/regress/p9.pool
C src/tests/ipf/expected/i19.dist
N src/tests/ipf/expected/.cvsignore
C src/tests/ipf/expected/Makefile
C src/tests/ipf/expected/bpf-f1
C src/tests/ipf/expected/bpf1
C src/tests/ipf/expected/f1
C src/tests/ipf/expected/f10
C src/tests/ipf/expected/f11
C src/tests/ipf/expected/f12
C src/tests/ipf/expected/f13
C src/tests/ipf/expected/f14
C src/tests/ipf/expected/f15
C src/tests/ipf/expected/f16
C src/tests/ipf/expected/f17
C src/tests/ipf/expected/f18
C src/tests/ipf/expected/f19
C src/tests/ipf/expected/f2
C src/tests/ipf/expected/f20
C src/tests/ipf/expected/f21
C src/tests/ipf/expected/f22
C src/tests/ipf/expected/f24
C src/tests/ipf/expected/f25
C src/tests/ipf/expected/f26
C src/tests/ipf/expected/f27
C src/tests/ipf/expected/f28
C src/tests/ipf/expected/f29
C src/tests/ipf/expected/f3
C src/tests/ipf/expected/f30
C src/tests/ipf/expected/f4
C src/tests/ipf/expected/f5
C src/tests/ipf/expected/f6
C src/tests/ipf/expected/f7
C src/tests/ipf/expected/f8
C src/tests/ipf/expected/f9
C src/tests/ipf/expected/i1
C src/tests/ipf/expected/i10
C src/tests/ipf/expected/i11
C src/tests/ipf/expected/i12
C src/tests/ipf/expected/i13
C src/tests/ipf/expected/i14
C src/tests/ipf/expected/i15
C src/tests/ipf/expected/i16
C src/tests/ipf/expected/i17
C src/tests/ipf/expected/i18
C src/tests/ipf/expected/i20
C src/tests/ipf/expected/i2
C src/tests/ipf/expected/i21
C src/tests/ipf/expected/i22
C src/tests/ipf/expected/i23
C src/tests/ipf/expected/i3
C src/tests/ipf/expected/i4
C src/tests/ipf/expected/i5
C src/tests/ipf/expected/i6
C src/tests/ipf/expected/i7
C src/tests/ipf/expected/i8
C src/tests/ipf/expected/i9
C src/tests/ipf/expected/in1
C src/tests/ipf/expected/in100
C src/tests/ipf/expected/in101
C src/tests/ipf/expected/in102
C src/tests/ipf/expected/in2
C src/tests/ipf/expected/in3
C src/tests/ipf/expected/in4
C src/tests/ipf/expected/in5
C src/tests/ipf/expected/in6
C src/tests/ipf/expected/in7
C src/tests/ipf/expected/ip1
C src/tests/ipf/expected/ip2
C src/tests/ipf/expected/ip3
C src/tests/ipf/expected/ipv6.1
C src/tests/ipf/expected/ipv6.2
C src/tests/ipf/expected/ipv6.3
C src/tests/ipf/expected/ipv6.4
C src/tests/ipf/expected/ipv6.5
C src/tests/ipf/expected/ipv6.6
C src/tests/ipf/expected/l1
C src/tests/ipf/expected/l1.b
C src/tests/ipf/expected/n1
C src/tests/ipf/expected/n10
C src/tests/ipf/expected/n100
C src/tests/ipf/expected/n101
C src/tests/ipf/expected/n102
C src/tests/ipf/expected/n103
C src/tests/ipf/expected/n104
C src/tests/ipf/expected/n105
C src/tests/ipf/expected/n106
C src/tests/ipf/expected/n11
C src/tests/ipf/expected/n11_6
C src/tests/ipf/expected/n12
C src/tests/ipf/expected/n12_6
C src/tests/ipf/expected/n13
C src/tests/ipf/expected/n13_6
C src/tests/ipf/expected/n14
C src/tests/ipf/expected/n14_6
C src/tests/ipf/expected/n15
C src/tests/ipf/expected/n15_6
C src/tests/ipf/expected/n16
C src/tests/ipf/expected/n17
C src/tests/ipf/expected/n18
C src/tests/ipf/expected/n1_6
C src/tests/ipf/expected/n2
C src/tests/ipf/expected/n200
C src/tests/ipf/expected/n2_6
C src/tests/ipf/expected/n3
C src/tests/ipf/expected/n4
C src/tests/ipf/expected/n4_6
C src/tests/ipf/expected/n5
C src/tests/ipf/expected/n5_6
C src/tests/ipf/expected/n6
C src/tests/ipf/expected/n6_6
C src/tests/ipf/expected/n7
C src/tests/ipf/expected/n7_6
C src/tests/ipf/expected/n8
C src/tests/ipf/expected/n8_6
C src/tests/ipf/expected/n9
C src/tests/ipf/expected/n9_6
C src/tests/ipf/expected/ni1
C src/tests/ipf/expected/ni10
C src/tests/ipf/expected/ni11
C src/tests/ipf/expected/ni12
C src/tests/ipf/expected/ni13
C src/tests/ipf/expected/ni14
C src/tests/ipf/expected/ni15
C src/tests/ipf/expected/ni16
C src/tests/ipf/expected/ni17
C src/tests/ipf/expected/ni18
C src/tests/ipf/expected/ni19
C src/tests/ipf/expected/ni2
C src/tests/ipf/expected/ni20
C src/tests/ipf/expected/ni21
C src/tests/ipf/expected/ni23
C src/tests/ipf/expected/ni3
C src/tests/ipf/expected/ni4
C src/tests/ipf/expected/ni5
C src/tests/ipf/expected/ni6
C src/tests/ipf/expected/ni7
C src/tests/ipf/expected/ni8
C src/tests/ipf/expected/ni9
C src/tests/ipf/expected/p1
C src/tests/ipf/expected/p10
C src/tests/ipf/expected/p11
C src/tests/ipf/expected/p12
C src/tests/ipf/expected/p13
C src/tests/ipf/expected/p2
C src/tests/ipf/expected/p3
C src/tests/ipf/expected/p4
C src/tests/ipf/expected/p5
C src/tests/ipf/expected/p6
C src/tests/ipf/expected/p7
C src/tests/ipf/expected/p9

510 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jDARRENR:yesterday -jDARRENR src