From owner-cvs-src@FreeBSD.ORG Mon Jun 4 02:49:22 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4CABF16A41F; Mon, 4 Jun 2007 02:49:22 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3C7E513C43E; Mon, 4 Jun 2007 02:49:22 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l542nMm2083610; Mon, 4 Jun 2007 02:49:22 GMT (envelope-from darrenr@repoman.freebsd.org) Received: (from darrenr@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l542nMow083603; Mon, 4 Jun 2007 02:49:22 GMT (envelope-from darrenr) Message-Id: <200706040249.l542nMow083603@repoman.freebsd.org> From: Darren Reed Date: Mon, 4 Jun 2007 02:49:21 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: DARRENR Cc: Subject: cvs commit: src/contrib/ipfilter - Imported sources X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2007 02:49:22 -0000 darrenr 2007-06-04 02:49:21 UTC FreeBSD src repository src/contrib/ipfilter - Imported sources Update of /home/ncvs/src/contrib/ipfilter In directory repoman.freebsd.org:/tmp/cvs-serv81786 Log Message: Import IPFilter 4.1.23 to vendor branch. See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13 Status: Vendor Tag: DARRENR Release Tags: v4-1-23 U src/contrib/ipfilter/IMPORTANT U src/contrib/ipfilter/BNF U src/contrib/ipfilter/mlf_rule.c U src/contrib/ipfilter/pcap-ipf.h U src/contrib/ipfilter/radix.c C src/contrib/ipfilter/bpf_filter.c U src/contrib/ipfilter/NAT.FreeBSD U src/contrib/ipfilter/ipt.h U src/contrib/ipfilter/FAQ.FreeBSD U src/contrib/ipfilter/mkfilters U src/contrib/ipfilter/STYLE.TXT U src/contrib/ipfilter/md5.c C src/contrib/ipfilter/ip_fil.c U src/contrib/ipfilter/HISTORY C src/contrib/ipfilter/Makefile U src/contrib/ipfilter/BugReport U src/contrib/ipfilter/kmem.h U src/contrib/ipfilter/opts.h U src/contrib/ipfilter/snoop.h U src/contrib/ipfilter/WhatsNew40.txt U src/contrib/ipfilter/README U src/contrib/ipfilter/md5.h U src/contrib/ipfilter/ipmon.h C src/contrib/ipfilter/radix_ipf.h U src/contrib/ipfilter/bsdinstall C src/contrib/ipfilter/ipf.h U src/contrib/ipfilter/bpf-ipf.h U src/contrib/ipfilter/mlfk_rule.c U src/contrib/ipfilter/Y2K C src/contrib/ipfilter/lib/ipft_pc.c C src/contrib/ipfilter/lib/printfr.c C src/contrib/ipfilter/lib/getport.c C src/contrib/ipfilter/lib/printsbuf.c C src/contrib/ipfilter/lib/printpoolnode.c C src/contrib/ipfilter/lib/getproto.c C src/contrib/ipfilter/lib/ionames.c C src/contrib/ipfilter/lib/facpri.c C src/contrib/ipfilter/lib/icmpcode.c N src/contrib/ipfilter/lib/printhashdata.c U src/contrib/ipfilter/lib/Makefile C src/contrib/ipfilter/lib/addicmp.c C src/contrib/ipfilter/lib/printportcmp.c C src/contrib/ipfilter/lib/v6ionames.c C src/contrib/ipfilter/lib/load_poolnode.c C src/contrib/ipfilter/lib/hostname.c N src/contrib/ipfilter/lib/alist_free.c C src/contrib/ipfilter/lib/count4bits.c C src/contrib/ipfilter/lib/load_pool.c C src/contrib/ipfilter/lib/tcpoptnames.c U src/contrib/ipfilter/lib/printproto.c C src/contrib/ipfilter/lib/kmemcpywrap.c C src/contrib/ipfilter/lib/printhashnode.c C src/contrib/ipfilter/lib/printaps.c C src/contrib/ipfilter/lib/printhostmask.c C src/contrib/ipfilter/lib/getnattype.c C src/contrib/ipfilter/lib/resetlexer.c N src/contrib/ipfilter/lib/printpooldata.c C src/contrib/ipfilter/lib/printifname.c C src/contrib/ipfilter/lib/ipft_hx.c N src/contrib/ipfilter/lib/printpool_live.c C src/contrib/ipfilter/lib/buildopts.c C src/contrib/ipfilter/lib/mutex_emul.c C src/contrib/ipfilter/lib/load_hash.c C src/contrib/ipfilter/lib/load_hashnode.c C src/contrib/ipfilter/lib/debug.c C src/contrib/ipfilter/lib/tcp_flags.c C src/contrib/ipfilter/lib/gethost.c C src/contrib/ipfilter/lib/optprint.c C src/contrib/ipfilter/lib/v6optvalue.c C src/contrib/ipfilter/lib/count6bits.c C src/contrib/ipfilter/lib/kmem.c C src/contrib/ipfilter/lib/getportproto.c C src/contrib/ipfilter/lib/fill6bits.c C src/contrib/ipfilter/lib/kvatoname.c C src/contrib/ipfilter/lib/ntomask.c C src/contrib/ipfilter/lib/printlog.c N src/contrib/ipfilter/lib/load_url.c C src/contrib/ipfilter/lib/printactivenat.c C src/contrib/ipfilter/lib/ipft_tx.c C src/contrib/ipfilter/lib/optname.c C src/contrib/ipfilter/lib/ipft_sn.c C src/contrib/ipfilter/lib/printhash.c C src/contrib/ipfilter/lib/portname.c U src/contrib/ipfilter/lib/inet_addr.c C src/contrib/ipfilter/lib/printstate.c N src/contrib/ipfilter/lib/load_http.c C src/contrib/ipfilter/lib/remove_poolnode.c C src/contrib/ipfilter/lib/remove_pool.c N src/contrib/ipfilter/lib/load_file.c C src/contrib/ipfilter/lib/printfraginfo.c C src/contrib/ipfilter/lib/optprintv6.c C src/contrib/ipfilter/lib/optvalue.c C src/contrib/ipfilter/lib/printhostmap.c N src/contrib/ipfilter/lib/printhash_live.c C src/contrib/ipfilter/lib/rwlock_emul.c C src/contrib/ipfilter/lib/facpri.h C src/contrib/ipfilter/lib/printmask.c C src/contrib/ipfilter/lib/binprint.c C src/contrib/ipfilter/lib/printpacket6.c N src/contrib/ipfilter/lib/alist_new.c C src/contrib/ipfilter/lib/checkrev.c C src/contrib/ipfilter/lib/print_toif.c C src/contrib/ipfilter/lib/kmem.h N src/contrib/ipfilter/lib/printtqtable.c C src/contrib/ipfilter/lib/ipf_dotuning.c C src/contrib/ipfilter/lib/remove_hash.c C src/contrib/ipfilter/lib/printip.c C src/contrib/ipfilter/lib/verbose.c C src/contrib/ipfilter/lib/ipft_td.c C src/contrib/ipfilter/lib/nat_setgroupmap.c C src/contrib/ipfilter/lib/addipopt.c C src/contrib/ipfilter/lib/printpool.c C src/contrib/ipfilter/lib/getsumd.c C src/contrib/ipfilter/lib/printtunable.c C src/contrib/ipfilter/lib/nametokva.c C src/contrib/ipfilter/lib/printbuf.c C src/contrib/ipfilter/lib/remove_hashnode.c C src/contrib/ipfilter/lib/flags.c C src/contrib/ipfilter/lib/initparse.c C src/contrib/ipfilter/lib/getifname.c C src/contrib/ipfilter/lib/var.c C src/contrib/ipfilter/lib/ipft_ef.c C src/contrib/ipfilter/lib/bcopywrap.c C src/contrib/ipfilter/lib/printpacket.c C src/contrib/ipfilter/lib/printnat.c C src/contrib/ipfilter/lib/tcpflags.c C src/contrib/ipfilter/lib/ipoptsec.c C src/contrib/ipfilter/iplang/iplang_y.y U src/contrib/ipfilter/iplang/Makefile U src/contrib/ipfilter/iplang/iplang_l.l U src/contrib/ipfilter/iplang/BNF U src/contrib/ipfilter/iplang/iplang.tst U src/contrib/ipfilter/iplang/iplang.h U src/contrib/ipfilter/rules/example.6 U src/contrib/ipfilter/rules/example.1 U src/contrib/ipfilter/rules/example.10 U src/contrib/ipfilter/rules/ftppxy U src/contrib/ipfilter/rules/server U src/contrib/ipfilter/rules/ipmon.conf U src/contrib/ipfilter/rules/example.5 U src/contrib/ipfilter/rules/example.8 U src/contrib/ipfilter/rules/example.2 U src/contrib/ipfilter/rules/example.13 U src/contrib/ipfilter/rules/example.sr U src/contrib/ipfilter/rules/example.11 U src/contrib/ipfilter/rules/ftp-proxy U src/contrib/ipfilter/rules/firewall U src/contrib/ipfilter/rules/BASIC_1.FW U src/contrib/ipfilter/rules/nat.eg U src/contrib/ipfilter/rules/example.7 U src/contrib/ipfilter/rules/ip_rules U src/contrib/ipfilter/rules/tcpstate U src/contrib/ipfilter/rules/BASIC_2.FW U src/contrib/ipfilter/rules/BASIC.NAT U src/contrib/ipfilter/rules/example.12 U src/contrib/ipfilter/rules/pool.conf U src/contrib/ipfilter/rules/example.3 U src/contrib/ipfilter/rules/example.9 U src/contrib/ipfilter/rules/nat-setup U src/contrib/ipfilter/rules/example.4 N src/contrib/ipfilter/BSD/ipfadm-rcd U src/contrib/ipfilter/BSD/make-devices U src/contrib/ipfilter/BSD/Makefile U src/contrib/ipfilter/BSD/Makefile.ipsend U src/contrib/ipfilter/BSD/kupgrade U src/contrib/ipfilter/etc/services U src/contrib/ipfilter/etc/protocols U src/contrib/ipfilter/perl/Isbgraph U src/contrib/ipfilter/perl/plog U src/contrib/ipfilter/perl/LICENSE U src/contrib/ipfilter/perl/logfilter.pl U src/contrib/ipfilter/perl/ipfmeta.pl U src/contrib/ipfilter/perl/ipf-mrtg.pl U src/contrib/ipfilter/perl/Services U src/contrib/ipfilter/perl/Ipfanaly.pl U src/contrib/ipfilter/ipsend/iptest.c C src/contrib/ipfilter/ipsend/arp.c U src/contrib/ipfilter/ipsend/Makefile U src/contrib/ipfilter/ipsend/tcpip.h U src/contrib/ipfilter/ipsend/README U src/contrib/ipfilter/ipsend/ipsend.h U src/contrib/ipfilter/ipsend/ip_var.h U src/contrib/ipfilter/ipsend/dltest.h U src/contrib/ipfilter/ipsend/lsock.c U src/contrib/ipfilter/ipsend/ipsend.5 C src/contrib/ipfilter/ipsend/44arp.c U src/contrib/ipfilter/ipsend/ipsend.1 U src/contrib/ipfilter/ipsend/hpux.c C src/contrib/ipfilter/ipsend/resend.c U src/contrib/ipfilter/ipsend/ipresend.c U src/contrib/ipfilter/ipsend/sirix.c U src/contrib/ipfilter/ipsend/snit.c U src/contrib/ipfilter/ipsend/ipsopt.c U src/contrib/ipfilter/ipsend/ipresend.1 U src/contrib/ipfilter/ipsend/Crashable U src/contrib/ipfilter/ipsend/dlcommon.c U src/contrib/ipfilter/ipsend/larp.c C src/contrib/ipfilter/ipsend/iptests.c U src/contrib/ipfilter/ipsend/ipsend.c C src/contrib/ipfilter/ipsend/ip.c U src/contrib/ipfilter/ipsend/sbpf.c C src/contrib/ipfilter/ipsend/sdlpi.c U src/contrib/ipfilter/ipsend/slinux.c U src/contrib/ipfilter/ipsend/sockraw.c U src/contrib/ipfilter/ipsend/iptest.1 C src/contrib/ipfilter/ipsend/sock.c U src/contrib/ipfilter/ipsend/in_var.h U src/contrib/ipfilter/ipsend/linux.h U src/contrib/ipfilter/ipsend/.OLD/ip_compat.h U src/contrib/ipfilter/ipsd/linux.h U src/contrib/ipfilter/ipsd/ipsdr.c U src/contrib/ipfilter/ipsd/sdlpi.c U src/contrib/ipfilter/ipsd/slinux.c U src/contrib/ipfilter/ipsd/ipsd.h U src/contrib/ipfilter/ipsd/sbpf.c U src/contrib/ipfilter/ipsd/ipsd.c U src/contrib/ipfilter/ipsd/README U src/contrib/ipfilter/ipsd/Makefile U src/contrib/ipfilter/ipsd/snit.c U src/contrib/ipfilter/ipsd/Celler/ip_compat.h U src/contrib/ipfilter/samples/proxy.c U src/contrib/ipfilter/samples/ipfilter-pb.gif U src/contrib/ipfilter/samples/Makefile U src/contrib/ipfilter/samples/userauth.c U src/contrib/ipfilter/samples/relay.c U src/contrib/ipfilter/man/ipnat.5 U src/contrib/ipfilter/man/ipnat.8 U src/contrib/ipfilter/man/ipfilter.5 C src/contrib/ipfilter/man/ipfstat.8 U src/contrib/ipfilter/man/ipftest.1 U src/contrib/ipfilter/man/ipscan.5 U src/contrib/ipfilter/man/ipl.4 U src/contrib/ipfilter/man/ipscan.8 U src/contrib/ipfilter/man/mkfilters.1 U src/contrib/ipfilter/man/ipf.4 U src/contrib/ipfilter/man/ipfs.8 U src/contrib/ipfilter/man/ipmon.5 U src/contrib/ipfilter/man/Makefile U src/contrib/ipfilter/man/ippool.5 U src/contrib/ipfilter/man/ipfilter.4 U src/contrib/ipfilter/man/ippool.8 U src/contrib/ipfilter/man/ipnat.4 C src/contrib/ipfilter/man/ipmon.8 U src/contrib/ipfilter/man/ipf.5 U src/contrib/ipfilter/man/ipfilter.4.mandoc C src/contrib/ipfilter/man/ipf.8 U src/contrib/ipfilter/l4check/http.ok U src/contrib/ipfilter/l4check/Makefile U src/contrib/ipfilter/l4check/l4check.c U src/contrib/ipfilter/l4check/l4check.conf U src/contrib/ipfilter/l4check/http.check U src/contrib/ipfilter/FWTK/fwtkp U src/contrib/ipfilter/FWTK/Index U src/contrib/ipfilter/FWTK/ftp-gw.diff U src/contrib/ipfilter/FWTK/fwtk_transparent.diff U src/contrib/ipfilter/FWTK/README U src/contrib/ipfilter/FWTK/README.ipfilter U src/contrib/ipfilter/test/Makefile U src/contrib/ipfilter/test/mtest U src/contrib/ipfilter/test/dotest U src/contrib/ipfilter/test/intest U src/contrib/ipfilter/test/dotest6 U src/contrib/ipfilter/test/ptest U src/contrib/ipfilter/test/mhtest U src/contrib/ipfilter/test/logtest U src/contrib/ipfilter/test/bpftest U src/contrib/ipfilter/test/vfycksum.pl U src/contrib/ipfilter/test/test.format U src/contrib/ipfilter/test/nattest U src/contrib/ipfilter/test/natipftest U src/contrib/ipfilter/test/iptest U src/contrib/ipfilter/test/hextest U src/contrib/ipfilter/test/itest U src/contrib/ipfilter/test/README.TXT U src/contrib/ipfilter/test/input/f15 U src/contrib/ipfilter/test/input/p2 U src/contrib/ipfilter/test/input/f1 U src/contrib/ipfilter/test/input/n11 U src/contrib/ipfilter/test/input/n1 U src/contrib/ipfilter/test/input/ni14 U src/contrib/ipfilter/test/input/ipv6.1 U src/contrib/ipfilter/test/input/ni13 U src/contrib/ipfilter/test/input/ni19 U src/contrib/ipfilter/test/input/n6 U src/contrib/ipfilter/test/input/ni21 U src/contrib/ipfilter/test/input/ni7 U src/contrib/ipfilter/test/input/f6 U src/contrib/ipfilter/test/input/f20 N src/contrib/ipfilter/test/input/p5 U src/contrib/ipfilter/test/input/f18 U src/contrib/ipfilter/test/input/f12 U src/contrib/ipfilter/test/input/p1 U src/contrib/ipfilter/test/input/f16 U src/contrib/ipfilter/test/input/f8 U src/contrib/ipfilter/test/input/f2 U src/contrib/ipfilter/test/input/n12 U src/contrib/ipfilter/test/input/ni9 U src/contrib/ipfilter/test/input/ni3 U src/contrib/ipfilter/test/input/ipv6.2 U src/contrib/ipfilter/test/input/ni17 U src/contrib/ipfilter/test/input/n8 U src/contrib/ipfilter/test/input/n2 U src/contrib/ipfilter/test/input/n5 N src/contrib/ipfilter/test/input/ipv6.5 U src/contrib/ipfilter/test/input/ni10 U src/contrib/ipfilter/test/input/ni4 U src/contrib/ipfilter/test/input/f5 U src/contrib/ipfilter/test/input/f11 U src/contrib/ipfilter/test/input/f7 U src/contrib/ipfilter/test/input/f13 U src/contrib/ipfilter/test/input/f19 U src/contrib/ipfilter/test/input/ni12 U src/contrib/ipfilter/test/input/n7 U src/contrib/ipfilter/test/input/ni20 U src/contrib/ipfilter/test/input/ni6 U src/contrib/ipfilter/test/input/n10 U src/contrib/ipfilter/test/input/ni1 U src/contrib/ipfilter/test/input/ni15 U src/contrib/ipfilter/test/input/l1 U src/contrib/ipfilter/test/input/f14 N src/contrib/ipfilter/test/input/ip2.data U src/contrib/ipfilter/test/input/p3 U src/contrib/ipfilter/test/input/f4 U src/contrib/ipfilter/test/input/f10 U src/contrib/ipfilter/test/input/n4 U src/contrib/ipfilter/test/input/ni11 U src/contrib/ipfilter/test/input/ni5 U src/contrib/ipfilter/test/input/n14 N src/contrib/ipfilter/test/input/ni23 U src/contrib/ipfilter/test/input/ni2 U src/contrib/ipfilter/test/input/ni8 U src/contrib/ipfilter/test/input/n13 U src/contrib/ipfilter/test/input/ipv6.3 U src/contrib/ipfilter/test/input/ni16 U src/contrib/ipfilter/test/input/n3 U src/contrib/ipfilter/test/input/n9 U src/contrib/ipfilter/test/input/f17 U src/contrib/ipfilter/test/input/f3 U src/contrib/ipfilter/test/input/f9 U src/contrib/ipfilter/test/regress/ipv6.3 U src/contrib/ipfilter/test/regress/i8 U src/contrib/ipfilter/test/regress/n5 U src/contrib/ipfilter/test/regress/i2 U src/contrib/ipfilter/test/regress/f11 U src/contrib/ipfilter/test/regress/ip1 U src/contrib/ipfilter/test/regress/in2 U src/contrib/ipfilter/test/regress/i14 U src/contrib/ipfilter/test/regress/f5 U src/contrib/ipfilter/test/regress/n12 U src/contrib/ipfilter/test/regress/ni5.ipf U src/contrib/ipfilter/test/regress/bpf1 U src/contrib/ipfilter/test/regress/ni2.ipf U src/contrib/ipfilter/test/regress/f8 U src/contrib/ipfilter/test/regress/i21 U src/contrib/ipfilter/test/regress/f2 U src/contrib/ipfilter/test/regress/ni16.nat U src/contrib/ipfilter/test/regress/i19 U src/contrib/ipfilter/test/regress/in5 U src/contrib/ipfilter/test/regress/ni11.nat U src/contrib/ipfilter/test/regress/i13 U src/contrib/ipfilter/test/regress/f16 U src/contrib/ipfilter/test/regress/ni10.ipf U src/contrib/ipfilter/test/regress/n8 U src/contrib/ipfilter/test/regress/i5 U src/contrib/ipfilter/test/regress/n2 N src/contrib/ipfilter/test/regress/ni23.nat U src/contrib/ipfilter/test/regress/ni3.nat U src/contrib/ipfilter/test/regress/ni19.ipf U src/contrib/ipfilter/test/regress/ni4.nat U src/contrib/ipfilter/test/regress/p1.ipf U src/contrib/ipfilter/test/regress/f20 U src/contrib/ipfilter/test/regress/p3.pool U src/contrib/ipfilter/test/regress/f18 N src/contrib/ipfilter/test/regress/ip2 U src/contrib/ipfilter/test/regress/f12 U src/contrib/ipfilter/test/regress/i1 U src/contrib/ipfilter/test/regress/n6 U src/contrib/ipfilter/test/regress/i17 U src/contrib/ipfilter/test/regress/in1 U src/contrib/ipfilter/test/regress/bpf-f1 U src/contrib/ipfilter/test/regress/f6 U src/contrib/ipfilter/test/regress/f1 U src/contrib/ipfilter/test/regress/ni5.nat U src/contrib/ipfilter/test/regress/ni2.nat U src/contrib/ipfilter/test/regress/n11 U src/contrib/ipfilter/test/regress/i10 U src/contrib/ipfilter/test/regress/in6 U src/contrib/ipfilter/test/regress/ni16.ipf U src/contrib/ipfilter/test/regress/ni11.ipf U src/contrib/ipfilter/test/regress/n1 U src/contrib/ipfilter/test/regress/i6 U src/contrib/ipfilter/test/regress/ni10.nat U src/contrib/ipfilter/test/regress/f15 U src/contrib/ipfilter/test/regress/ni17.nat N src/contrib/ipfilter/test/regress/ni23.ipf U src/contrib/ipfilter/test/regress/ni3.ipf U src/contrib/ipfilter/test/regress/ni19.nat U src/contrib/ipfilter/test/regress/ni4.ipf U src/contrib/ipfilter/test/regress/ni1.nat U src/contrib/ipfilter/test/regress/f17 U src/contrib/ipfilter/test/regress/n3 U src/contrib/ipfilter/test/regress/i4 U src/contrib/ipfilter/test/regress/n9 U src/contrib/ipfilter/test/regress/ni6.nat U src/contrib/ipfilter/test/regress/p3.ipf U src/contrib/ipfilter/test/regress/ni12.ipf N src/contrib/ipfilter/test/regress/ipv6.5 U src/contrib/ipfilter/test/regress/p1.pool U src/contrib/ipfilter/test/regress/ni8.nat U src/contrib/ipfilter/test/regress/ni21.nat U src/contrib/ipfilter/test/regress/ni15.ipf U src/contrib/ipfilter/test/regress/n13 U src/contrib/ipfilter/test/regress/ni20.ipf U src/contrib/ipfilter/test/regress/ni14.nat U src/contrib/ipfilter/test/regress/i20 U src/contrib/ipfilter/test/regress/f3 U src/contrib/ipfilter/test/regress/ni13.nat U src/contrib/ipfilter/test/regress/f9 U src/contrib/ipfilter/test/regress/ni9.ipf U src/contrib/ipfilter/test/regress/ni7.ipf U src/contrib/ipfilter/test/regress/i12 U src/contrib/ipfilter/test/regress/in4 N src/contrib/ipfilter/test/regress/p5.pool U src/contrib/ipfilter/test/regress/i18 U src/contrib/ipfilter/test/regress/i15 U src/contrib/ipfilter/test/regress/in3 U src/contrib/ipfilter/test/regress/f4 U src/contrib/ipfilter/test/regress/n14 U src/contrib/ipfilter/test/regress/ipv6.2 U src/contrib/ipfilter/test/regress/i3 U src/contrib/ipfilter/test/regress/n4 U src/contrib/ipfilter/test/regress/i9 U src/contrib/ipfilter/test/regress/f10 U src/contrib/ipfilter/test/regress/ni1.ipf U src/contrib/ipfilter/test/regress/i7 U src/contrib/ipfilter/test/regress/f14 U src/contrib/ipfilter/test/regress/ni6.ipf U src/contrib/ipfilter/test/regress/ni12.nat U src/contrib/ipfilter/test/regress/ni8.ipf U src/contrib/ipfilter/test/regress/ni21.ipf U src/contrib/ipfilter/test/regress/ni15.nat U src/contrib/ipfilter/test/regress/ni20.nat U src/contrib/ipfilter/test/regress/ni14.ipf U src/contrib/ipfilter/test/regress/n10 U src/contrib/ipfilter/test/regress/ni13.ipf U src/contrib/ipfilter/test/regress/ni9.nat U src/contrib/ipfilter/test/regress/l1 U src/contrib/ipfilter/test/regress/i11 U src/contrib/ipfilter/test/regress/p2.ipf U src/contrib/ipfilter/test/regress/ni7.nat N src/contrib/ipfilter/test/regress/p5.ipf U src/contrib/ipfilter/test/regress/i16 U src/contrib/ipfilter/test/regress/f7 U src/contrib/ipfilter/test/regress/ipv6.1 U src/contrib/ipfilter/test/regress/f13 U src/contrib/ipfilter/test/regress/f19 U src/contrib/ipfilter/test/regress/n7 U src/contrib/ipfilter/test/expected/ni4 U src/contrib/ipfilter/test/expected/ni19 U src/contrib/ipfilter/test/expected/ni13 U src/contrib/ipfilter/test/expected/f5 U src/contrib/ipfilter/test/expected/i14 U src/contrib/ipfilter/test/expected/in2 U src/contrib/ipfilter/test/expected/ni21 U src/contrib/ipfilter/test/expected/ip1 U src/contrib/ipfilter/test/expected/f11 U src/contrib/ipfilter/test/expected/i2 U src/contrib/ipfilter/test/expected/n5 U src/contrib/ipfilter/test/expected/i8 U src/contrib/ipfilter/test/expected/ipv6.1 U src/contrib/ipfilter/test/expected/n2 U src/contrib/ipfilter/test/expected/i5 U src/contrib/ipfilter/test/expected/n8 U src/contrib/ipfilter/test/expected/f16 U src/contrib/ipfilter/test/expected/i13 U src/contrib/ipfilter/test/expected/in5 U src/contrib/ipfilter/test/expected/i19 U src/contrib/ipfilter/test/expected/f2 U src/contrib/ipfilter/test/expected/f8 U src/contrib/ipfilter/test/expected/i21 U src/contrib/ipfilter/test/expected/ni14 U src/contrib/ipfilter/test/expected/p1 U src/contrib/ipfilter/test/expected/ni3 U src/contrib/ipfilter/test/expected/n12 U src/contrib/ipfilter/test/expected/ni9 N src/contrib/ipfilter/test/expected/p5 U src/contrib/ipfilter/test/expected/ni10 U src/contrib/ipfilter/test/expected/ni7 U src/contrib/ipfilter/test/expected/in1 U src/contrib/ipfilter/test/expected/i17 U src/contrib/ipfilter/test/expected/f6 U src/contrib/ipfilter/test/expected/f12 U src/contrib/ipfilter/test/expected/l1.b N src/contrib/ipfilter/test/expected/ip2 U src/contrib/ipfilter/test/expected/f18 U src/contrib/ipfilter/test/expected/f20 U src/contrib/ipfilter/test/expected/n6 U src/contrib/ipfilter/test/expected/i1 N src/contrib/ipfilter/test/expected/ipv6.5 U src/contrib/ipfilter/test/expected/i6 U src/contrib/ipfilter/test/expected/n1 U src/contrib/ipfilter/test/expected/ipv6.2 U src/contrib/ipfilter/test/expected/f15 U src/contrib/ipfilter/test/expected/f1 U src/contrib/ipfilter/test/expected/in6 U src/contrib/ipfilter/test/expected/i10 U src/contrib/ipfilter/test/expected/bpf1 U src/contrib/ipfilter/test/expected/n11 U src/contrib/ipfilter/test/expected/p2 U src/contrib/ipfilter/test/expected/i18 U src/contrib/ipfilter/test/expected/in4 U src/contrib/ipfilter/test/expected/i12 U src/contrib/ipfilter/test/expected/f9 U src/contrib/ipfilter/test/expected/f3 U src/contrib/ipfilter/test/expected/ni15 U src/contrib/ipfilter/test/expected/i20 U src/contrib/ipfilter/test/expected/bpf-f1 U src/contrib/ipfilter/test/expected/ni8 U src/contrib/ipfilter/test/expected/n13 U src/contrib/ipfilter/test/expected/ni2 U src/contrib/ipfilter/test/expected/n9 U src/contrib/ipfilter/test/expected/i4 U src/contrib/ipfilter/test/expected/n3 U src/contrib/ipfilter/test/expected/f17 U src/contrib/ipfilter/test/expected/f10 U src/contrib/ipfilter/test/expected/i9 U src/contrib/ipfilter/test/expected/n4 U src/contrib/ipfilter/test/expected/i3 U src/contrib/ipfilter/test/expected/n14 U src/contrib/ipfilter/test/expected/ni5 U src/contrib/ipfilter/test/expected/ni12 U src/contrib/ipfilter/test/expected/f4 U src/contrib/ipfilter/test/expected/ni20 U src/contrib/ipfilter/test/expected/in3 U src/contrib/ipfilter/test/expected/i15 U src/contrib/ipfilter/test/expected/i11 U src/contrib/ipfilter/test/expected/ni1 U src/contrib/ipfilter/test/expected/n10 U src/contrib/ipfilter/test/expected/l1 U src/contrib/ipfilter/test/expected/ni16 U src/contrib/ipfilter/test/expected/p3 U src/contrib/ipfilter/test/expected/i7 U src/contrib/ipfilter/test/expected/ipv6.3 U src/contrib/ipfilter/test/expected/f14 U src/contrib/ipfilter/test/expected/f19 U src/contrib/ipfilter/test/expected/f13 U src/contrib/ipfilter/test/expected/n7 U src/contrib/ipfilter/test/expected/ni11 U src/contrib/ipfilter/test/expected/ni6 U src/contrib/ipfilter/test/expected/i16 N src/contrib/ipfilter/test/expected/ni23 U src/contrib/ipfilter/test/expected/f7 C src/contrib/ipfilter/tools/ipfcomp.c C src/contrib/ipfilter/tools/ipsyncm.c C src/contrib/ipfilter/tools/ipftest.c C src/contrib/ipfilter/tools/ipfstat.c C src/contrib/ipfilter/tools/ipsyncs.c C src/contrib/ipfilter/tools/ipf_y.y C src/contrib/ipfilter/tools/ipfs.c C src/contrib/ipfilter/tools/ipmon_y.y C src/contrib/ipfilter/tools/ipf.c C src/contrib/ipfilter/tools/ipmon.c U src/contrib/ipfilter/tools/BNF.ipnat C src/contrib/ipfilter/tools/lexer.c C src/contrib/ipfilter/tools/ippool.c U src/contrib/ipfilter/tools/BNF.ipf C src/contrib/ipfilter/tools/ipscan_y.y C src/contrib/ipfilter/tools/ipnat_y.y C src/contrib/ipfilter/tools/lex_var.h C src/contrib/ipfilter/tools/ipnat.c U src/contrib/ipfilter/tools/Makefile C src/contrib/ipfilter/tools/ippool_y.y C src/contrib/ipfilter/tools/lexer.h 119 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/contrib/ipfilter