Mon Jan 16 08:17:31 2023 UTC ()
libpcap: updated to 1.10.3

Thursday, January 12, 2023 / The Tcpdump Group
  Summary for 1.10.3 libpcap release
    Source code:
      Sort the PUBHDR variable in Makefile.in in "ls" order.
      Fix typo in comment in pflog.h.
      Remove two no-longer-present files from .gitignore.
      Update code and comments for handling failure to set promiscuous
        mode based on new information.
    Building and testing:
      install: Fixed not to install the non-public pcap-util.h header.
      pcap-config: add a --version flag.
      Makefile.in: Add some missing files in the distclean target.

Saturday, December 31, 2022 / The Tcpdump Group
  Summary for 1.10.2 libpcap release
    Source code:
      Use __builtin_unreachable() in PCAP_UNREACHABLE.
      Use AS_HELP_STRING macro instead of AC_HELP_STRING in the
        configure scripts, to avoid deprecation warnings.
      Change availability tags in pcap.h to make it easier to
        arrange for it to be used in Darwin releases.
      Use AS_HELP_STRING for --enable-remote.
      Fix some formatting string issues found by cppcheck.
      Various small code and comment cleanups.
      Use PCAP_ERROR (defined as -1) rather than explicit -1 for
        functions the documentation says return PCAP_ERROR.
      Remove unused code from the filter compiler.
      Use _declspec(deprecated(msg)) rather than __pragma(deprecated)
        for Windows deprecation warnings, so the message that was
        specified shows up.
      diag-control.h: define PCAP_DO_PRAGMA() iff we're going to use it.
      Use "%d" to print some signed ints.
      Use the Wayback Machine for a removed document in a comment.
      Add some const qualifiers.
      RDMA: Use PRIu64 to print a uint64_t.
    "Dead" pcap_ts from pcap_open_dead() and ..._with_tstamp_precision():
        Don't crash if pcap_breakloop() is called.
    Savefiles:
      Fix pcap_dispatch() to return number of packets processed, rather
        than 0, even at EOF.
      If we get an error writing the packet header, don't write the
        packet data.
      Put PFLOG UID and PID values in the header into host byte order
        when reading a LINKTYPE_PFLOG file.
      Put CAN ID field in CAN pseudo-headers for LINUX_SLL2, as we do
        for LINUX_SLL.
      Fix inorrectly-computed "real" length for isochronous USB
        transfers when reading savefiles.
      Don't crash if pcap_can_set_rfmon() is called.
      Fix pcap_offline_read() loop.
    Capture:
      Never process more than INT_MAX packets in a pcap_dispatch() call,
        to avoid integer overflow.
      Improve error messages for "no such device" and "permission
        denied" errors.
      SITA: Fix a typo in a variable name.
    Packet filtering:
      Get PFLOG header length from the length value in the header.
      Support all the direction, reason, and action types supported by
        all systems that support PFLOG.
      Don't require PFLOG support on the target machine in order to
        support PFLOG filtering.
      Expand abbreviations into "proto X" properly.
      gencode.c: Update a comment about the VLAN TPID test.
      Add the minimum and maximum matching DLTs to an error message.
    Linux:
      Fix memory leak in capture device open.
      Fix detection of CAN/CAN FD packets in direction check.
      Fix double-free crashes on errors such as running on a kernel with
        CONFIG_PACKET_MMAP not configured.
      Use DLT_CAN_SOCKETCAN for CANbus interfaces.
      Make sure the CANFD_FDF can be relied on to indicate whether a
        CANbus packet is a CAN frame or a CAN FD frame
      Improve error message for "out of memory" errors for kernel
        filters.
      Fix pcap_findalldevs() to find usbmon devices.
      Fix handling of VLAN tagged packets if the link-layer type is
        changed from DLT_LINUX_SLL to DLT_LINUX_SLL2.
      Always turn on PACKET_AUXDATA.
      We require 2.6.27 or later, so PACKET_RESERVE is available.
      Make sure there's reserved space for a DLT_LINUX_SLL2 header
        when capturing.
      Correctly compute the "real" length for isochronous USB transfers.
      Don't have an eventfd descriptor open in non-blocking mode, so as
        not to waste descriptors.
      netfilter: Squelch a narrowing warning (To be look at before 2038).
    BPF capture (*BSD, macOS, AIX, Solaris 11):
      Fix case where a device open might fail, rather than falling back
        to a smaller buffer size, when the initial buffer size is too
        big.
      Use an unsigned device number to iterate over BPF devices, to
        squelch a compiler warning.
    NetBSD:
      Fix handling of LINKTYPE_HDLC/DLT_HDLC.
    rpcap:
      Fix unaligned accesses in rpcapd.
      Fix code to process port number.
      Clean up findalldevs code in rpcapd.
      Clean up bufferizing code.
      Fix a file descriptor/handle leak in pcap_findalldevs_ex()
        (Coverity CID 1507240).
      Improve error messages for host and port resolution errors.
      Fix connect code not to fail if both IPv4 and IPv6 addresses are
        tried.
      Improve connect failure error message.
      Provide an error message for a bad authentication reply size.
      For link-layer types with host-endian fields in the header, fix
        those fields if capturing from a server with a different byte
        order.
      Suppress temporarily the warnings with "enable remote packet capture".
    Windows:
      Add support for NdisMediumIP.
      Don't require applications using pcap to be built with VS 2015 or
        later.
      Use the correct string for the DLL VersionInfo.
      Remove unnecessary DllMain() function.
      Correctly handle ERROR_INVALID_FUNCTION from
        PacketGetTimestampModes() (indicate that WinPcap or an older
        version of Npcap is probably installed).
      Fix use-after-free in some cases when a pcap_t is closed.
      Make sure an error is returned by pcap_create_interface() if
        PacketOpenAdapter() fails.
      Return an error if the driver reports 0 timestamp modes supported.
      Close the ADAPTER handle for some errors in
        pcap_create_interface().
      Get rid of old umaintained VS project files.
      Fix deprecation warning for pcap_handle().
      Npcap is now at npcap.com, not npcap.org.
      Make sure "no such device" and "no permission to open device"
        errors show up in pcap_activate(), not pcap_create() (fixes,
        among other things, tcpdump -i <interface-number>).
      npcap: squelch deprecation warnings for kernel dump mode.
    Haiku:
      Implement pcap_lib_version(), as now required.
      Handle negative or too-large snaplen values.
      Fix various build issues and warnings.
    Building and testing:
      Update configure-time universal build checks for macOS.
      Update config.guess and config.sub.
      If we look for an SSL library with pkg-config in configure script,
        try pkg-config first.
      If we have pkg-config and Homebrew, try to set pkg-config up to
        find Homebrew packages.
      Handle some Autoconf/make errors better.
      Use "git archive" for the "make releasetar" process.
      Remove the release candidate rcX targets.
      Fix compiling on Solaris 9/SPARC and 11/AMD64.
      Address assorted compiler warnings.
      Fix cross-building on Linux for Windows with mingw32 for Win64
      Properly set installation directory on Windows when not compiling
        with MSVC.
      Fix configure script checks for compiler flags.
      Give more details if check for usable (F)Lex fails.
      Fix compiling with GCC 4.6.4.
      Don't use add_compile_options() with CMake, as we currently don't
        require 2.8.12, where it first appeared.
      Don't provide -L/usr/lib for pkg-config --libs in pkg-config.
      Fix error message for inadequate Bison/Berkeley YACC.
      configure: correctly do some DPDK checks.
      Only use pkg-config when checking for DPDK.
      Allow the path in which DPDK is installed to be specified.
      Use pkg-config first when checking for libibverbs.
      CMake: fix check for libibverbs with Sun's C compiler.
      Have CMake warn if no capture mechanism can be found.
      Don't do stuff requiring 3.19 or later on earlier CMakes.
      Squelch some CMake warnings.
      Fix diag-control.h to handle compiling with clang-cl.
      Cleanup various leftover cruft in the configure script.
      Fix building without protochain support.
      Check for a usable YACC (or Bison) and {F}lex in CMake, as we do
        in autotools.
      Only check for a C++ compiler on Haiku, as that's the only
        platform with C++ code, and make sure they generate code for
        the same instruction set bit-width (both 32-bit or both 64-bit)
      On Solaris, check the target bit-width and set PKG_CONFIG_PATH
        appropriately, to handle the mess that is the D-Bus library
        package.
      Fix generation of pcap-config and libpcap.pc files.
      pcap-config: don't assume the system library directory is /usr/lib.
      pcap-config: add a --static-pcap-only flag.
      Cirrus CI: Use the same configuration as for the main branch.
      Add four libpcap test files.
      Update Npcap SDK to 1.13.
      Makefile.in: Use TEST_DIST, like for tcpdump.
      Remove awk code from mkdep.
      Cirrus CI: Add the libssl-dev package in the Linux task.
      Cirrus CI: Add the openssl@3 brew package in the macOS task.
      Get "make shellcheck" to pass again.
      CMake: Build valgrindtest only if Autoconf would.
      CMake: use ${CMAKE_INSTALL_SBINDIR} rather than just sbin.
      CMake: use NUL: as the null device on Windows.
      autoconf: fix typo in test of macOS version.
      Makefile.in: Add two missing files in EXTRA_DIST.
      autotools, cmake: provide an rpath option if necessary.
      configure: get rid of the attempt to auto-run PKG_PROG_PKG_CONFIG.
      configure: use PKG_CHECK_MODULES to run pkg-config.
    Documentation:
      Add README.solaris.md.
      Add SCTP to pcap-filter(7).
      Note that = and == are the same operator in filters.
      Update INSTALL.md, README.md, and README.solaris.md.
      Update and clean up CONTRIBUTING.md.
      Trim documentation of support for now-dead UN*Xe and older
        versions of other UN*Xes.
      Move the "how to allocate a LINKTYPE_/DLT_ value" documentation to
        the web site.
      Clean up man pages.
      Move README.capture-module to the web site.
      Improve some protocol details in pcap-filter(7).
      Refine "relop" notes in pcap-filter(7).
      In pcap-filter(7) "domain" is an id.
      Discuss backward compatibility in pcap-filter(7).
      Other improvements to pcap-filter(7).
      Document pcap_breakloop(3PCAP) interaction with threads better.
      Document PCAP_ERROR_NOT_ACTIVATED for more routines.


