MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Date: Mon, 30 Jan 2012 16:04:14 +0000
From: "Darren Reed" <darrenr@netbsd.org>
Subject: CVS commit: src/dist/ipf
To: source-changes@NetBSD.org
Message-Id: <20120130160414.4F9EF175DD@cvs.netbsd.org>
Sender: source-changes-owner@NetBSD.org
Precedence: bulk
Reply-To: source-changes-d@NetBSD.org
Mail-Reply-To: "Darren Reed" <darrenr@netbsd.org>
Mail-Followup-To: source-changes-d@NetBSD.org

Module Name:	src
Committed By:	darrenr
Date:		Mon Jan 30 16:04:14 UTC 2012

Update of /cvsroot/src/dist/ipf
In directory ivanova.netbsd.org:/tmp/cvs-serv11061

Log Message:
Import IPFilter 5.1.1

Status:

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

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

	cvs checkout -jDARRENR:yesterday -jDARRENR src/dist/ipf