pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/libpcap
Module Name: pkgsrc
Committed By: adam
Date: Mon Jan 16 08:17:31 UTC 2023
Modified Files:
pkgsrc/net/libpcap: Makefile builtin.mk distinfo
pkgsrc/net/libpcap/patches: patch-Makefile.in patch-configure
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/libpcap/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/libpcap/builtin.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/libpcap/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-Makefile.in
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/libpcap/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/libpcap/Makefile
diff -u pkgsrc/net/libpcap/Makefile:1.67 pkgsrc/net/libpcap/Makefile:1.68
--- pkgsrc/net/libpcap/Makefile:1.67 Tue Nov 16 16:18:48 2021
+++ pkgsrc/net/libpcap/Makefile Mon Jan 16 08:17:30 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2021/11/16 16:18:48 adam Exp $
+# $NetBSD: Makefile,v 1.68 2023/01/16 08:17:30 adam Exp $
-DISTNAME= libpcap-1.10.1
+DISTNAME= libpcap-1.10.3
CATEGORIES= net
MASTER_SITES= https://www.tcpdump.org/release/
Index: pkgsrc/net/libpcap/builtin.mk
diff -u pkgsrc/net/libpcap/builtin.mk:1.19 pkgsrc/net/libpcap/builtin.mk:1.20
--- pkgsrc/net/libpcap/builtin.mk:1.19 Sun Nov 3 11:45:40 2019
+++ pkgsrc/net/libpcap/builtin.mk Mon Jan 16 08:17:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.19 2019/11/03 11:45:40 rillig Exp $
+# $NetBSD: builtin.mk,v 1.20 2023/01/16 08:17:30 adam Exp $
BUILTIN_PKG:= libpcap
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.libpcap
### a package name to represent the built-in package.
###
.if !defined(BUILTIN_PKG.libpcap) && \
- !empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) && \
+ ${IS_BUILTIN.libpcap:tl} == yes && \
empty(H_LIBPCAP:M__nonexistent__)
_BLTN_PCAP_111!= \
${GREP} -c PCAP_NETMASK_UNKNOWN ${H_LIBPCAP} || ${TRUE}
@@ -91,12 +91,12 @@ USE_BUILTIN.libpcap= no
. else
USE_BUILTIN.libpcap= ${IS_BUILTIN.libpcap}
. if defined(BUILTIN_PKG.libpcap) && \
- !empty(IS_BUILTIN.libpcap:M[yY][eE][sS])
+ ${IS_BUILTIN.libpcap:tl} == yes
USE_BUILTIN.libpcap= yes
. for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap}
-. if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS])
+. if ${USE_BUILTIN.libpcap:tl} == yes
USE_BUILTIN.libpcap!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap}; then \
${ECHO} yes; \
else \
${ECHO} no; \
Index: pkgsrc/net/libpcap/distinfo
diff -u pkgsrc/net/libpcap/distinfo:1.39 pkgsrc/net/libpcap/distinfo:1.40
--- pkgsrc/net/libpcap/distinfo:1.39 Tue Nov 16 16:18:48 2021
+++ pkgsrc/net/libpcap/distinfo Mon Jan 16 08:17:30 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2021/11/16 16:18:48 adam Exp $
+$NetBSD: distinfo,v 1.40 2023/01/16 08:17:30 adam Exp $
-BLAKE2s (libpcap-1.10.1.tar.gz) = c1750d08f9d70f8cce5f696e24b950a588f62520ebfc49b0a4d053dcc2a1f68d
-SHA512 (libpcap-1.10.1.tar.gz) = 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
-Size (libpcap-1.10.1.tar.gz) = 935221 bytes
-SHA1 (patch-Makefile.in) = 9dcba4ae88185c63543ea5a2be559efb7400c289
-SHA1 (patch-configure) = 51b8a471655e94945f8240285201886b8da324f2
+BLAKE2s (libpcap-1.10.3.tar.gz) = 6218c5ccf52014efb5fe80a8b467c8066ae26fd1baa586ab48fa7ff87461c445
+SHA512 (libpcap-1.10.3.tar.gz) = 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d
+Size (libpcap-1.10.3.tar.gz) = 951869 bytes
+SHA1 (patch-Makefile.in) = 8b4374d5b6824fb6a6569ede19239f01fdc14051
+SHA1 (patch-configure) = a7ac49249f7086b46d0bd3b3b5d8901f9946e0c1
SHA1 (patch-fad-getad.c) = f7a29d558e1f3c54a143d0977deffb2be3f494ef
Index: pkgsrc/net/libpcap/patches/patch-Makefile.in
diff -u pkgsrc/net/libpcap/patches/patch-Makefile.in:1.3 pkgsrc/net/libpcap/patches/patch-Makefile.in:1.4
--- pkgsrc/net/libpcap/patches/patch-Makefile.in:1.3 Tue Nov 16 16:18:48 2021
+++ pkgsrc/net/libpcap/patches/patch-Makefile.in Mon Jan 16 08:17:30 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile.in,v 1.3 2021/11/16 16:18:48 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2023/01/16 08:17:30 adam Exp $
Add libtoolization.
Fix manpage installation.
---- Makefile.in.orig 2021-06-07 20:21:35.000000000 +0000
+--- Makefile.in.orig 2023-01-12 22:04:47.000000000 +0000
+++ Makefile.in
@@ -46,7 +46,7 @@ VPATH = @srcdir@
#
@@ -14,7 +14,7 @@ Fix manpage installation.
AR = @AR@
LN_S = @LN_S@
MKDEP = @MKDEP@
-@@ -84,7 +84,8 @@ BISON_BYACC = @BISON_BYACC@
+@@ -83,7 +83,8 @@ BISON_BYACC = @BISON_BYACC@
# Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
# Also, gcc does not remove the .o before forking 'as', which can be a
# problem if you don't own the file but can write to the directory.
@@ -24,16 +24,16 @@ Fix manpage installation.
@rm -f $@
$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
-@@ -97,7 +98,7 @@ COMMON_C_SRC = pcap.c gencode.c optimize
+@@ -96,7 +97,7 @@ COMMON_C_SRC = pcap.c gencode.c optimize
savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
- bpf_image.c bpf_filter.c bpf_dump.c
+ pcap-usb-linux-common.c bpf_image.c bpf_filter.c bpf_dump.c
GENERATED_C_SRC = scanner.c grammar.c
-LIBOBJS = @LIBOBJS@
+LIBOBJS = @LTLIBOBJS@
SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_SRC) \
$(MODULE_C_SRC) $(REMOTE_C_SRC) $(COMMON_C_SRC) \
-@@ -106,9 +107,9 @@ SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_S
+@@ -105,9 +106,9 @@ SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_S
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
# hack the extra indirection, and we have to handle PLATFORM_CXX_SRC
# differently from the defines for C source
@@ -46,9 +46,9 @@ Fix manpage installation.
$(LIBOBJS)
PUBHDR = \
-@@ -415,12 +416,10 @@ EXTRA_DIST = \
- Win32/Prj/wpcap.vcxproj \
- Win32/Prj/wpcap.vcxproj.filters
+@@ -429,12 +430,10 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $
+ $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
+ $(TEST_DIST)
-all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
+all: libpcap.la $(BUILD_RPCAPD) libpcap.pc pcap-config
@@ -62,7 +62,7 @@ Fix manpage installation.
shared: libpcap.$(DYEXT)
-@@ -507,7 +506,7 @@ scanner.h: scanner.c
+@@ -521,7 +520,7 @@ scanner.h: scanner.c
$(MAKE) $(MAKEFLAGS) scanner.c; \
fi
@@ -71,7 +71,7 @@ Fix manpage installation.
$(CC) $(FULL_CFLAGS) -c scanner.c
#
-@@ -538,25 +537,25 @@ grammar.h: grammar.c
+@@ -552,25 +551,25 @@ grammar.h: grammar.c
$(MAKE) $(MAKEFLAGS) grammar.c; \
fi
@@ -104,7 +104,7 @@ Fix manpage installation.
$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
#
-@@ -601,7 +600,7 @@ testprogs: FORCE
+@@ -615,7 +614,7 @@ testprogs: FORCE
FORCE:
@@ -113,7 +113,7 @@ Fix manpage installation.
[ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
[ -d $(DESTDIR)$(includedir) ] || \
-@@ -616,62 +615,60 @@ install: install-shared install-archive
+@@ -630,62 +629,60 @@ install: install-shared install-archive
(mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
[ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
(mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
@@ -216,7 +216,7 @@ Fix manpage installation.
for i in $(MANFILE); do \
$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
$(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
-@@ -713,15 +710,15 @@ install-shared-shareda: libpcap.shareda
+@@ -727,15 +724,15 @@ install-shared-shareda: libpcap.shareda
install-shared-none:
install-archive: install-archive-$(DYEXT)
Index: pkgsrc/net/libpcap/patches/patch-configure
diff -u pkgsrc/net/libpcap/patches/patch-configure:1.7 pkgsrc/net/libpcap/patches/patch-configure:1.8
--- pkgsrc/net/libpcap/patches/patch-configure:1.7 Mon Oct 14 20:10:19 2019
+++ pkgsrc/net/libpcap/patches/patch-configure Mon Jan 16 08:17:30 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.7 2019/10/14 20:10:19 triaxx Exp $
+$NetBSD: patch-configure,v 1.8 2023/01/16 08:17:30 adam Exp $
Ensure consistent manpage locations.
Correctly detect Mac OS X Leopard.
---- configure.orig 2019-09-30 16:08:23.000000000 +0000
+--- configure.orig 2023-01-12 22:04:47.000000000 +0000
+++ configure
-@@ -8178,10 +8178,6 @@ fi
+@@ -10034,10 +10034,6 @@ fi
# and daemons in section 8). Individual cases can override this.
#
DYEXT="none"
@@ -16,7 +16,7 @@ Correctly detect Mac OS X Leopard.
case "$host_os" in
aix*)
-@@ -8300,7 +8296,7 @@ fi
+@@ -10156,7 +10152,7 @@ fi
V_PROG_LDFLAGS_FAT="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
;;
@@ -25,9 +25,9 @@ Correctly detect Mac OS X Leopard.
#
# Leopard. Build libraries for 32-bit PowerPC,
# 64-bit PowerPC, 32-bit x86, and x86-64, with
-@@ -8567,6 +8563,10 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf
- ;;
- esac
+@@ -10525,6 +10521,10 @@ esac
+
+
+MAN_FILE_FORMATS=5
+MAN_MISC_INFO=7
Home |
Main Index |
Thread Index |
Old Index