(adam)
diff -r1.67 -r1.68 pkgsrc/net/libpcap/Makefile
diff -r1.19 -r1.20 pkgsrc/net/libpcap/builtin.mk
diff -r1.39 -r1.40 pkgsrc/net/libpcap/distinfo
diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-Makefile.in
diff -r1.7 -r1.8 pkgsrc/net/libpcap/patches/patch-configure

cvs diff -r1.67 -r1.68 pkgsrc/net/libpcap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libpcap/Makefile 2021/11/16 16:18:48 1.67
+++ pkgsrc/net/libpcap/Makefile 2023/01/16 08:17:30 1.68
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.67 2021/11/16 16:18:48 adam Exp $ 1# $NetBSD: Makefile,v 1.68 2023/01/16 08:17:30 adam Exp $
2 2
3DISTNAME= libpcap-1.10.1 3DISTNAME= libpcap-1.10.3
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://www.tcpdump.org/release/ 5MASTER_SITES= https://www.tcpdump.org/release/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.tcpdump.org/ 8HOMEPAGE= https://www.tcpdump.org/
9COMMENT= System-independent interface for user-level packet capture 9COMMENT= System-independent interface for user-level packet capture
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access 12NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= bison flex gm4 15USE_TOOLS+= bison flex gm4
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes

