CVS commit: basesrc

[Bernd Ernesti <veego%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   veego
Date:           Wed May  3 11:40:21 UTC 2000

Modified Files:
        basesrc/dist/ipf: HISTORY LICENCE Makefile facpri.c facpri.h fils.c
            ip_lfil.c ip_sfil.c ipf.c ipf.h ipft_ef.c ipft_hx.c ipft_pc.c
            ipft_sn.c ipft_td.c ipft_tx.c ipmon.c ipnat.c ipt.c ipt.h kmem.c
            kmem.h misc.c ml_ipl.c natparse.c opt.c parse.c pcap.h relay.c
            snoop.h todo
        basesrc/dist/ipf/iplang: Makefile iplang_l.l iplang_y.y
        basesrc/dist/ipf/ipsend: ipsend.c iptest.c
        basesrc/dist/ipf/man: Makefile ipf.8 ipfstat.8 ipmon.8 ipnat.5
            mkfilters.1
        basesrc/dist/ipf/perl: plog
        basesrc/dist/ipf/samples: proxy.c userauth.c
        basesrc/dist/ipf/test/expected: i3 i7 n1
        basesrc/dist/ipf/test/regress: i3 i7
Removed Files:
        basesrc/dist/ipf: mln_ipl.c
        basesrc/dist/ipf/FreeBSD-4.0: ipv6-patch kinstall unkinstall
        basesrc/dist/ipf/SunOS4: mkroutes rc.ipf reload

Log Message:
Resolve conflicts and remove some files.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/HISTORY basesrc/dist/ipf/fils.c \
    basesrc/dist/ipf/ipf.c basesrc/dist/ipf/ipmon.c basesrc/dist/ipf/parse.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/LICENCE basesrc/dist/ipf/Makefile \
    basesrc/dist/ipf/facpri.c basesrc/dist/ipf/facpri.h \
    basesrc/dist/ipf/ipf.h basesrc/dist/ipf/ipft_ef.c \
    basesrc/dist/ipf/ipft_hx.c basesrc/dist/ipf/ipft_pc.c \
    basesrc/dist/ipf/ipft_sn.c basesrc/dist/ipf/ipft_td.c \
    basesrc/dist/ipf/ipft_tx.c basesrc/dist/ipf/ipt.h basesrc/dist/ipf/kmem.c \
    basesrc/dist/ipf/kmem.h basesrc/dist/ipf/misc.c basesrc/dist/ipf/ml_ipl.c \
    basesrc/dist/ipf/natparse.c basesrc/dist/ipf/opt.c \
    basesrc/dist/ipf/pcap.h basesrc/dist/ipf/relay.c basesrc/dist/ipf/snoop.h \
    basesrc/dist/ipf/todo
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/ip_lfil.c basesrc/dist/ipf/ip_sfil.c \
    basesrc/dist/ipf/ipnat.c basesrc/dist/ipf/ipt.c
cvs rdiff -r1.1 -r0 basesrc/dist/ipf/mln_ipl.c
cvs rdiff -r1.1.1.1 -r0 basesrc/dist/ipf/FreeBSD-4.0/ipv6-patch \
    basesrc/dist/ipf/FreeBSD-4.0/kinstall \
    basesrc/dist/ipf/FreeBSD-4.0/unkinstall
cvs rdiff -r1.1.1.1 -r0 basesrc/dist/ipf/SunOS4/mkroutes \
    basesrc/dist/ipf/SunOS4/rc.ipf basesrc/dist/ipf/SunOS4/reload
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/iplang/Makefile \
    basesrc/dist/ipf/iplang/iplang_y.y
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/iplang/iplang_l.l
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/ipsend/ipsend.c \
    basesrc/dist/ipf/ipsend/iptest.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/man/Makefile \
    basesrc/dist/ipf/man/ipf.8
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/man/ipfstat.8 \
    basesrc/dist/ipf/man/ipnat.5 basesrc/dist/ipf/man/mkfilters.1
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/man/ipmon.8
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/perl/plog
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/samples/proxy.c \
    basesrc/dist/ipf/samples/userauth.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/test/expected/i3 \
    basesrc/dist/ipf/test/expected/i7 basesrc/dist/ipf/test/expected/n1
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/test/regress/i3 \
    basesrc/dist/ipf/test/regress/i7

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