CVS commit: basesrc

[Martti Kuparinen <martti%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   martti
Date:           Thu Mar 14 12:31:05 UTC 2002

Update of /cvsroot/basesrc
In directory netbsd.hut.fi:/tmp/cvs-serv17002

Log Message:
Import IPFilter 3.4.25

Status:

Vendor Tag:     DARRENR
Release Tags:   v3-4-25
                
C basesrc/dist/ipf/BNF
U basesrc/dist/ipf/BugReport
U basesrc/dist/ipf/COMPILE.2.5
U basesrc/dist/ipf/COMPILE.Solaris2
U basesrc/dist/ipf/FAQ.FreeBSD
C basesrc/dist/ipf/HISTORY
U basesrc/dist/ipf/IMPORTANT
U basesrc/dist/ipf/INST.FreeBSD-2.2
U basesrc/dist/ipf/INSTALL.BSDOS
U basesrc/dist/ipf/INSTALL.BSDOS3
U basesrc/dist/ipf/INSTALL.FreeBSD
U basesrc/dist/ipf/INSTALL.IRIX
U basesrc/dist/ipf/INSTALL.Linux
U basesrc/dist/ipf/INSTALL.NetBSD
U basesrc/dist/ipf/INSTALL.Sol2
U basesrc/dist/ipf/INSTALL.SunOS
U basesrc/dist/ipf/INSTALL.xBSD
U basesrc/dist/ipf/IPF.KANJI
U basesrc/dist/ipf/IPFILTER.LICENCE
C basesrc/dist/ipf/Makefile
U basesrc/dist/ipf/NAT.FreeBSD
U basesrc/dist/ipf/README
U basesrc/dist/ipf/UPGRADE_NOTICE
U basesrc/dist/ipf/Y2K
U basesrc/dist/ipf/bsdinstall
U basesrc/dist/ipf/buildlinux
C basesrc/dist/ipf/buildsunos
U basesrc/dist/ipf/common.c
U basesrc/dist/ipf/facpri.c
U basesrc/dist/ipf/facpri.h
C basesrc/dist/ipf/fil.c
C basesrc/dist/ipf/fils.c
C basesrc/dist/ipf/inet_addr.c
C basesrc/dist/ipf/ip_auth.c
U basesrc/dist/ipf/ip_auth.h
C basesrc/dist/ipf/ip_compat.h
C basesrc/dist/ipf/ip_fil.c
C basesrc/dist/ipf/ip_fil.h
C basesrc/dist/ipf/ip_frag.c
U basesrc/dist/ipf/ip_frag.h
C basesrc/dist/ipf/ip_ftp_pxy.c
U basesrc/dist/ipf/ip_ipsec_pxy.c
C basesrc/dist/ipf/ip_lfil.c
C basesrc/dist/ipf/ip_log.c
C basesrc/dist/ipf/ipf.c
C basesrc/dist/ipf/ip_nat.c
U basesrc/dist/ipf/ipf.h
U basesrc/dist/ipf/ip_nat.h
U basesrc/dist/ipf/ip_netbios_pxy.c
C basesrc/dist/ipf/ip_proxy.c
U basesrc/dist/ipf/ip_proxy.h
U basesrc/dist/ipf/ip_raudio_pxy.c
U basesrc/dist/ipf/ip_rcmd_pxy.c
U basesrc/dist/ipf/ip_sfil.c
C basesrc/dist/ipf/ip_state.c
C basesrc/dist/ipf/ip_state.h
U basesrc/dist/ipf/ipfs.c
C basesrc/dist/ipf/ipft_ef.c
C basesrc/dist/ipf/ipft_hx.c
C basesrc/dist/ipf/ipft_pc.c
C basesrc/dist/ipf/ipft_sn.c
C basesrc/dist/ipf/ipft_td.c
C basesrc/dist/ipf/ipft_tx.c
C basesrc/dist/ipf/ipl.h
C basesrc/dist/ipf/ipmon.c
C basesrc/dist/ipf/ipnat.c
C basesrc/dist/ipf/ipt.c
U basesrc/dist/ipf/ipt.h
C basesrc/dist/ipf/kmem.c
U basesrc/dist/ipf/kmem.h
U basesrc/dist/ipf/linux.h
C basesrc/dist/ipf/misc.c
U basesrc/dist/ipf/mkfilters
C basesrc/dist/ipf/opt.c
U basesrc/dist/ipf/ml_ipl.c
U basesrc/dist/ipf/mlf_ipl.c
U basesrc/dist/ipf/mlfk_ipl.c
C basesrc/dist/ipf/mli_ipl.c
C basesrc/dist/ipf/mln_ipl.c
U basesrc/dist/ipf/mls_ipl.c
C basesrc/dist/ipf/natparse.c
C basesrc/dist/ipf/parse.c
U basesrc/dist/ipf/pcap.h
C basesrc/dist/ipf/printnat.c
C basesrc/dist/ipf/printstate.c
U basesrc/dist/ipf/relay.c
U basesrc/dist/ipf/snoop.h
U basesrc/dist/ipf/solaris.c
U basesrc/dist/ipf/todo
U basesrc/dist/ipf/4bsd/conf.c.diffs
U basesrc/dist/ipf/4bsd/files.diffs
U basesrc/dist/ipf/4bsd/files.newconf.diffs
U basesrc/dist/ipf/4bsd/files.oldconf.diffs
U basesrc/dist/ipf/4bsd/filez.diffs
U basesrc/dist/ipf/4bsd/ip_input.c.diffs
U basesrc/dist/ipf/4bsd/ip_output.c.diffs
U basesrc/dist/ipf/4bsd/kinstall
C basesrc/dist/ipf/BSD/Makefile
U basesrc/dist/ipf/BSD/Makefile.ipsend
U basesrc/dist/ipf/BSD/kupgrade
U basesrc/dist/ipf/BSD/make-devices
U basesrc/dist/ipf/BSDOS/files.diffs
U basesrc/dist/ipf/BSDOS/ioconf.c.i386.diffs
U basesrc/dist/ipf/BSDOS/ip_input.c.diffs
U basesrc/dist/ipf/BSDOS/ip_output.c.diffs
U basesrc/dist/ipf/BSDOS/kinstall
U basesrc/dist/ipf/BSDOS3/files.diffs
U basesrc/dist/ipf/BSDOS3/in_proto.c.diffs
U basesrc/dist/ipf/BSDOS3/ioconf.c.i386.diffs
U basesrc/dist/ipf/BSDOS3/ip_input.c.diffs
U basesrc/dist/ipf/BSDOS3/ip_output.c.diffs
U basesrc/dist/ipf/BSDOS3/kinstall
U basesrc/dist/ipf/BSDOS3/unkinstall
U basesrc/dist/ipf/BSDOS3/OBJS/README
U basesrc/dist/ipf/BSDOS3/OBJS/files
U basesrc/dist/ipf/BSDOS3/OBJS/ioconf.c
U basesrc/dist/ipf/BSDOS4/files.diffs
U basesrc/dist/ipf/BSDOS4/in_proto.c.diffs
U basesrc/dist/ipf/BSDOS4/ioconf.c.i386.diffs
U basesrc/dist/ipf/BSDOS4/ip_input.c.diffs
U basesrc/dist/ipf/BSDOS4/ip_output.c.diffs
U basesrc/dist/ipf/BSDOS4/kinstall
U basesrc/dist/ipf/BSDOS4/unkinstall
U basesrc/dist/ipf/FWTK/Index
U basesrc/dist/ipf/FWTK/README
U basesrc/dist/ipf/FWTK/README.ipfilter
U basesrc/dist/ipf/FWTK/ftp-gw.diff
U basesrc/dist/ipf/FWTK/fwtk-2.1-transparency.txt
U basesrc/dist/ipf/FWTK/fwtk_transparent.diff
U basesrc/dist/ipf/FWTK/fwtkp
U basesrc/dist/ipf/FWTK/tproxy.diff
U basesrc/dist/ipf/FreeBSD/conf.c.diffs
U basesrc/dist/ipf/FreeBSD/files.diffs
U basesrc/dist/ipf/FreeBSD/files.newconf.diffs
U basesrc/dist/ipf/FreeBSD/files.oldconf.diffs
U basesrc/dist/ipf/FreeBSD/filez.diffs
U basesrc/dist/ipf/FreeBSD/in_proto.c.diffs
U basesrc/dist/ipf/FreeBSD/ip_input.c.diffs
U basesrc/dist/ipf/FreeBSD/ip_output.c.diffs
U basesrc/dist/ipf/FreeBSD/kinstall
U basesrc/dist/ipf/FreeBSD/minstall
U basesrc/dist/ipf/FreeBSD/unkinstall
U basesrc/dist/ipf/FreeBSD/unminstall
U basesrc/dist/ipf/FreeBSD-2.2/files.diffs
U basesrc/dist/ipf/FreeBSD-2.2/files.newconf.diffs
U basesrc/dist/ipf/FreeBSD-2.2/in_proto.c.diffs
U basesrc/dist/ipf/FreeBSD-2.2/ip_input.c.diffs
U basesrc/dist/ipf/FreeBSD-2.2/ip_output.c.diffs
U basesrc/dist/ipf/FreeBSD-2.2/kinstall
U basesrc/dist/ipf/FreeBSD-2.2/minstall
U basesrc/dist/ipf/FreeBSD-2.2/unkinstall
U basesrc/dist/ipf/FreeBSD-2.2/unminstall
U basesrc/dist/ipf/FreeBSD-3/INST.FreeBSD-3
U basesrc/dist/ipf/FreeBSD-3/kinstall
U basesrc/dist/ipf/FreeBSD-3/unkinstall
U basesrc/dist/ipf/FreeBSD-4.0/INST.FreeBSD-4
U basesrc/dist/ipf/FreeBSD-4.0/ipv6-patch-4.0
U basesrc/dist/ipf/FreeBSD-4.0/ipv6-patch-4.1
C basesrc/dist/ipf/FreeBSD-4.0/kinstall
U basesrc/dist/ipf/FreeBSD-4.0/unkinstall
C basesrc/dist/ipf/IRIX/Makefile
U basesrc/dist/ipf/IRIX/Makefile.ipsend
U basesrc/dist/ipf/IRIX/Makefile.ipsend.std
U basesrc/dist/ipf/IRIX/Makefile.std
U basesrc/dist/ipf/IRIX/getkflags
N basesrc/dist/ipf/IRIX/getrev
U basesrc/dist/ipf/IRIX/ipfboot
U basesrc/dist/ipf/Linux/Config.in.diff
U basesrc/dist/ipf/Linux/Makefile
U basesrc/dist/ipf/Linux/Makefile.ipsend
U basesrc/dist/ipf/Linux/ip_forward.c.diff
U basesrc/dist/ipf/Linux/ip_input.c.diff
U basesrc/dist/ipf/Linux/ip_output.c.diff
U basesrc/dist/ipf/Linux/linuxversion
U basesrc/dist/ipf/Linux/minstall
U basesrc/dist/ipf/Linux/netsyms.c.diff
U basesrc/dist/ipf/Linux/tcp_output.c.diff
U basesrc/dist/ipf/NetBSD/conf.c.diffs
U basesrc/dist/ipf/NetBSD/conf.c.old.diffs
U basesrc/dist/ipf/NetBSD/files.diffs
U basesrc/dist/ipf/NetBSD/files.newconf.diffs
U basesrc/dist/ipf/NetBSD/files.oldconf.diffs
U basesrc/dist/ipf/NetBSD/filez.diffs
U basesrc/dist/ipf/NetBSD/in_proto.c.diffs
U basesrc/dist/ipf/NetBSD/in_proto.c.old.diffs
U basesrc/dist/ipf/NetBSD/ip_input.c.diffs
U basesrc/dist/ipf/NetBSD/ip_output.c.diffs
U basesrc/dist/ipf/NetBSD/kinstall
U basesrc/dist/ipf/NetBSD/minstall
U basesrc/dist/ipf/NetBSD/unkinstall
U basesrc/dist/ipf/NetBSD/unminstall
U basesrc/dist/ipf/etc/protocols
U basesrc/dist/ipf/etc/services
U basesrc/dist/ipf/NetBSD-1.2/conf.c-PATCH
U basesrc/dist/ipf/NetBSD-1.2/files-PATCH
U basesrc/dist/ipf/NetBSD-1.2/files.oldconf-PATCH
U basesrc/dist/ipf/NetBSD-1.2/in_proto.c-PATCH
U basesrc/dist/ipf/NetBSD-1.2/ip_input.c-PATCH
U basesrc/dist/ipf/NetBSD-1.2/ip_output.c-PATCH
U basesrc/dist/ipf/NetBSD-1.2/kinstall
U basesrc/dist/ipf/NetBSD-1.2/minstall
U basesrc/dist/ipf/OpenBSD/2.9-IPv6.diffs
U basesrc/dist/ipf/OpenBSD/3.0-MAKEDEV-diffs
U basesrc/dist/ipf/OpenBSD/3.0-rc-diffs
U basesrc/dist/ipf/OpenBSD/3.0-sys-diffs
U basesrc/dist/ipf/OpenBSD/README.3_0
U basesrc/dist/ipf/OpenBSD/files.diffs
U basesrc/dist/ipf/OpenBSD/fixdist-3.0
U basesrc/dist/ipf/OpenBSD/kinstall
U basesrc/dist/ipf/OpenBSD/makedevs-3.0
U basesrc/dist/ipf/OpenBSD/mknewipf.sh
U basesrc/dist/ipf/OpenBSD/patch.1
U basesrc/dist/ipf/OpenBSD/unkinstall
C basesrc/dist/ipf/SunOS4/Makefile
U basesrc/dist/ipf/SunOS4/Makefile.ipsend
U basesrc/dist/ipf/SunOS4/conf.c.diff
U basesrc/dist/ipf/SunOS4/files.cmn.diff
U basesrc/dist/ipf/SunOS4/in_proto.c.diffs
U basesrc/dist/ipf/SunOS4/ip_input.c
U basesrc/dist/ipf/SunOS4/ip_output.c
U basesrc/dist/ipf/SunOS4/kinstall
U basesrc/dist/ipf/SunOS4/minstall
U basesrc/dist/ipf/SunOS4/mkroutes
U basesrc/dist/ipf/SunOS4/rc.ipf
U basesrc/dist/ipf/SunOS4/reload
U basesrc/dist/ipf/SunOS4/unkinstall
U basesrc/dist/ipf/SunOS4/unminstall
C basesrc/dist/ipf/SunOS5/Makefile
U basesrc/dist/ipf/SunOS5/Makefile.ipsend
U basesrc/dist/ipf/SunOS5/copyright
U basesrc/dist/ipf/SunOS5/ipf.conf
C basesrc/dist/ipf/SunOS5/ipfboot
C basesrc/dist/ipf/SunOS5/pkginfo
U basesrc/dist/ipf/SunOS5/postinstall
U basesrc/dist/ipf/SunOS5/postremove
U basesrc/dist/ipf/SunOS5/prototype
C basesrc/dist/ipf/SunOS5/prototype32
U basesrc/dist/ipf/SunOS5/prototype64
U basesrc/dist/ipf/SunOS5/solinstall
U basesrc/dist/ipf/SunOS5/system
U basesrc/dist/ipf/SunOS5/uninstall
U basesrc/dist/ipf/iplang/BNF
U basesrc/dist/ipf/iplang/Makefile
U basesrc/dist/ipf/iplang/iplang.h
U basesrc/dist/ipf/iplang/iplang.tst
U basesrc/dist/ipf/iplang/iplang_l.l
C basesrc/dist/ipf/iplang/iplang_y.y
U basesrc/dist/ipf/ipsd/Makefile
U basesrc/dist/ipf/ipsd/README
U basesrc/dist/ipf/ipsd/ipsd.c
U basesrc/dist/ipf/ipsd/ipsd.h
U basesrc/dist/ipf/ipsd/ipsdr.c
U basesrc/dist/ipf/ipsd/linux.h
U basesrc/dist/ipf/ipsd/sbpf.c
U basesrc/dist/ipf/ipsd/sdlpi.c
U basesrc/dist/ipf/ipsd/slinux.c
U basesrc/dist/ipf/ipsd/snit.c
U basesrc/dist/ipf/ipsd/Celler/ip_compat.h
C basesrc/dist/ipf/ipsend/44arp.c
U basesrc/dist/ipf/ipsend/Crashable
U basesrc/dist/ipf/ipsend/Makefile
U basesrc/dist/ipf/ipsend/README
C basesrc/dist/ipf/ipsend/arp.c
U basesrc/dist/ipf/ipsend/dlcommon.c
U basesrc/dist/ipf/ipsend/dltest.h
U basesrc/dist/ipf/ipsend/hpux.c
U basesrc/dist/ipf/ipsend/in_var.h
C basesrc/dist/ipf/ipsend/ip.c
U basesrc/dist/ipf/ipsend/ip_var.h
U basesrc/dist/ipf/ipsend/ipresend.1
C basesrc/dist/ipf/ipsend/ipresend.c
U basesrc/dist/ipf/ipsend/ipsend.1
U basesrc/dist/ipf/ipsend/ipsend.5
C basesrc/dist/ipf/ipsend/ipsend.c
U basesrc/dist/ipf/ipsend/ipsend.h
C basesrc/dist/ipf/ipsend/ipsopt.c
U basesrc/dist/ipf/ipsend/iptest.1
C basesrc/dist/ipf/ipsend/iptest.c
C basesrc/dist/ipf/ipsend/iptests.c
U basesrc/dist/ipf/ipsend/larp.c
U basesrc/dist/ipf/ipsend/linux.h
C basesrc/dist/ipf/ipsend/lsock.c
C basesrc/dist/ipf/ipsend/resend.c
U basesrc/dist/ipf/ipsend/sbpf.c
U basesrc/dist/ipf/ipsend/sdlpi.c
C basesrc/dist/ipf/ipsend/sirix.c
U basesrc/dist/ipf/ipsend/slinux.c
U basesrc/dist/ipf/ipsend/snit.c
C basesrc/dist/ipf/ipsend/sock.c
U basesrc/dist/ipf/ipsend/tcpip.h
U basesrc/dist/ipf/ipsend/ultrix.c
U basesrc/dist/ipf/ipsend/.OLD/ip_compat.h
U basesrc/dist/ipf/l4check/Makefile
U basesrc/dist/ipf/l4check/http.check
U basesrc/dist/ipf/l4check/http.ok
U basesrc/dist/ipf/l4check/l4check.c
U basesrc/dist/ipf/l4check/l4check.conf
U basesrc/dist/ipf/man/Makefile
C basesrc/dist/ipf/man/ipf.4
U basesrc/dist/ipf/man/ipf.5
U basesrc/dist/ipf/man/ipf.8
C basesrc/dist/ipf/man/ipfilter.5
U basesrc/dist/ipf/man/ipfs.8
U basesrc/dist/ipf/man/ipfstat.8
U basesrc/dist/ipf/man/ipftest.1
C basesrc/dist/ipf/man/ipl.4
C basesrc/dist/ipf/man/ipmon.8
U basesrc/dist/ipf/man/ipnat.4
U basesrc/dist/ipf/man/ipnat.5
U basesrc/dist/ipf/man/ipnat.8
U basesrc/dist/ipf/man/mkfilters.1
U basesrc/dist/ipf/perl/Ipfanaly.pl
U basesrc/dist/ipf/perl/Isbgraph
U basesrc/dist/ipf/perl/LICENSE
U basesrc/dist/ipf/perl/Services
U basesrc/dist/ipf/perl/ipf-mrtg.pl
U basesrc/dist/ipf/perl/logfilter.pl
U basesrc/dist/ipf/perl/plog
U basesrc/dist/ipf/rules/BASIC.NAT
U basesrc/dist/ipf/rules/BASIC_1.FW
U basesrc/dist/ipf/rules/BASIC_2.FW
U basesrc/dist/ipf/rules/example.1
U basesrc/dist/ipf/rules/example.10
U basesrc/dist/ipf/rules/example.11
U basesrc/dist/ipf/rules/example.12
U basesrc/dist/ipf/rules/example.13
U basesrc/dist/ipf/rules/example.2
U basesrc/dist/ipf/rules/example.3
U basesrc/dist/ipf/rules/example.4
U basesrc/dist/ipf/rules/example.5
U basesrc/dist/ipf/rules/example.6
U basesrc/dist/ipf/rules/example.7
U basesrc/dist/ipf/rules/example.8
U basesrc/dist/ipf/rules/example.9
U basesrc/dist/ipf/rules/example.sr
U basesrc/dist/ipf/rules/firewall
U basesrc/dist/ipf/rules/ftp-proxy
U basesrc/dist/ipf/rules/ftppxy
U basesrc/dist/ipf/rules/nat-setup
U basesrc/dist/ipf/rules/nat.eg
U basesrc/dist/ipf/rules/server
U basesrc/dist/ipf/rules/tcpstate
U basesrc/dist/ipf/samples/Makefile
U basesrc/dist/ipf/samples/ipfilter-pb.gif
U basesrc/dist/ipf/samples/proxy.c
U basesrc/dist/ipf/samples/userauth.c
C basesrc/dist/ipf/test/Makefile
U basesrc/dist/ipf/test/dotest
U basesrc/dist/ipf/test/hextest
U basesrc/dist/ipf/test/itest
N basesrc/dist/ipf/test/logtest
N basesrc/dist/ipf/test/mtest
U basesrc/dist/ipf/test/natipftest
U basesrc/dist/ipf/test/nattest
U basesrc/dist/ipf/test/expected/f1
U basesrc/dist/ipf/test/expected/f10
U basesrc/dist/ipf/test/expected/f11
U basesrc/dist/ipf/test/expected/f12
U basesrc/dist/ipf/test/expected/f13
U basesrc/dist/ipf/test/expected/f14
N basesrc/dist/ipf/test/expected/f15
N basesrc/dist/ipf/test/expected/f16
U basesrc/dist/ipf/test/expected/f2
U basesrc/dist/ipf/test/expected/f3
U basesrc/dist/ipf/test/expected/f4
U basesrc/dist/ipf/test/expected/f5
U basesrc/dist/ipf/test/expected/f6
U basesrc/dist/ipf/test/expected/f7
U basesrc/dist/ipf/test/expected/f8
U basesrc/dist/ipf/test/expected/f9
U basesrc/dist/ipf/test/expected/i1
U basesrc/dist/ipf/test/expected/i10
U basesrc/dist/ipf/test/expected/i11
U basesrc/dist/ipf/test/expected/i2
U basesrc/dist/ipf/test/expected/i3
U basesrc/dist/ipf/test/expected/i4
U basesrc/dist/ipf/test/expected/i5
U basesrc/dist/ipf/test/expected/i6
U basesrc/dist/ipf/test/expected/i7
U basesrc/dist/ipf/test/expected/i8
U basesrc/dist/ipf/test/expected/i9
N basesrc/dist/ipf/test/expected/l1
N basesrc/dist/ipf/test/expected/l1.b
U basesrc/dist/ipf/test/expected/n1
U basesrc/dist/ipf/test/expected/n2
U basesrc/dist/ipf/test/expected/n3
U basesrc/dist/ipf/test/expected/n4
U basesrc/dist/ipf/test/expected/n5
U basesrc/dist/ipf/test/expected/n6
U basesrc/dist/ipf/test/expected/n7
U basesrc/dist/ipf/test/expected/ni1
U basesrc/dist/ipf/test/expected/ni2
U basesrc/dist/ipf/test/input/f1
U basesrc/dist/ipf/test/input/f10
U basesrc/dist/ipf/test/input/f11
U basesrc/dist/ipf/test/input/f12
U basesrc/dist/ipf/test/input/f13
U basesrc/dist/ipf/test/input/f14
N basesrc/dist/ipf/test/input/f15
N basesrc/dist/ipf/test/input/f16
U basesrc/dist/ipf/test/input/f2
U basesrc/dist/ipf/test/input/f3
U basesrc/dist/ipf/test/input/f4
U basesrc/dist/ipf/test/input/f5
U basesrc/dist/ipf/test/input/f6
U basesrc/dist/ipf/test/input/f7
U basesrc/dist/ipf/test/input/f8
U basesrc/dist/ipf/test/input/f9
U basesrc/dist/ipf/test/input/ipf6-1
N basesrc/dist/ipf/test/input/l1
U basesrc/dist/ipf/test/input/n1
U basesrc/dist/ipf/test/input/n2
U basesrc/dist/ipf/test/input/n3
U basesrc/dist/ipf/test/input/n4
U basesrc/dist/ipf/test/input/n5
U basesrc/dist/ipf/test/input/n6
U basesrc/dist/ipf/test/input/n7
U basesrc/dist/ipf/test/input/ni1
U basesrc/dist/ipf/test/input/ni2
U basesrc/dist/ipf/test/regress/f1
U basesrc/dist/ipf/test/regress/f10
U basesrc/dist/ipf/test/regress/f11
U basesrc/dist/ipf/test/regress/f12
U basesrc/dist/ipf/test/regress/f13
U basesrc/dist/ipf/test/regress/f14
N basesrc/dist/ipf/test/regress/f15
N basesrc/dist/ipf/test/regress/f16
U basesrc/dist/ipf/test/regress/f2
U basesrc/dist/ipf/test/regress/f3
U basesrc/dist/ipf/test/regress/f4
U basesrc/dist/ipf/test/regress/f5
U basesrc/dist/ipf/test/regress/f6
U basesrc/dist/ipf/test/regress/f7
U basesrc/dist/ipf/test/regress/f8
U basesrc/dist/ipf/test/regress/f9
U basesrc/dist/ipf/test/regress/i1
U basesrc/dist/ipf/test/regress/i10
U basesrc/dist/ipf/test/regress/i11
U basesrc/dist/ipf/test/regress/i2
U basesrc/dist/ipf/test/regress/i3
U basesrc/dist/ipf/test/regress/i4
U basesrc/dist/ipf/test/regress/i5
U basesrc/dist/ipf/test/regress/i6
U basesrc/dist/ipf/test/regress/i7
U basesrc/dist/ipf/test/regress/i8
U basesrc/dist/ipf/test/regress/i9
U basesrc/dist/ipf/test/regress/ipf6-1
N basesrc/dist/ipf/test/regress/l1
U basesrc/dist/ipf/test/regress/n1
U basesrc/dist/ipf/test/regress/n2
U basesrc/dist/ipf/test/regress/n3
U basesrc/dist/ipf/test/regress/n4
U basesrc/dist/ipf/test/regress/n5
U basesrc/dist/ipf/test/regress/n6
U basesrc/dist/ipf/test/regress/n7
U basesrc/dist/ipf/test/regress/ni1.ipf
U basesrc/dist/ipf/test/regress/ni1.nat
U basesrc/dist/ipf/test/regress/ni2.ipf
U basesrc/dist/ipf/test/regress/ni2.nat

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

        cvs checkout -jDARRENR:yesterday -jDARRENR basesrc