cvs diff -r1.19 -r1.20 pkgsrc/net/libpcap/builtin.mk (expand / switch to unified diff)

--- pkgsrc/net/libpcap/builtin.mk 2019/11/03 11:45:40 1.19
+++ pkgsrc/net/libpcap/builtin.mk 2023/01/16 08:17:30 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.19 2019/11/03 11:45:40 rillig Exp $ 1# $NetBSD: builtin.mk,v 1.20 2023/01/16 08:17:30 adam Exp $
2 2
3BUILTIN_PKG:= libpcap 3BUILTIN_PKG:= libpcap
4 4
5.include "../../mk/bsd.fast.prefs.mk" 5.include "../../mk/bsd.fast.prefs.mk"
6 6
7BUILTIN_FIND_HEADERS_VAR:= H_LIBPCAP 7BUILTIN_FIND_HEADERS_VAR:= H_LIBPCAP
8BUILTIN_FIND_HEADERS.H_LIBPCAP= pcap/pcap.h 8BUILTIN_FIND_HEADERS.H_LIBPCAP= pcap/pcap.h
9BUILTIN_FIND_HEADERS.H_LIBPCAP+= pcap.h 9BUILTIN_FIND_HEADERS.H_LIBPCAP+= pcap.h
10 10
11.include "../../mk/buildlink3/bsd.builtin.mk" 11.include "../../mk/buildlink3/bsd.builtin.mk"
12 12
13### 13###
14### Determine if there is a built-in implementation of the package and 14### Determine if there is a built-in implementation of the package and
@@ -17,27 +17,27 @@ BUILTIN_FIND_HEADERS.H_LIBPCAP+= pcap.h @@ -17,27 +17,27 @@ BUILTIN_FIND_HEADERS.H_LIBPCAP+= pcap.h
17.if !defined(IS_BUILTIN.libpcap) 17.if !defined(IS_BUILTIN.libpcap)
18IS_BUILTIN.libpcap= no 18IS_BUILTIN.libpcap= no
19. if empty(H_LIBPCAP:M__nonexistent__) && empty(H_LIBPCAP:M${LOCALBASE}/*) 19. if empty(H_LIBPCAP:M__nonexistent__) && empty(H_LIBPCAP:M${LOCALBASE}/*)
20IS_BUILTIN.libpcap= yes 20IS_BUILTIN.libpcap= yes
21. endif 21. endif
22.endif 22.endif
23MAKEVARS+= IS_BUILTIN.libpcap 23MAKEVARS+= IS_BUILTIN.libpcap
24 24
25### 25###
26### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 26### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
27### a package name to represent the built-in package. 27### a package name to represent the built-in package.
28### 28###
29.if !defined(BUILTIN_PKG.libpcap) && \ 29.if !defined(BUILTIN_PKG.libpcap) && \
30 !empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) && \ 30 ${IS_BUILTIN.libpcap:tl} == yes && \
31 empty(H_LIBPCAP:M__nonexistent__) 31 empty(H_LIBPCAP:M__nonexistent__)
32_BLTN_PCAP_111!= \ 32_BLTN_PCAP_111!= \
33 ${GREP} -c PCAP_NETMASK_UNKNOWN ${H_LIBPCAP} || ${TRUE} 33 ${GREP} -c PCAP_NETMASK_UNKNOWN ${H_LIBPCAP} || ${TRUE}
34_BLTN_PCAP_100!= \ 34_BLTN_PCAP_100!= \
35 ${GREP} -c pcap_offline_filter ${H_LIBPCAP} || ${TRUE} 35 ${GREP} -c pcap_offline_filter ${H_LIBPCAP} || ${TRUE}
36# libpcap>=0.9.3: pcap_setdirection added (don't use pcap_inject, this 36# libpcap>=0.9.3: pcap_setdirection added (don't use pcap_inject, this
37# was hacked into the NetBSD version of 0.8.3) 37# was hacked into the NetBSD version of 0.8.3)
38_BLTN_PCAP_093!= \ 38_BLTN_PCAP_093!= \
39 ${GREP} -c pcap_setdirection ${H_LIBPCAP} || ${TRUE} 39 ${GREP} -c pcap_setdirection ${H_LIBPCAP} || ${TRUE}
40# libpcap>=0.8.3: MODE_MON added 40# libpcap>=0.8.3: MODE_MON added
41_BLTN_PCAP_083!= \ 41_BLTN_PCAP_083!= \
42 ${GREP} -c MODE_MON ${H_LIBPCAP} || ${TRUE} 42 ${GREP} -c MODE_MON ${H_LIBPCAP} || ${TRUE}
43# libpcap>=0.8.1: pcap_get_selectable_fd added 43# libpcap>=0.8.1: pcap_get_selectable_fd added
@@ -81,29 +81,29 @@ BUILTIN_PKG.libpcap= libpcap-${BUILTIN_ @@ -81,29 +81,29 @@ BUILTIN_PKG.libpcap= libpcap-${BUILTIN_
81.endif 81.endif
82MAKEVARS+= BUILTIN_PKG.libpcap 82MAKEVARS+= BUILTIN_PKG.libpcap
83 83
84### 84###
85### Determine whether we should use the built-in implementation if it 85### Determine whether we should use the built-in implementation if it
86### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 86### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
87### 87###
88.if !defined(USE_BUILTIN.libpcap) 88.if !defined(USE_BUILTIN.libpcap)
89. if ${PREFER.libpcap} == "pkgsrc" 89. if ${PREFER.libpcap} == "pkgsrc"
90USE_BUILTIN.libpcap= no 90USE_BUILTIN.libpcap= no
91. else 91. else
92USE_BUILTIN.libpcap= ${IS_BUILTIN.libpcap} 92USE_BUILTIN.libpcap= ${IS_BUILTIN.libpcap}
93. if defined(BUILTIN_PKG.libpcap) && \ 93. if defined(BUILTIN_PKG.libpcap) && \
94 !empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) 94 ${IS_BUILTIN.libpcap:tl} == yes
95USE_BUILTIN.libpcap= yes 95USE_BUILTIN.libpcap= yes
96. for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap} 96. for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap}
97. if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS]) 97. if ${USE_BUILTIN.libpcap:tl} == yes
98USE_BUILTIN.libpcap!= \ 98USE_BUILTIN.libpcap!= \
99 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \ 99 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap}; then \
100 ${ECHO} yes; \ 100 ${ECHO} yes; \
101 else \ 101 else \
102 ${ECHO} no; \ 102 ${ECHO} no; \
103 fi 103 fi
104. endif 104. endif
105. endfor 105. endfor
106. endif 106. endif
107. endif # PREFER.libpcap 107. endif # PREFER.libpcap
108.endif 108.endif
109MAKEVARS+= USE_BUILTIN.libpcap 109MAKEVARS+= USE_BUILTIN.libpcap

cvs diff -r1.39 -r1.40 pkgsrc/net/libpcap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libpcap/distinfo 2021/11/16 16:18:48 1.39
+++ pkgsrc/net/libpcap/distinfo 2023/01/16 08:17:30 1.40
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.39 2021/11/16 16:18:48 adam Exp $ 1$NetBSD: distinfo,v 1.40 2023/01/16 08:17:30 adam Exp $
2 2
3BLAKE2s (libpcap-1.10.1.tar.gz) = c1750d08f9d70f8cce5f696e24b950a588f62520ebfc49b0a4d053dcc2a1f68d 3BLAKE2s (libpcap-1.10.3.tar.gz) = 6218c5ccf52014efb5fe80a8b467c8066ae26fd1baa586ab48fa7ff87461c445
4SHA512 (libpcap-1.10.1.tar.gz) = 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171 4SHA512 (libpcap-1.10.3.tar.gz) = 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d
5Size (libpcap-1.10.1.tar.gz) = 935221 bytes 5Size (libpcap-1.10.3.tar.gz) = 951869 bytes
6SHA1 (patch-Makefile.in) = 9dcba4ae88185c63543ea5a2be559efb7400c289 6SHA1 (patch-Makefile.in) = 8b4374d5b6824fb6a6569ede19239f01fdc14051
7SHA1 (patch-configure) = 51b8a471655e94945f8240285201886b8da324f2 7SHA1 (patch-configure) = a7ac49249f7086b46d0bd3b3b5d8901f9946e0c1
8SHA1 (patch-fad-getad.c) = f7a29d558e1f3c54a143d0977deffb2be3f494ef 8SHA1 (patch-fad-getad.c) = f7a29d558e1f3c54a143d0977deffb2be3f494ef

cvs diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/patch-Makefile.in 2021/11/16 16:18:48 1.3
+++ pkgsrc/net/libpcap/patches/patch-Makefile.in 2023/01/16 08:17:30 1.4
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1$NetBSD: patch-Makefile.in,v 1.3 2021/11/16 16:18:48 adam Exp $ 1$NetBSD: patch-Makefile.in,v 1.4 2023/01/16 08:17:30 adam Exp $
2 2
3Add libtoolization. 3Add libtoolization.
4Fix manpage installation. 4Fix manpage installation.
5 5
6--- Makefile.in.orig 2021-06-07 20:21:35.000000000 +0000 6--- Makefile.in.orig 2023-01-12 22:04:47.000000000 +0000
7+++ Makefile.in 7+++ Makefile.in
8@@ -46,7 +46,7 @@ VPATH = @srcdir@ 8@@ -46,7 +46,7 @@ VPATH = @srcdir@
9 # 9 #
10  10
11 LD = /usr/bin/ld 11 LD = /usr/bin/ld
12-CC = @CC@ 12-CC = @CC@
13+CC = ${LIBTOOL} --mode=compile @CC@ 13+CC = ${LIBTOOL} --mode=compile @CC@
14 AR = @AR@ 14 AR = @AR@
15 LN_S = @LN_S@ 15 LN_S = @LN_S@
16 MKDEP = @MKDEP@ 16 MKDEP = @MKDEP@
17@@ -84,7 +84,8 @@ BISON_BYACC = @BISON_BYACC@ 17@@ -83,7 +83,8 @@ BISON_BYACC = @BISON_BYACC@
18 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. 18 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
19 # Also, gcc does not remove the .o before forking 'as', which can be a 19 # Also, gcc does not remove the .o before forking 'as', which can be a
20 # problem if you don't own the file but can write to the directory. 20 # problem if you don't own the file but can write to the directory.
21-.c.o: 21-.c.o:
22+.SUFFIXES: .lo 22+.SUFFIXES: .lo
23+.c.lo: 23+.c.lo:
24 @rm -f $@ 24 @rm -f $@
25 $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c 25 $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
26  26
27@@ -97,7 +98,7 @@ COMMON_C_SRC = pcap.c gencode.c optimize 27@@ -96,7 +97,7 @@ COMMON_C_SRC = pcap.c gencode.c optimize
28 savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \ 28 savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
29 bpf_image.c bpf_filter.c bpf_dump.c 29 pcap-usb-linux-common.c bpf_image.c bpf_filter.c bpf_dump.c
30 GENERATED_C_SRC = scanner.c grammar.c 30 GENERATED_C_SRC = scanner.c grammar.c
31-LIBOBJS = @LIBOBJS@ 31-LIBOBJS = @LIBOBJS@
32+LIBOBJS = @LTLIBOBJS@ 32+LIBOBJS = @LTLIBOBJS@
33  33
34 SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_SRC) \ 34 SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_SRC) \
35 $(MODULE_C_SRC) $(REMOTE_C_SRC) $(COMMON_C_SRC) \ 35 $(MODULE_C_SRC) $(REMOTE_C_SRC) $(COMMON_C_SRC) \
36@@ -106,9 +107,9 @@ SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_S 36@@ -105,9 +106,9 @@ SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_S
37 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot 37 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
38 # hack the extra indirection, and we have to handle PLATFORM_CXX_SRC 38 # hack the extra indirection, and we have to handle PLATFORM_CXX_SRC
39 # differently from the defines for C source 39 # differently from the defines for C source
40-OBJ = $(PLATFORM_C_SRC:.c=.o) $(PLATFORM_CXX_SRC:.cpp=.o) \ 40-OBJ = $(PLATFORM_C_SRC:.c=.o) $(PLATFORM_CXX_SRC:.cpp=.o) \
41- $(MODULE_C_SRC:.c=.o) $(REMOTE_C_SRC:.c=.o) $(COMMON_C_SRC:.c=.o) \ 41- $(MODULE_C_SRC:.c=.o) $(REMOTE_C_SRC:.c=.o) $(COMMON_C_SRC:.c=.o) \
42- $(GENERATED_C_SRC:.c=.o) \ 42- $(GENERATED_C_SRC:.c=.o) \
43+OBJ = $(PLATFORM_C_SRC:.c=.lo) $(PLATFORM_CXX_SRC:.cpp=.lo) \ 43+OBJ = $(PLATFORM_C_SRC:.c=.lo) $(PLATFORM_CXX_SRC:.cpp=.lo) \
44+ $(MODULE_C_SRC:.c=.lo) $(REMOTE_C_SRC:.c=.lo) $(COMMON_C_SRC:.c=.lo) \ 44+ $(MODULE_C_SRC:.c=.lo) $(REMOTE_C_SRC:.c=.lo) $(COMMON_C_SRC:.c=.lo) \
45+ $(GENERATED_C_SRC:.c=.lo) \ 45+ $(GENERATED_C_SRC:.c=.lo) \
46 $(LIBOBJS) 46 $(LIBOBJS)
47  47
48 PUBHDR = \ 48 PUBHDR = \
49@@ -415,12 +416,10 @@ EXTRA_DIST = \ 49@@ -429,12 +430,10 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $
50 Win32/Prj/wpcap.vcxproj \ 50 $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
51 Win32/Prj/wpcap.vcxproj.filters 51 $(TEST_DIST)
52  52
53-all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config 53-all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
54+all: libpcap.la $(BUILD_RPCAPD) libpcap.pc pcap-config 54+all: libpcap.la $(BUILD_RPCAPD) libpcap.pc pcap-config
55  55
56-libpcap.a: $(OBJ) 56-libpcap.a: $(OBJ)
57- @rm -f $@ 57- @rm -f $@
58- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS) 58- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
59- $(RANLIB) $@ 59- $(RANLIB) $@
60+libpcap.la: $(OBJ) 60+libpcap.la: $(OBJ)
61+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la 61+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la
62  62
63 shared: libpcap.$(DYEXT) 63 shared: libpcap.$(DYEXT)
64  64
65@@ -507,7 +506,7 @@ scanner.h: scanner.c 65@@ -521,7 +520,7 @@ scanner.h: scanner.c
66 $(MAKE) $(MAKEFLAGS) scanner.c; \ 66 $(MAKE) $(MAKEFLAGS) scanner.c; \
67 fi 67 fi
68  68
69-scanner.o: scanner.c grammar.h 69-scanner.o: scanner.c grammar.h
70+scanner.lo: scanner.c grammar.h 70+scanner.lo: scanner.c grammar.h
71 $(CC) $(FULL_CFLAGS) -c scanner.c 71 $(CC) $(FULL_CFLAGS) -c scanner.c
72  72
73 # 73 #
74@@ -538,25 +537,25 @@ grammar.h: grammar.c 74@@ -552,25 +551,25 @@ grammar.h: grammar.c
75 $(MAKE) $(MAKEFLAGS) grammar.c; \ 75 $(MAKE) $(MAKEFLAGS) grammar.c; \
76 fi 76 fi
77  77
78-grammar.o: grammar.c scanner.h 78-grammar.o: grammar.c scanner.h
79+grammar.lo: grammar.c scanner.h 79+grammar.lo: grammar.c scanner.h
80 $(CC) $(FULL_CFLAGS) -c grammar.c 80 $(CC) $(FULL_CFLAGS) -c grammar.c
81  81
82-gencode.o: $(srcdir)/gencode.c grammar.h scanner.h 82-gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
83+gencode.lo: $(srcdir)/gencode.c grammar.h scanner.h 83+gencode.lo: $(srcdir)/gencode.c grammar.h scanner.h
84 $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c 84 $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
85  85
86-asprintf.o: $(srcdir)/missing/asprintf.c 86-asprintf.o: $(srcdir)/missing/asprintf.c
87+asprintf.lo: $(srcdir)/missing/asprintf.c 87+asprintf.lo: $(srcdir)/missing/asprintf.c
@@ -94,36 +94,36 @@ Fix manpage installation. @@ -94,36 +94,36 @@ Fix manpage installation.
94-strlcat.o: $(srcdir)/missing/strlcat.c 94-strlcat.o: $(srcdir)/missing/strlcat.c
95+strlcat.lo: $(srcdir)/missing/strlcat.c 95+strlcat.lo: $(srcdir)/missing/strlcat.c
96 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c 96 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
97  97
98-strlcpy.o: $(srcdir)/missing/strlcpy.c 98-strlcpy.o: $(srcdir)/missing/strlcpy.c
99+strlcpy.lo: $(srcdir)/missing/strlcpy.c 99+strlcpy.lo: $(srcdir)/missing/strlcpy.c
100 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c 100 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
101  101
102-strtok_r.o: $(srcdir)/missing/strtok_r.c 102-strtok_r.o: $(srcdir)/missing/strtok_r.c
103+strtok_r.lo: $(srcdir)/missing/strtok_r.c 103+strtok_r.lo: $(srcdir)/missing/strtok_r.c
104 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c 104 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
105  105
106 # 106 #
107@@ -601,7 +600,7 @@ testprogs: FORCE 107@@ -615,7 +614,7 @@ testprogs: FORCE
108  108
109 FORCE: 109 FORCE:
110  110
111-install: install-shared install-archive libpcap.pc pcap-config @INSTALL_RPCAPD@ 111-install: install-shared install-archive libpcap.pc pcap-config @INSTALL_RPCAPD@
112+install: libpcap.pc pcap-config @INSTALL_RPCAPD@ 112+install: libpcap.pc pcap-config @INSTALL_RPCAPD@
113 [ -d $(DESTDIR)$(libdir) ] || \ 113 [ -d $(DESTDIR)$(libdir) ] || \
114 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 114 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
115 [ -d $(DESTDIR)$(includedir) ] || \ 115 [ -d $(DESTDIR)$(includedir) ] || \
116@@ -616,62 +615,60 @@ install: install-shared install-archive  116@@ -630,62 +629,60 @@ install: install-shared install-archive
117 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@) 117 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
118 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \ 118 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@) 119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
120+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir) 120+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
121 for i in $(PUBHDR); do \ 121 for i in $(PUBHDR); do \
122 $(INSTALL_DATA) $(srcdir)/$$i \ 122 $(INSTALL_DATA) $(srcdir)/$$i \
123 $(DESTDIR)$(includedir)/$$i; done 123 $(DESTDIR)$(includedir)/$$i; done
124 [ -d $(DESTDIR)$(bindir) ] || \ 124 [ -d $(DESTDIR)$(bindir) ] || \
125 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) 125 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
126- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config 126- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
127+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config 127+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config
128 [ -d $(DESTDIR)$(libdir)/pkgconfig ] || \ 128 [ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
129 (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig) 129 (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
@@ -206,27 +206,27 @@ Fix manpage installation. @@ -206,27 +206,27 @@ Fix manpage installation.
206+ rm -f pcap_open_offline_with_tstamp_precision.3 && \ 206+ rm -f pcap_open_offline_with_tstamp_precision.3 && \
207+ $(LN_S) pcap_open_offline.3 pcap_open_offline_with_tstamp_precision.3 && \ 207+ $(LN_S) pcap_open_offline.3 pcap_open_offline_with_tstamp_precision.3 && \
208+ rm -f pcap_fopen_offline.3 && \ 208+ rm -f pcap_fopen_offline.3 && \
209+ $(LN_S) pcap_open_offline.3 pcap_fopen_offline.3 && \ 209+ $(LN_S) pcap_open_offline.3 pcap_fopen_offline.3 && \
210+ rm -f pcap_fopen_offline_with_tstamp_precision.3 && \ 210+ rm -f pcap_fopen_offline_with_tstamp_precision.3 && \
211+ $(LN_S) pcap_open_offline.3 pcap_fopen_offline_with_tstamp_precision.3 && \ 211+ $(LN_S) pcap_open_offline.3 pcap_fopen_offline_with_tstamp_precision.3 && \
212+ rm -f pcap_tstamp_type_val_to_description.3 && \ 212+ rm -f pcap_tstamp_type_val_to_description.3 && \
213+ $(LN_S) pcap_tstamp_type_val_to_name.3 pcap_tstamp_type_val_to_description.3 && \ 213+ $(LN_S) pcap_tstamp_type_val_to_name.3 pcap_tstamp_type_val_to_description.3 && \
214+ rm -f pcap_getnonblock.3 && \ 214+ rm -f pcap_getnonblock.3 && \
215+ $(LN_S) pcap_setnonblock.3 pcap_getnonblock.3) 215+ $(LN_S) pcap_setnonblock.3 pcap_getnonblock.3)
216 for i in $(MANFILE); do \ 216 for i in $(MANFILE); do \
217 $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \ 217 $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
218 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done 218 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
219@@ -713,15 +710,15 @@ install-shared-shareda: libpcap.shareda 219@@ -727,15 +724,15 @@ install-shared-shareda: libpcap.shareda
220 install-shared-none: 220 install-shared-none:
221  221
222 install-archive: install-archive-$(DYEXT) 222 install-archive: install-archive-$(DYEXT)
223-install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.a 223-install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.a
224+install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.la 224+install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.la
225 # 225 #
226 # Most platforms have separate suffixes for shared and 226 # Most platforms have separate suffixes for shared and
227 # archive libraries, so we install both. 227 # archive libraries, so we install both.
228 # 228 #
229 [ -d $(DESTDIR)$(libdir) ] || \ 229 [ -d $(DESTDIR)$(libdir) ] || \
230 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 230 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
231- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a 231- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
232- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a 232- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a

cvs diff -r1.7 -r1.8 pkgsrc/net/libpcap/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/patch-configure 2019/10/14 20:10:19 1.7
+++ pkgsrc/net/libpcap/patches/patch-configure 2023/01/16 08:17:30 1.8
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-configure,v 1.7 2019/10/14 20:10:19 triaxx Exp $ 1$NetBSD: patch-configure,v 1.8 2023/01/16 08:17:30 adam Exp $
2 2
3Ensure consistent manpage locations. 3Ensure consistent manpage locations.
4Correctly detect Mac OS X Leopard. 4Correctly detect Mac OS X Leopard.
5 5
6--- configure.orig 2019-09-30 16:08:23.000000000 +0000 6--- configure.orig 2023-01-12 22:04:47.000000000 +0000
7+++ configure 7+++ configure
8@@ -8178,10 +8178,6 @@ fi 8@@ -10034,10 +10034,6 @@ fi
9 # and daemons in section 8). Individual cases can override this. 9 # and daemons in section 8). Individual cases can override this.
10 # 10 #
11 DYEXT="none" 11 DYEXT="none"
12-MAN_DEVICES=4 12-MAN_DEVICES=4
13-MAN_FILE_FORMATS=5 13-MAN_FILE_FORMATS=5
14-MAN_MISC_INFO=7 14-MAN_MISC_INFO=7
15-MAN_ADMIN_COMMANDS=8 15-MAN_ADMIN_COMMANDS=8
16 case "$host_os" in 16 case "$host_os" in
17  17
18 aix*) 18 aix*)
19@@ -8300,7 +8296,7 @@ fi 19@@ -10156,7 +10152,7 @@ fi
20 V_PROG_LDFLAGS_FAT="-arch ppc -arch ppc64 -arch i386 -arch x86_64" 20 V_PROG_LDFLAGS_FAT="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
21 ;; 21 ;;
22  22
23- darwin9.*) 23- darwin9.*)
24+ darwin9*) 24+ darwin9*)
25 # 25 #
26 # Leopard. Build libraries for 32-bit PowerPC, 26 # Leopard. Build libraries for 32-bit PowerPC,
27 # 64-bit PowerPC, 32-bit x86, and x86-64, with 27 # 64-bit PowerPC, 32-bit x86, and x86-64, with
28@@ -8567,6 +8563,10 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf 28@@ -10525,6 +10521,10 @@ esac
29 ;; 29
30 esac 30
31  31
32+MAN_FILE_FORMATS=5 32+MAN_FILE_FORMATS=5
33+MAN_MISC_INFO=7 33+MAN_MISC_INFO=7
34+MAN_ADMIN_COMMANDS=8 34+MAN_ADMIN_COMMANDS=8
35+ 35+
36 # Check whether --enable-shared was given. 36 # Check whether --enable-shared was given.
37 if test "${enable_shared+set}" = set; then : 37 if test "${enable_shared+set}" = set; then :
38 enableval=$enable_shared; 38 enableval=$enable_shared;