CVS import: src/external/bsd/libpcap/dist

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

Module Name:    src
Committed By:   christos
Date:           Mon Sep  2 14:52:11 UTC 2024

Update of /cvsroot/src/external/bsd/libpcap/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv17316

Log Message:
Import libpcap 1.10.5, previous was 1.10.4

Friday, August 30, 2024 / The Tcpdump Group
  Summary for 1.10.5 libpcap release
    Source code:
      Spell WirelessHART details properly.
      Mark pcap_vasprintf() as printf-like.
      Finalize moving of bpf_filter.c. (GH #1166)
      Remove an unneeded argument from gen_mcode6().
      Don't do some Berkeley YACC workarounds with YACC releases not
        requiring them.
      Use correct data types rather than int in some cases.
      Squelch compiler warning in grammar.c.
      Fix findalldevtest compilation if IPv6 isn't enabled.
      Rename helper routines for pcap modules to have names beginning with
        pcapint_, to avoid namespace collisions for code linking statically
        with libpcap.
      Avoid casting hack for the Windows cleanup-on-exit routine.
      Use %zu format for one case of printing a size_t.
      Fix some Coverity errors.
      Fix availabilities of some functions to match reality.
      pcap: make the seconds and microseconds/nanoseconds fields unsigned.
      Remove the unused pcap-rpcap-int.h header file.
    Thread safety:
      Make some static variables thread-local; fixes issue #1174.
    Packet filtering:
      Improve reporting of some invalid filter expressions.
      Return an error from pcap_compile() if the scanner fails to initialize.
      Optimizer fix from Archit Shah to recompute dominators after
        moving code (#976); fixes #945 (although the resulting filter
        isn't empty).
      Optimizer fix from Archit Shah to mark value as unknown when store
        of that value is deleted (#972); fixes #143, #434, #436, #437,
        and #1076.
    Linux:
      Properly return warnings.
      Don't use DLT_LINUX_SLL2 for anything other than the "any" device.
      Avoid 32-bit unsigned integer overflow in USB captures.  Fixes
        issues #1134 and #1205.
      Fix a file descriptor leak.
      Properly report warnings about unknown ARPHRD_ types.
      Fix DLT_CAN_SOCKETCAN handling of CAN FD.
      Add CAN XL support to DLT_CAN_SOCKETCAN.
      Clean up the code that sets the "real" ("original") length for
        isochronous USB transfers.
      Avoid unnecessary blocking on recvmsg() in the Bluetooth monitor and
        Bluetoth modules.
    Solaris:
      Handle BPF returning ESRCH for unknown devices.
      List the "any" device if it's supported.
      Report {non-existent zone}/{interface} errors appropriately.
      Allow attaching to links owned by a non-global zone.  (Based on
        pull request #1202.)
      Fix AF_LINK handling on illumos.
    macOS:
      Redid the availability macros to be closer to what Apple's doing
        in recent SDKs, including tagging pcap-namedb.h routines.
      Fix the install name of the installed shared library to have a
        full path when building with CMake.
      Fix universal builds.
    Haiku:
      Convert the module to C.  Fixes issue #1114.
      Address a few compiler warnings.  Fixes issue #1114.
      Fix various build problems.  Fixes issue #1114.
      Report non-existent devices correctly.
      Fix handling of packet statistics.
      Fix packet timestamping.
      Fix packet filtering with low snaplen.
      Improve connection status reporting.
      Add support for promiscuous mode.
      Detect DLTs and loopback capture support at run time.
      Report IEEE 802.11 as PCAP_IF_WIRELESS.
    Windows:
      Fix internal handling of "not supported" error codes from NPF.
      Work around a bug in Npcap 1.00 in case of driver version mismatch.
      Don't call WSACleanup() when handling a failed WSAStartup().
    BSD, macOS, AIX, Solaris 11, Linux:
      Add a new error PCAP_ERROR_CAPTURE_NOTSUP, for use if a capture
        mechanism is not present, in the hopes that, for example,
        attempts to capture on Windows Services for Linux 1, in which
        the NT kernel attempts to simulate Linux system calls but does
        not support packet sockets, can get an error that better
        indicates the underlying problem.
    AirPcap:
      Format an error message if we run out of memory.
    nflog:
      Fix count of dropped packets.
      Make sure we don't overflow when rounding up the TLV length.
    rpcap:
      Handle routines removed in at least some OpenSSL libraries.
      CVE-2023-7256: Clean up sock_initaddress() and its callers to avoid
        double frees in some cases.
      Don't define SOCKET ourselves; instead, define PCAP_SOCKET as int
        on UN*Xes and as SOCKET on Windows.
      CVE-2024-8006: Fix pcap_findalldevs_ex() not to crash if passed a
        file:// URL with a path to a directory that cannot be opened.
    Savefiles:
      Handle DLT_/LINKTYPE_ mapping better, to handle some
        OpenBSD-specific link types better.
      Treat if_tsoffset as signed in pcapng files, as the spec says.
      Don't try to fix the "real" length for isochronous USB
        transfers if the number of USB descriptors is too large.
      Reject pcap files where one of the reserved fields in the
        "link-layer type plus other stuff" is non-zero.
    Building and testing:
      Add a configure option to help debugging (--enable-instrument-functions).
      Improved tests and error reporting for uses of pkg-config, and
        improve help message.
      Fix Haiku build.
      With CMake, install headers in CMAKE_INSTALL_INCLUDEDIR rather
        than just include.
      Build libpcap.a before building test programs.
      Print address family numerically, as well as symbolically,
        in findalldevstest.
      Fail with suggestions, rather than failing over to no capture
        support, if no capture mechanism was found.  Fixes issue #1016.
      Don't indent comments in Make, as that may cause them not to be
        recognized as comments.
      Don't check for libssl if we aren't going to use it.
      Better handle enabling and disabling of sanitizers.  Fixes issue
        #1171.
      CMakeLists.txt: Print "Symlinking: /some/path to ..." conditionally.
      Evaluate CMAKE_INSTALL_PREFIX at install time.
      cmake: Update the minimum required version to 2.8.12 (except Windows).
      cmake: suppress CMP0042 OLD deprecated warning.
      Makefile.in: Add the releasecheck target.
      Cirrus CI: Add the "make releasecheck" command in the Linux task.
      Makefile.in: Add the whitespacecheck target.
      Cirrus CI: Run the "make whitespacecheck" command in the Linux task.
      Autoconf: Update config.{guess,sub}, timestamps 2024-01-01.
      Autoconf: Update the install-sh script to the 2020-11-14.01 version.
      Compile with '-Wnull-pointer-subtraction',
        '-Wunused-but-set-parameter', and '-Wunused-but-set-variable' in
        devel mode if supported.
      Don't ignore spaces between CMAKE_C_FLAGS and DPDK_C_FLAGS with
        CMake.
      Use noreturn and __format__ with XL C 7.0 and later.
      Check for the same -W flags in autotools and CMake.
      Autoconf: Add autogen.sh, remove configure and config.h.in and put
        these generated files in the release tarball.
      Autoconf: Get the size of a time_t.
      Fix propagation of cc_werr_cflags() output.
      Makefile.in(s): Fix the depend target.
      mkdep: Exit with a non-zero status if a command fails.
      Fix HCI_CHANNEL_MONITOR detection with musl libc.
      Extend "make shellcheck" onto mkdep too.
      Add initial support for building with TinyCC.
      Address all known compiler warnings specific to illumos, Linux, NetBSD,
        Solaris and Sun C; in CI expect warnings specific to TinyCC only.
    Documentation:
      Update and fix pcap-filter man page.
      Add a README.haiku.md file.
      Document pcap-config better.
      Man page formatting and prose fixes.
      Rename doc/README.Win32.md to doc/README.windows.md.
      Update pcap-savefile man page to match the Internet-Draft for
        pcap.
      Fix CMake issues for target used by other projects.
      Explain "any" device better in pcap_open_live(3PCAP).
      Update INSTALL.md.
      Note in man pages that errbuf arguments must point to an error
        buffer.
      Note that if pcap_findalldevs() fails it sets *alldevsp to NULL;
        there's no devices list to free.
      Explain "other addresses" in pcap_findalldevs(3PCAP).
      Document pcap_lookupnet(3PCAP) a bit better.

Status:

Vendor Tag:     TCPDUMP
Release Tags:   libpcap-1-10-5
                
U src/external/bsd/libpcap/dist/config.h.in
U src/external/bsd/libpcap/dist/configure
U src/external/bsd/libpcap/dist/varattrs.h
N src/external/bsd/libpcap/dist/thread-local.h
U src/external/bsd/libpcap/dist/sunatmpos.h
U src/external/bsd/libpcap/dist/sslutils.h
C src/external/bsd/libpcap/dist/sslutils.c
U src/external/bsd/libpcap/dist/sockutils.h
C src/external/bsd/libpcap/dist/sockutils.c
U src/external/bsd/libpcap/dist/sf-pcapng.h
U src/external/bsd/libpcap/dist/sf-pcapng.c
U src/external/bsd/libpcap/dist/sf-pcap.h
C src/external/bsd/libpcap/dist/sf-pcap.c
C src/external/bsd/libpcap/dist/scanner.l
C src/external/bsd/libpcap/dist/savefile.c
U src/external/bsd/libpcap/dist/rpcap-protocol.h
C src/external/bsd/libpcap/dist/rpcap-protocol.c
C src/external/bsd/libpcap/dist/ppp.h
U src/external/bsd/libpcap/dist/portability.h
U src/external/bsd/libpcap/dist/pflog.h
U src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap
U src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap
C src/external/bsd/libpcap/dist/pcap_strerror.3pcap
U src/external/bsd/libpcap/dist/pcap_statustostr.3pcap
U src/external/bsd/libpcap/dist/pcap_stats.3pcap
U src/external/bsd/libpcap/dist/pcap_snapshot.3pcap
C src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap
U src/external/bsd/libpcap/dist/pcap_setfilter.3pcap
U src/external/bsd/libpcap/dist/pcap_setdirection.3pcap
U src/external/bsd/libpcap/dist/pcap_set_tstamp_type.3pcap.in
U src/external/bsd/libpcap/dist/pcap_set_tstamp_precision.3pcap.in
U src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap
U src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap
U src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap
U src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap
U src/external/bsd/libpcap/dist/pcap_set_protocol_linux.3pcap
U src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap.in
U src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap
U src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap
C src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in
C src/external/bsd/libpcap/dist/pcap_open_live.3pcap
U src/external/bsd/libpcap/dist/pcap_open_dead.3pcap.in
C src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap
C src/external/bsd/libpcap/dist/pcap_next_ex.3pcap
U src/external/bsd/libpcap/dist/pcap_major_version.3pcap
C src/external/bsd/libpcap/dist/pcap_loop.3pcap
C src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap
C src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap
U src/external/bsd/libpcap/dist/pcap_list_tstamp_types.3pcap.in
U src/external/bsd/libpcap/dist/pcap_lib_version.3pcap
U src/external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in
U src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap
U src/external/bsd/libpcap/dist/pcap_inject.3pcap
U src/external/bsd/libpcap/dist/pcap_init.3pcap
U src/external/bsd/libpcap/dist/pcap_geterr.3pcap
U src/external/bsd/libpcap/dist/pcap_get_tstamp_precision.3pcap.in
U src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap
U src/external/bsd/libpcap/dist/pcap_get_required_select_timeout.3pcap
U src/external/bsd/libpcap/dist/pcap_freecode.3pcap
C src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap
U src/external/bsd/libpcap/dist/pcap_fileno.3pcap
U src/external/bsd/libpcap/dist/pcap_file.3pcap
U src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in
U src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap
U src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap
U src/external/bsd/libpcap/dist/pcap.h
U src/external/bsd/libpcap/dist/pcap_dump_file.3pcap
U src/external/bsd/libpcap/dist/pcap_dump_close.3pcap
C src/external/bsd/libpcap/dist/pcap_dump.3pcap
U src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap
U src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap
U src/external/bsd/libpcap/dist/pcap_datalink.3pcap.in
C src/external/bsd/libpcap/dist/pcap_create.3pcap
U src/external/bsd/libpcap/dist/pcap_compile.3pcap.in
U src/external/bsd/libpcap/dist/pcap_close.3pcap
U src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap
C src/external/bsd/libpcap/dist/pcap_breakloop.3pcap
C src/external/bsd/libpcap/dist/pcap_activate.3pcap
C src/external/bsd/libpcap/dist/pcap.c
C src/external/bsd/libpcap/dist/pcap.3pcap.in
U src/external/bsd/libpcap/dist/pcap-util.h
U src/external/bsd/libpcap/dist/pcap-util.c
U src/external/bsd/libpcap/dist/pcap-usb-linux.h
U src/external/bsd/libpcap/dist/pcap-tc.h
C src/external/bsd/libpcap/dist/pcap-usb-linux.c
U src/external/bsd/libpcap/dist/pcap-usb-linux-common.h
U src/external/bsd/libpcap/dist/pcap-types.h
U src/external/bsd/libpcap/dist/pcap-tstamp.manmisc.in
U src/external/bsd/libpcap/dist/pcap-tc.c
C src/external/bsd/libpcap/dist/pcap-snoop.c
C src/external/bsd/libpcap/dist/pcap-snit.c
U src/external/bsd/libpcap/dist/pcap-snf.h
C src/external/bsd/libpcap/dist/pcap-snf.c
U src/external/bsd/libpcap/dist/pcap-sita.html
U src/external/bsd/libpcap/dist/pcap-sita.h
C src/external/bsd/libpcap/dist/pcap-sita.c
U src/external/bsd/libpcap/dist/pcap-septel.h
C src/external/bsd/libpcap/dist/pcap-septel.c
U src/external/bsd/libpcap/dist/pcap-savefile.manfile.in
U src/external/bsd/libpcap/dist/pcap-rpcap.h
C src/external/bsd/libpcap/dist/pcap-rpcap.c
U src/external/bsd/libpcap/dist/pcap-rdmasniff.h
U src/external/bsd/libpcap/dist/pcap-rdmasniff.c
C src/external/bsd/libpcap/dist/pcap-pf.c
C src/external/bsd/libpcap/dist/pcap-null.c
U src/external/bsd/libpcap/dist/pcap-npf.c
C src/external/bsd/libpcap/dist/pcap-nit.c
U src/external/bsd/libpcap/dist/pcap-new.c
U src/external/bsd/libpcap/dist/pcap-netmap.h
U src/external/bsd/libpcap/dist/pcap-netmap.c
U src/external/bsd/libpcap/dist/pcap-netfilter-linux.h
C src/external/bsd/libpcap/dist/pcap-netfilter-linux.c
U src/external/bsd/libpcap/dist/pcap-namedb.h
C src/external/bsd/libpcap/dist/pcap-linux.c
U src/external/bsd/libpcap/dist/pcap-linktype.manmisc.in
C src/external/bsd/libpcap/dist/pcap-libdlpi.c
C src/external/bsd/libpcap/dist/pcap-int.h
N src/external/bsd/libpcap/dist/pcap-haiku.c
U src/external/bsd/libpcap/dist/pcap-filter.manmisc.in
C src/external/bsd/libpcap/dist/pcap-enet.c
U src/external/bsd/libpcap/dist/pcap-dpdk.h
U src/external/bsd/libpcap/dist/pcap-dpdk.c
U src/external/bsd/libpcap/dist/pcap-dos.h
C src/external/bsd/libpcap/dist/pcap-dos.c
C src/external/bsd/libpcap/dist/pcap-dlpi.c
U src/external/bsd/libpcap/dist/pcap-dll.rc
U src/external/bsd/libpcap/dist/nomkdep
U src/external/bsd/libpcap/dist/pcap-dbus.h
C src/external/bsd/libpcap/dist/pcap-dbus.c
U src/external/bsd/libpcap/dist/pcap-dag.h
C src/external/bsd/libpcap/dist/pcap-dag.c
C src/external/bsd/libpcap/dist/pcap-config.in
C src/external/bsd/libpcap/dist/pcap-config.1
U src/external/bsd/libpcap/dist/pcap-common.h
C src/external/bsd/libpcap/dist/pcap-common.c
U src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h
C src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c
U src/external/bsd/libpcap/dist/pcap-bt-linux.h
C src/external/bsd/libpcap/dist/pcap-bt-linux.c
U src/external/bsd/libpcap/dist/pcap-bpf.h
C src/external/bsd/libpcap/dist/pcap-bpf.c
U src/external/bsd/libpcap/dist/pcap-airpcap.h
U src/external/bsd/libpcap/dist/pcap-airpcap.c
U src/external/bsd/libpcap/dist/org.tcpdump.chmod_bpf.plist
U src/external/bsd/libpcap/dist/optimize.h
C src/external/bsd/libpcap/dist/optimize.c
C src/external/bsd/libpcap/dist/nlpid.h
U src/external/bsd/libpcap/dist/nametoaddr.h
C src/external/bsd/libpcap/dist/nametoaddr.c
U src/external/bsd/libpcap/dist/mkdep
U src/external/bsd/libpcap/dist/llc.h
U src/external/bsd/libpcap/dist/libpcap.pc.in
U src/external/bsd/libpcap/dist/install-sh
U src/external/bsd/libpcap/dist/ieee80211.h
U src/external/bsd/libpcap/dist/grammar.y.in
C src/external/bsd/libpcap/dist/gencode.h
C src/external/bsd/libpcap/dist/gencode.c
U src/external/bsd/libpcap/dist/ftmacros.h
U src/external/bsd/libpcap/dist/fmtutils.h
U src/external/bsd/libpcap/dist/fmtutils.c
C src/external/bsd/libpcap/dist/fad-glifc.c
C src/external/bsd/libpcap/dist/fad-gifc.c
C src/external/bsd/libpcap/dist/fad-getad.c
U src/external/bsd/libpcap/dist/extract.h
U src/external/bsd/libpcap/dist/ethertype.h
C src/external/bsd/libpcap/dist/etherent.c
U src/external/bsd/libpcap/dist/dlpisubs.h
C src/external/bsd/libpcap/dist/dlpisubs.c
U src/external/bsd/libpcap/dist/diag-control.h
U src/external/bsd/libpcap/dist/configure.ac
C src/external/bsd/libpcap/dist/config.sub
C src/external/bsd/libpcap/dist/config.guess
U src/external/bsd/libpcap/dist/cmakeconfig.h.in
U src/external/bsd/libpcap/dist/cmake_uninstall.cmake.in
U src/external/bsd/libpcap/dist/chmod_bpf
U src/external/bsd/libpcap/dist/charconv.h
U src/external/bsd/libpcap/dist/charconv.c
C src/external/bsd/libpcap/dist/bpf_image.c
C src/external/bsd/libpcap/dist/bpf_filter.c
C src/external/bsd/libpcap/dist/bpf_dump.c
N src/external/bsd/libpcap/dist/autogen.sh
C src/external/bsd/libpcap/dist/atmuni31.h
U src/external/bsd/libpcap/dist/arcnet.h
U src/external/bsd/libpcap/dist/aclocal.m4
U src/external/bsd/libpcap/dist/VERSION
U src/external/bsd/libpcap/dist/TODO
U src/external/bsd/libpcap/dist/README.md
U src/external/bsd/libpcap/dist/Makefile.in
U src/external/bsd/libpcap/dist/Makefile-devel-adds
U src/external/bsd/libpcap/dist/LICENSE
U src/external/bsd/libpcap/dist/INSTALL.md
U src/external/bsd/libpcap/dist/CREDITS
U src/external/bsd/libpcap/dist/CONTRIBUTING.md
U src/external/bsd/libpcap/dist/CMakeLists.txt
U src/external/bsd/libpcap/dist/CHANGES
U src/external/bsd/libpcap/dist/tests/shb-option-too-long.pcapng
U src/external/bsd/libpcap/dist/tests/pcapng-invalid-vers-2.pcapng
U src/external/bsd/libpcap/dist/tests/pcapng-invalid-vers-1.pcapng
U src/external/bsd/libpcap/dist/tests/pcap-invalid-version-2.pcap
U src/external/bsd/libpcap/dist/tests/pcap-invalid-version-1.pcap
U src/external/bsd/libpcap/dist/testprogs/writecaptest.c
U src/external/bsd/libpcap/dist/testprogs/visopts.py
U src/external/bsd/libpcap/dist/testprogs/valgrindtest.c
U src/external/bsd/libpcap/dist/testprogs/unix.h
U src/external/bsd/libpcap/dist/testprogs/threadsignaltest.c
U src/external/bsd/libpcap/dist/testprogs/selpolltest.c
U src/external/bsd/libpcap/dist/testprogs/reactivatetest.c
U src/external/bsd/libpcap/dist/testprogs/opentest.c
U src/external/bsd/libpcap/dist/testprogs/nonblocktest.c
U src/external/bsd/libpcap/dist/testprogs/findalldevstest.c
U src/external/bsd/libpcap/dist/testprogs/findalldevstest-perf.c
U src/external/bsd/libpcap/dist/testprogs/filtertest.c
U src/external/bsd/libpcap/dist/testprogs/capturetest.c
U src/external/bsd/libpcap/dist/testprogs/can_set_rfmon_test.c
U src/external/bsd/libpcap/dist/testprogs/Makefile.in
U src/external/bsd/libpcap/dist/testprogs/CMakeLists.txt
U src/external/bsd/libpcap/dist/testprogs/fuzz/onefile.c
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_pcap.options
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_pcap.c
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_filter.options
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_filter.c
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_both.options
U src/external/bsd/libpcap/dist/testprogs/fuzz/fuzz_both.c
U src/external/bsd/libpcap/dist/testprogs/fuzz/CMakeLists.txt
U src/external/bsd/libpcap/dist/rpcapd/win32-svc.h
U src/external/bsd/libpcap/dist/rpcapd/win32-svc.c
U src/external/bsd/libpcap/dist/rpcapd/rpcapd@.service
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.xinetd.conf
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.socket
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.rc
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.manadmin.in
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.inetd.conf
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.h
U src/external/bsd/libpcap/dist/rpcapd/rpcapd.c
U src/external/bsd/libpcap/dist/rpcapd/rpcapd-config.manfile.in
U src/external/bsd/libpcap/dist/rpcapd/org.tcpdump.rpcapd.plist
U src/external/bsd/libpcap/dist/rpcapd/log.h
U src/external/bsd/libpcap/dist/rpcapd/log.c
U src/external/bsd/libpcap/dist/rpcapd/fileconf.h
U src/external/bsd/libpcap/dist/rpcapd/fileconf.c
U src/external/bsd/libpcap/dist/rpcapd/daemon.h
U src/external/bsd/libpcap/dist/rpcapd/daemon.c
U src/external/bsd/libpcap/dist/rpcapd/config_params.h
U src/external/bsd/libpcap/dist/rpcapd/Makefile.in
U src/external/bsd/libpcap/dist/rpcapd/CMakeLists.txt
U src/external/bsd/libpcap/dist/pcap/vlan.h
C src/external/bsd/libpcap/dist/pcap/usb.h
U src/external/bsd/libpcap/dist/pcap/socket.h
C src/external/bsd/libpcap/dist/pcap/sll.h
C src/external/bsd/libpcap/dist/pcap/pcap.h
U src/external/bsd/libpcap/dist/pcap/pcap-inttypes.h
C src/external/bsd/libpcap/dist/pcap/nflog.h
C src/external/bsd/libpcap/dist/pcap/namedb.h
U src/external/bsd/libpcap/dist/pcap/ipnet.h
U src/external/bsd/libpcap/dist/pcap/funcattrs.h
U src/external/bsd/libpcap/dist/pcap/dlt.h
U src/external/bsd/libpcap/dist/pcap/compiler-tests.h
U src/external/bsd/libpcap/dist/pcap/can_socketcan.h
U src/external/bsd/libpcap/dist/pcap/bpf.h
U src/external/bsd/libpcap/dist/pcap/bluetooth.h
U src/external/bsd/libpcap/dist/msdos/readme.dos
U src/external/bsd/libpcap/dist/msdos/pktdrvr.h
U src/external/bsd/libpcap/dist/msdos/pktdrvr.c
U src/external/bsd/libpcap/dist/msdos/pkt_rx1.s
U src/external/bsd/libpcap/dist/msdos/pkt_rx0.asm
U src/external/bsd/libpcap/dist/msdos/makefile.wc
U src/external/bsd/libpcap/dist/msdos/makefile.dj
U src/external/bsd/libpcap/dist/msdos/makefile
U src/external/bsd/libpcap/dist/msdos/bin2c.c
U src/external/bsd/libpcap/dist/missing/win_asprintf.c
U src/external/bsd/libpcap/dist/missing/strtok_r.c
U src/external/bsd/libpcap/dist/missing/strlcpy.c
U src/external/bsd/libpcap/dist/missing/strlcat.c
U src/external/bsd/libpcap/dist/missing/getopt.h
U src/external/bsd/libpcap/dist/missing/getopt.c
U src/external/bsd/libpcap/dist/missing/asprintf.c
U src/external/bsd/libpcap/dist/lbl/os-ultrix4.h
U src/external/bsd/libpcap/dist/lbl/os-sunos4.h
U src/external/bsd/libpcap/dist/lbl/os-solaris2.h
U src/external/bsd/libpcap/dist/lbl/os-osf5.h
U src/external/bsd/libpcap/dist/lbl/os-osf4.h
U src/external/bsd/libpcap/dist/lbl/os-hpux11.h
U src/external/bsd/libpcap/dist/lbl/os-aix7.h
U src/external/bsd/libpcap/dist/lbl/os-aix4.h
N src/external/bsd/libpcap/dist/doc/README.windows.md
U src/external/bsd/libpcap/dist/doc/README.solaris.md
U src/external/bsd/libpcap/dist/doc/README.sita
U src/external/bsd/libpcap/dist/doc/README.septel
U src/external/bsd/libpcap/dist/doc/README.macos
U src/external/bsd/libpcap/dist/doc/README.linux
U src/external/bsd/libpcap/dist/doc/README.hpux
N src/external/bsd/libpcap/dist/doc/README.haiku.md
U src/external/bsd/libpcap/dist/doc/README.dag
U src/external/bsd/libpcap/dist/doc/README.aix
U src/external/bsd/libpcap/dist/cmake/have_siocglifconf.c
U src/external/bsd/libpcap/dist/cmake/Modules/Finddpdk.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindTC.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindSNF.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindPacket.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindLFS.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindFseeko.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindDAG.cmake
U src/external/bsd/libpcap/dist/cmake/Modules/FindAirPcap.cmake
U src/external/bsd/libpcap/dist/ChmodBPF/StartupParameters.plist
U src/external/bsd/libpcap/dist/ChmodBPF/ChmodBPF

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

        cvs checkout -jTCPDUMP:yesterday -jTCPDUMP src/external/bsd/libpcap/dist