CVS commit: src/external/bsd/libpcap

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

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

Modified Files:
        src/external/bsd/libpcap/bin: Makefile
        src/external/bsd/libpcap/dist: bpf_filter.c bpf_image.c gencode.c
            gencode.h grammar.y nametoaddr.c optimize.c pcap-bpf.c
            pcap-bt-linux.c pcap-bt-monitor-linux.c pcap-common.c pcap-dag.c
            pcap-dlpi.c pcap-dos.c pcap-int.h pcap-libdlpi.c pcap-linux.c
            pcap-netfilter-linux.c pcap-null.c pcap-septel.c pcap-sita.c
            pcap-snf.c pcap-usb-linux.c pcap.3pcap.in pcap.c
            pcap_activate.3pcap pcap_breakloop.3pcap pcap_can_set_rfmon.3pcap
            pcap_create.3pcap pcap_datalink_name_to_val.3pcap
            pcap_datalink_val_to_name.3pcap pcap_dump.3pcap
            pcap_dump_file.3pcap pcap_dump_flush.3pcap pcap_dump_ftell.3pcap
            pcap_dump_open.3pcap.in pcap_file.3pcap pcap_fileno.3pcap
            pcap_findalldevs.3pcap pcap_freecode.3pcap
            pcap_get_selectable_fd.3pcap pcap_inject.3pcap
            pcap_is_swapped.3pcap pcap_lookupdev.3pcap pcap_lookupnet.3pcap
            pcap_loop.3pcap pcap_next_ex.3pcap pcap_offline_filter.3pcap
            pcap_open_live.3pcap pcap_open_offline.3pcap.in
            pcap_set_datalink.3pcap pcap_set_timeout.3pcap
            pcap_setdirection.3pcap pcap_setfilter.3pcap pcap_setnonblock.3pcap
            pcap_snapshot.3pcap pcap_stats.3pcap pcap_strerror.3pcap
            pcap_tstamp_type_name_to_val.3pcap
            pcap_tstamp_type_val_to_name.3pcap savefile.c scanner.l sf-pcap.c
            sf-pcap.h
        src/external/bsd/libpcap/dist/pcap: bpf.h pcap.h sll.h
        src/external/bsd/libpcap/include: config.h
        src/external/bsd/libpcap/lib: Makefile shlib_version
Removed Files:
        src/external/bsd/libpcap/dist: pcap_set_immediate_mode.3pcap
        src/external/bsd/libpcap/dist/doc: README.Win32
        src/external/bsd/libpcap/dist/rpcapd: log-stderr.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/bin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/bpf_filter.c \
    src/external/bsd/libpcap/dist/pcap_create.3pcap \
    src/external/bsd/libpcap/dist/pcap_dump_file.3pcap \
    src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap \
    src/external/bsd/libpcap/dist/pcap_file.3pcap \
    src/external/bsd/libpcap/dist/pcap_freecode.3pcap \
    src/external/bsd/libpcap/dist/pcap_inject.3pcap \
    src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap \
    src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap \
    src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap \
    src/external/bsd/libpcap/dist/pcap_setfilter.3pcap \
    src/external/bsd/libpcap/dist/pcap_snapshot.3pcap \
    src/external/bsd/libpcap/dist/pcap_stats.3pcap \
    src/external/bsd/libpcap/dist/pcap_strerror.3pcap \
    src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/bpf_image.c \
    src/external/bsd/libpcap/dist/nametoaddr.c \
    src/external/bsd/libpcap/dist/pcap-libdlpi.c \
    src/external/bsd/libpcap/dist/pcap-null.c \
    src/external/bsd/libpcap/dist/pcap_activate.3pcap \
    src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \
    src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \
    src/external/bsd/libpcap/dist/pcap_dump.3pcap \
    src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \
    src/external/bsd/libpcap/dist/pcap_fileno.3pcap \
    src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap \
    src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap \
    src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap \
    src/external/bsd/libpcap/dist/pcap_next_ex.3pcap \
    src/external/bsd/libpcap/dist/pcap_open_live.3pcap \
    src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap \
    src/external/bsd/libpcap/dist/pcap_setdirection.3pcap \
    src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap \
    src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/libpcap/dist/gencode.c \
    src/external/bsd/libpcap/dist/scanner.l
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/gencode.h \
    src/external/bsd/libpcap/dist/pcap-common.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libpcap/dist/grammar.y \
    src/external/bsd/libpcap/dist/pcap-bpf.c \
    src/external/bsd/libpcap/dist/pcap.3pcap.in \
    src/external/bsd/libpcap/dist/pcap.c \
    src/external/bsd/libpcap/dist/sf-pcap.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/dist/optimize.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/pcap-bt-linux.c \
    src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c \
    src/external/bsd/libpcap/dist/pcap-dag.c \
    src/external/bsd/libpcap/dist/pcap-dlpi.c \
    src/external/bsd/libpcap/dist/pcap-dos.c \
    src/external/bsd/libpcap/dist/pcap-int.h \
    src/external/bsd/libpcap/dist/pcap-linux.c \
    src/external/bsd/libpcap/dist/pcap-netfilter-linux.c \
    src/external/bsd/libpcap/dist/pcap-septel.c \
    src/external/bsd/libpcap/dist/pcap-sita.c \
    src/external/bsd/libpcap/dist/pcap-snf.c \
    src/external/bsd/libpcap/dist/pcap-usb-linux.c \
    src/external/bsd/libpcap/dist/pcap_breakloop.3pcap \
    src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \
    src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap \
    src/external/bsd/libpcap/dist/pcap_loop.3pcap \
    src/external/bsd/libpcap/dist/savefile.c
cvs rdiff -u -r1.7 -r1.8 \
    src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in \
    src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in
cvs rdiff -u -r1.3 -r0 \
    src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/sf-pcap.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/doc/README.Win32
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/dist/pcap/bpf.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libpcap/dist/pcap/pcap.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap/sll.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/rpcapd/log-stderr.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/include/config.h
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/lib/shlib_version

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