CVS commit: src/external/bsd/tcpdump

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Tue Oct  1 16:06:16 UTC 2019

Modified Files:
        src/external/bsd/tcpdump: tcpdump2netbsd
        src/external/bsd/tcpdump/dist: addrtoname.c config.guess config.sub
            configure netdissect.h print-802_11.c print-aoe.c print-babel.c
            print-bfd.c print-bgp.c print-bootp.c print-dccp.c print-decnet.c
            print-domain.c print-dvmrp.c print-eigrp.c print-esp.c print-fr.c
            print-hncp.c print-icmp.c print-icmp6.c print-ipnet.c
            print-isakmp.c print-juniper.c print-l2tp.c print-ldp.c print-lmp.c
            print-nfs.c print-openflow.c print-ospf.c print-ospf6.c print-ppi.c
            print-rsvp.c print-rx.c print-sflow.c print-sl.c print-sll.c
            print-smb.c print-tcp.c print-vrrp.c print-vtp.c print-wb.c
            signature.c smbutil.c tcpdump.1.in tcpdump.c util-print.c
        src/external/bsd/tcpdump/include: config.h
Removed Files:
        src/external/bsd/tcpdump/dist: configure.in
        src/external/bsd/tcpdump/dist/tests: pcap-ng-invalid-vers-1.out
            pcap-ng-invalid-vers-1.pcap pcap-ng-invalid-vers-2.out
            pcap-ng-invalid-vers-2.pcap

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/tcpdump2netbsd
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tcpdump/dist/addrtoname.c \
    src/external/bsd/tcpdump/dist/print-isakmp.c \
    src/external/bsd/tcpdump/dist/print-lmp.c \
    src/external/bsd/tcpdump/dist/print-rsvp.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/dist/config.guess \
    src/external/bsd/tcpdump/dist/config.sub
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tcpdump/dist/configure \
    src/external/bsd/tcpdump/dist/print-bgp.c \
    src/external/bsd/tcpdump/dist/print-bootp.c \
    src/external/bsd/tcpdump/dist/print-decnet.c \
    src/external/bsd/tcpdump/dist/print-eigrp.c \
    src/external/bsd/tcpdump/dist/print-esp.c \
    src/external/bsd/tcpdump/dist/print-fr.c \
    src/external/bsd/tcpdump/dist/print-icmp.c \
    src/external/bsd/tcpdump/dist/print-juniper.c \
    src/external/bsd/tcpdump/dist/print-ldp.c
cvs rdiff -u -r1.9 -r0 src/external/bsd/tcpdump/dist/configure.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tcpdump/dist/netdissect.h \
    src/external/bsd/tcpdump/dist/print-dvmrp.c \
    src/external/bsd/tcpdump/dist/print-vrrp.c \
    src/external/bsd/tcpdump/dist/smbutil.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/dist/print-802_11.c \
    src/external/bsd/tcpdump/dist/print-domain.c \
    src/external/bsd/tcpdump/dist/print-l2tp.c \
    src/external/bsd/tcpdump/dist/print-nfs.c \
    src/external/bsd/tcpdump/dist/print-ospf.c \
    src/external/bsd/tcpdump/dist/print-ospf6.c \
    src/external/bsd/tcpdump/dist/print-rx.c \
    src/external/bsd/tcpdump/dist/print-sflow.c \
    src/external/bsd/tcpdump/dist/print-sl.c \
    src/external/bsd/tcpdump/dist/print-sll.c \
    src/external/bsd/tcpdump/dist/print-tcp.c \
    src/external/bsd/tcpdump/dist/print-wb.c \
    src/external/bsd/tcpdump/dist/signature.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/dist/print-aoe.c \
    src/external/bsd/tcpdump/dist/print-vtp.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/print-babel.c \
    src/external/bsd/tcpdump/dist/print-ipnet.c \
    src/external/bsd/tcpdump/dist/print-openflow.c \
    src/external/bsd/tcpdump/dist/print-ppi.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/dist/print-bfd.c \
    src/external/bsd/tcpdump/dist/print-dccp.c \
    src/external/bsd/tcpdump/dist/print-smb.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/dist/print-hncp.c \
    src/external/bsd/tcpdump/dist/util-print.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tcpdump/dist/print-icmp6.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/dist/tcpdump.1.in
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/tcpdump/dist/tests/pcap-ng-invalid-vers-1.out \
    src/external/bsd/tcpdump/dist/tests/pcap-ng-invalid-vers-1.pcap \
    src/external/bsd/tcpdump/dist/tests/pcap-ng-invalid-vers-2.out \
    src/external/bsd/tcpdump/dist/tests/pcap-ng-invalid-vers-2.pcap
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tcpdump/include/config.h

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