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

Module Name:	src
Committed By:	christos
Date:		Wed Mar 18 23:36:33 UTC 2026

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

Log Message:
Import libpcap-1.10.6 (previous was 1.10.5)

Tuesday, December 30, 2025 / The Tcpdump Group
  Summary for 1.10.6 libpcap release
    General:
      Fix "tcpdump -i <n>" for something-only libpcap builds.
      gencode: Fix an undefined behavior in gen_mcode().
      gencode: Add a missing free() in gen_scode().
      Remove "DLT_" from the descriptions of two dlt_choices[] entries.
      Report the size of time_t in the version string.
      Validate remote capture source strings better.
      CVE-2025-11961: Fix OOBR and OOBW in pcap_ether_aton().
    Source code:
      Remove some unneeded includes.
      pcapint_find_function() changed to return "void *" to avoid
        warnings.
      Clean up code that computes the length of a netmask.
      Mind netmap support in pcap_lib_version().
    Link-layer types:
      Add LINKTYPE_ETW/DLT_ETW.
      Add LINKTYPE_NETANALYZER_NG/DLT_NETANALYZER_NG (pull request
        #1008).
      Add LINKTYPE_ZBOSS_NCP/DLT_ZBOSS_NCP.
      Add LINKTYPE_USB_2_0_LOW_SPEED/DLT_USB_2_0_LOW_SPEED,
        LINKTYPE_USB_2_0_FULL_SPEED/DLT_USB_2_0_FULL_SPEED,
        LINKTYPE_USB_2_0_HIGH_SPEED/DLT_USB_2_0_HIGH_SPEED
      Add LINKTYPE_AUERSWALD_LOG/DLT_AUERSWALD_LOG.
      Add LINKTYPE_ZWAVE_TAP/DLT_ZWAVE_TAP.
      Add LINKTYPE_SILABS_DEBUG_CHANNEL/DLT_SILABS_DEBUG_CHANNEL.
      Add LINKTYPE_FIRA_UCI/DLT_FIRA_UCI.
      Rename LINKTYPE_IPMB_LINUX/DLT_IPMB_LINUX to
        LINKTYPE_I2C_LINUX/DLT_I2C_LINUX, as it's really just an
        encapsulation of I2C, and is also being used for HDMI DDC.
        Keep DLT_IPMB_LINUX around as a #define for backwards
        compatibility.
      Add LINKTYPE_MDB/DLT_MDB.
      Add LINKTYPE_DECT_NR/DLT_DECT_NR.
      Add LINKTYPE_EDK2_MM/DLT_EDK2_MM.
      Add LINKTYPE_DEBUG_ONLY/DLT_DEBUG_ONLY.
    Packet filtering:
      Make the chunk allocator's alignment more general and
        platform-independent.
      IEEE 802.11: Fix three undefined behaviors in grammar.y.
      Fix IPv4 multicast filtering to only include 224.0.0.0/4.
      Fix "(arp|rarp) host NAME" to ignore IPv6 quietly.
      Fix ARCnet address parsing.
    Linux:
      Fix check for mac80211 phydev.
      Don't create monitor-mode interface if we're capturing on one.
      Expand the table of DSA tag types to include all current types.
      Fix an error message when deleting a monN interface.
      Fix returning PCAP_ERROR_RFMON_NOTSUP with libnl.
      Fix the error message when capure permission is denied.
      Fix the error message if PF_PACKET sockets aren't supported.
      Fix a file descriptor leak in an error case (pull request #1537).
      Handle errors better when checking for a DSA-tagged interface.
      Use DLT_DEBUG_ONLY for DSA tags that do not [yet] have a better support.
    FreeBSD:
      Fix detection and enabling of zero-copy support.
      Fix errors in the zero-copy code.
    Solaris:
      Fix not to ignore logical interfaces in fad-gifc.c and
        fad-glifc.c.
      Fix attempts to open all-numeric device names with DLPI to
        return "no such device".
      Fix error returns and messages when an interface has no DLPI
        device.
      Return all interfaces in pcap_findalldevs() even if they can't be
        opened.
    HP-UX:
      Fix attempts to open all-numeric device names to return
        "no such device".
      Fix error message if there's no /dev/dlpi device.
      Return all interfaces in pcap_findalldevs() even if they can't be
        opened.
    Windows:
      Fix filtering for VLAN-tagged frames.
      Add support for Npcap's nanosecond-resolution time stamps in
        captures.
      CVE-2025-11964: Fix a bug in error message character encoding mapping
        from UTF-16 to UTF-8.
      Check at create time whether the NPF driver supports nanosecond
        precision.
    D-Bus:
      Fix message leak.
    Capture file writing:
      Don't close the output stream if it's stdout, just flush it.
    Documentation:
      Explicitly document that closing a pcap_t for a savefile opened
        with pcap_fopen_offline() will close the standard I/O stream.
    Building and testing:
      Makefile.in: Include instrument-functions.c in the release tarball.
      CMake: Fix libnl usage with pkg-config.
      CMake: Fix build with CMake 3.31.
      CI: Report CMake version in builds.
      CI: Visual Studio 2022 builds added, including ARM64 builds;
        Visual Studio 2015 builds dropped.
      Don't build with sslutils.c if we don't have a TLS library.
      Build on Windows with a newer version of OpenSSL.
      CMake: generalize handling of non-x86 Windows architectures.
      CI: use the -A flag for all Visual Studio generators.
      Remove the fuzzing props from the release tarball.
      Autoconf: Use AC_SYS_YEAR2038_RECOMMENDED when possible if the
        environment variable BUILD_YEAR2038 = yes (via autogen.sh)
      DPDK: don't enable it by default.
      Update Npcap SDK to 1.15.
      autogen.sh: Allow to configure Autoconf warnings.
      autogen.sh: Delete all trailing blank lines at end of configure.

Status:

Vendor Tag:	TCPDUMP
Release Tags:	libpcap-1-10-6
		
U src/external/bsd/libpcap/dist/config.h.in
U src/external/bsd/libpcap/dist/configure
U src/external/bsd/libpcap/dist/varattrs.h
U src/external/bsd/libpcap/dist/thread-local.h
U src/external/bsd/libpcap/dist/sunatmpos.h
U src/external/bsd/libpcap/dist/sslutils.h
U src/external/bsd/libpcap/dist/sslutils.c
U src/external/bsd/libpcap/dist/sockutils.h
U 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
U src/external/bsd/libpcap/dist/savefile.c
U src/external/bsd/libpcap/dist/rpcap-protocol.h
U src/external/bsd/libpcap/dist/rpcap-protocol.c
U 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
U 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
U 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
U src/external/bsd/libpcap/dist/pcap_open_live.3pcap
U src/external/bsd/libpcap/dist/pcap_open_dead.3pcap.in
U 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
U src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap
U 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
U src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap
U src/external/bsd/libpcap/dist/pcap_fileno.3pcap
C 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
C 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
C src/external/bsd/libpcap/dist/pcap_dump_close.3pcap
U 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
U src/external/bsd/libpcap/dist/pcap_create.3pcap
U src/external/bsd/libpcap/dist/pcap_compile.3pcap.in
C src/external/bsd/libpcap/dist/pcap_close.3pcap
U src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap
U src/external/bsd/libpcap/dist/pcap_breakloop.3pcap
U src/external/bsd/libpcap/dist/pcap_activate.3pcap
C src/external/bsd/libpcap/dist/pcap.c
U 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
U 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
U src/external/bsd/libpcap/dist/pcap-snoop.c
U 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
U 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
U src/external/bsd/libpcap/dist/pcap-pf.c
U src/external/bsd/libpcap/dist/pcap-null.c
U src/external/bsd/libpcap/dist/pcap-npf.c
U 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
U 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
U src/external/bsd/libpcap/dist/pcap-haiku.c
U src/external/bsd/libpcap/dist/pcap-filter.manmisc.in
U 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
U 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
U src/external/bsd/libpcap/dist/pcap-config.in
U 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
U src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c
U src/external/bsd/libpcap/dist/pcap-bt-linux.h
U 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
U 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
N src/external/bsd/libpcap/dist/instrument-functions.c
U src/external/bsd/libpcap/dist/install-sh
C src/external/bsd/libpcap/dist/ieee80211.h
U src/external/bsd/libpcap/dist/grammar.y.in
U 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
U src/external/bsd/libpcap/dist/fad-glifc.c
U 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
U src/external/bsd/libpcap/dist/etherent.c
C 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
U src/external/bsd/libpcap/dist/config.sub
U 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
U src/external/bsd/libpcap/dist/bpf_image.c
U src/external/bsd/libpcap/dist/bpf_filter.c
U src/external/bsd/libpcap/dist/bpf_dump.c
U src/external/bsd/libpcap/dist/autogen.sh
U 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
N src/external/bsd/libpcap/dist/testprogs/versiontest.c
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/rpcapd/win32-svc.h
U src/external/bsd/libpcap/dist/rpcapd/win32-svc.c
U src/external/bsd/libpcap/dist/rpcapd/[email protected]
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
U src/external/bsd/libpcap/dist/pcap/usb.h
U src/external/bsd/libpcap/dist/pcap/socket.h
U src/external/bsd/libpcap/dist/pcap/sll.h
U src/external/bsd/libpcap/dist/pcap/pcap.h
U src/external/bsd/libpcap/dist/pcap/pcap-inttypes.h
U src/external/bsd/libpcap/dist/pcap/nflog.h
U 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
U 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
U 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

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

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