Date: Wed, 29 Jan 2025 19:33:30 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: e6efc827e47a - stable/13 - libpcap: Update to 1.10.4 Message-ID: <202501291933.50TJXUK1039700@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=e6efc827e47a5b3ddbaedc4aa9783ffeb986abc9 commit e6efc827e47a5b3ddbaedc4aa9783ffeb986abc9 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2023-05-05 13:56:10 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2025-01-29 19:29:28 +0000 libpcap: Update to 1.10.4 Sponsored by: The FreeBSD Foundation (cherry picked from commit dd744a896be358d6f001766188da6aed80e00378) (cherry picked from commit 270d20ce91c898c532ebaff76bb5b71c8544e928) (cherry picked from commit 67c802c948abf6955c3d8b53f4a41293a9caea24) (cherry picked from commit b1538e8fc488409113b833dd1c53aab1057b0568) --- contrib/libpcap/CHANGES | 38 ++++++++++----- contrib/libpcap/Makefile.in | 4 +- contrib/libpcap/README.md | 2 +- contrib/libpcap/VERSION | 2 +- contrib/libpcap/aclocal.m4 | 13 +++-- contrib/libpcap/config.guess | 12 +++-- contrib/libpcap/config.sub | 33 +++++++++---- contrib/libpcap/configure | 64 ++++++++++++------------- contrib/libpcap/configure.ac | 26 +++++----- contrib/libpcap/gencode.c | 16 +++---- contrib/libpcap/mkdep | 2 +- contrib/libpcap/msdos/makefile | 8 ++-- contrib/libpcap/nametoaddr.c | 40 ++++++++-------- contrib/libpcap/optimize.c | 16 +++---- contrib/libpcap/pcap-bt-linux.c | 6 +-- contrib/libpcap/pcap-common.c | 4 +- contrib/libpcap/pcap-libdlpi.c | 2 +- contrib/libpcap/pcap-linux.c | 8 ++-- contrib/libpcap/pcap-netfilter-linux.c | 4 +- contrib/libpcap/pcap-npf.c | 6 +-- contrib/libpcap/pcap-sita.c | 2 +- contrib/libpcap/pcap-sita.html | 22 ++++----- contrib/libpcap/pcap-snf.c | 20 ++++---- contrib/libpcap/pcap-usb-linux.c | 14 +++--- contrib/libpcap/pcap/bpf.h | 6 +-- contrib/libpcap/pcap/dlt.h | 4 +- contrib/libpcap/pcap/pcap.h | 4 +- contrib/libpcap/rpcapd/Makefile.in | 2 +- contrib/libpcap/rpcapd/org.tcpdump.rpcapd.plist | 2 +- contrib/libpcap/rpcapd/rpcapd.manadmin.in | 42 +++++++++++++++- contrib/libpcap/sockutils.c | 2 +- contrib/libpcap/testprogs/Makefile.in | 2 +- lib/libpcap/Makefile.depend | 1 - lib/libpcap/Makefile.depend.options | 2 +- lib/libpcap/config.h | 4 +- 35 files changed, 255 insertions(+), 180 deletions(-) diff --git a/contrib/libpcap/CHANGES b/contrib/libpcap/CHANGES index d174cd5e1a9c..c574a278064f 100644 --- a/contrib/libpcap/CHANGES +++ b/contrib/libpcap/CHANGES @@ -1,3 +1,17 @@ +Friday, April 7, 2023 / The Tcpdump Group + Summary for 1.10.4 libpcap release + Source code: + Fix spaces before tabs in indentation. + rpcap: + Fix name of launchd service. + Documentation: + Document use of rpcapd with systemd, launchd, inetd, and xinetd. + Building and testing: + Require at least pkg-config 0.17.0, as we use --static. + Get rid of the remains of gnuc.h. + Require at least autoconf 2.69. + Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21. + Thursday, January 12, 2023 / The Tcpdump Group Summary for 1.10.3 libpcap release Source code: @@ -1010,7 +1024,7 @@ Tue. September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release Add support to build libpcap.lib and wpcap.dll under Cygnus and MingW32. -Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release +Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release Support for radiotap on Linux (Mike Kershaw) Fixes for HP-UX @@ -1021,7 +1035,7 @@ Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release parts of the filter expression to look at the PPP headers and headers in the PPP payload -Tue. July 5, 2005. ken@xelerance.com. Summary for 0.9.3 libpcap release +Tue. July 5, 2005. ken@xelerance.com. Summary for 0.9.3 libpcap release Fixes for compiling on nearly every platform, including improved 64bit support @@ -1060,16 +1074,16 @@ Wed. November 12, 2003. mcr@sandelman.ottawa.on.ca. Summary for 0.8 release Tuesday, February 25, 2003. fenner@research.att.com. 0.7.2 release - Support link types that use 802.2 always, never, and sometimes. - Don't decrease the size of the BPF buffer from the default. - Support frame relay. - Handle 32-bit timestamps in DLPI, and pass the right buffer size. - Handle Linux systems with modern kernel but without - SOL_PACKET in the userland headers. - Linux support for ARPHRD_RAWHDLC. - Handle 32-bit timestamps in snoop. - Support eg (Octane/O2xxx/O3xxx Gigabit) devices. - Add new reserved DLT types. + Support link types that use 802.2 always, never, and sometimes. + Don't decrease the size of the BPF buffer from the default. + Support frame relay. + Handle 32-bit timestamps in DLPI, and pass the right buffer size. + Handle Linux systems with modern kernel but without + SOL_PACKET in the userland headers. + Linux support for ARPHRD_RAWHDLC. + Handle 32-bit timestamps in snoop. + Support eg (Octane/O2xxx/O3xxx Gigabit) devices. + Add new reserved DLT types. Monday October 23, 2001. mcr@sandelman.ottawa.on.ca. Summary for 0.7 release diff --git a/contrib/libpcap/Makefile.in b/contrib/libpcap/Makefile.in index 54246586828d..3468e204c756 100644 --- a/contrib/libpcap/Makefile.in +++ b/contrib/libpcap/Makefile.in @@ -1,5 +1,5 @@ # Copyright (c) 1993, 1994, 1995, 1996 -# The Regents of the University of California. All rights reserved. +# The Regents of the University of California. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that: (1) source code distributions @@ -810,7 +810,7 @@ clean: distclean: clean rm -f Makefile grammar.y config.cache config.log config.status \ config.h config.h.in~ configure~ configure.ac~ \ - gnuc.h net os-proto.h libpcap.pc pcap-config stamp-h stamp-h.in + net os-proto.h libpcap.pc pcap-config stamp-h stamp-h.in rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=) rm -rf autom4te.cache (cd rpcapd; $(MAKE) distclean) diff --git a/contrib/libpcap/README.md b/contrib/libpcap/README.md index 46c33c24125e..e38b9a15d6b3 100644 --- a/contrib/libpcap/README.md +++ b/contrib/libpcap/README.md @@ -24,7 +24,7 @@ to ease in porting and to alleviate the need for several system-dependent packet capture modules in each application. ```text -formerly from Lawrence Berkeley National Laboratory +formerly from Lawrence Berkeley National Laboratory Network Research Group <libpcap@ee.lbl.gov> ftp://ftp.ee.lbl.gov/old/libpcap-0.4a7.tar.Z ``` diff --git a/contrib/libpcap/VERSION b/contrib/libpcap/VERSION index 587c5f0c7309..18b311420650 100644 --- a/contrib/libpcap/VERSION +++ b/contrib/libpcap/VERSION @@ -1 +1 @@ -1.10.3 +1.10.4 diff --git a/contrib/libpcap/aclocal.m4 b/contrib/libpcap/aclocal.m4 index 502a3711f677..9ec93c28d5e5 100644 --- a/contrib/libpcap/aclocal.m4 +++ b/contrib/libpcap/aclocal.m4 @@ -1103,9 +1103,8 @@ dnl Since: 0.16 dnl dnl Search for the pkg-config tool and set the PKG_CONFIG variable to dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.17.0 is +dnl used since that's the first version where --static was supported. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -1118,7 +1117,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) + _pkg_min_version=m4_default([$1], [0.17.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then AC_MSG_RESULT([yes]) @@ -1205,8 +1204,8 @@ See the pkg-config man page for more details.]) # # That failed - report an error. # - AC_MSG_RESULT([error]) - _PKG_SHORT_ERRORS_SUPPORTED + AC_MSG_RESULT([error]) + _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else @@ -1229,7 +1228,7 @@ _PKG_TEXT])[]dnl # # We don't have pkg-config, so it didn't work. # - AC_MSG_RESULT([not found (pkg-config not found)]) + AC_MSG_RESULT([not found (pkg-config not found)]) else # # We found the package. diff --git a/contrib/libpcap/config.guess b/contrib/libpcap/config.guess index a419d8643b62..69188da73d74 100755 --- a/contrib/libpcap/config.guess +++ b/contrib/libpcap/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-08-01' +timestamp='2023-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -966,6 +966,12 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; diff --git a/contrib/libpcap/config.sub b/contrib/libpcap/config.sub index fbaa37f2352d..de4259e40479 100755 --- a/contrib/libpcap/config.sub +++ b/contrib/libpcap/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-08-01' +timestamp='2023-01-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1075,7 +1075,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1341,6 +1341,10 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1762,6 +1766,9 @@ case $os in ;; none) ;; + kernel* ) + # Restricted further below + ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1772,16 +1779,26 @@ esac # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff --git a/contrib/libpcap/configure b/contrib/libpcap/configure index 91fd1806e8a4..4f8fd5ac4a96 100755 --- a/contrib/libpcap/configure +++ b/contrib/libpcap/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pcap 1.10.3. +# Generated by GNU Autoconf 2.69 for pcap 1.10.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pcap' PACKAGE_TARNAME='pcap' -PACKAGE_VERSION='1.10.3' -PACKAGE_STRING='pcap 1.10.3' +PACKAGE_VERSION='1.10.4' +PACKAGE_STRING='pcap 1.10.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pcap 1.10.3 to adapt to many kinds of systems. +\`configure' configures pcap 1.10.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1420,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcap 1.10.3:";; + short | recursive ) echo "Configuration of pcap 1.10.4:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcap configure 1.10.3 +pcap configure 1.10.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2506,7 +2506,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pcap $as_me 1.10.3, which was +It was created by pcap $as_me 1.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6110,7 +6110,7 @@ main(void) _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - # GNU-style + # GNU-style { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -7343,9 +7343,9 @@ done V_PCAP=linux VALGRINDTEST_SRC=valgrindtest.c elif test "$ac_cv_header_net_pfilt_h" = yes; then - # - # DEC OSF/1, Digital UNIX, Tru64 UNIX - # + # + # DEC OSF/1, Digital UNIX, Tru64 UNIX + # V_PCAP=pf elif test "$ac_cv_header_net_enet_h" = yes; then # @@ -7505,7 +7505,7 @@ fi fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 + _pkg_min_version=0.17.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then @@ -7784,14 +7784,14 @@ enet) # # Capture module # - PLATFORM_C_SRC="pcap-enet.c" + PLATFORM_C_SRC="pcap-enet.c" ;; haiku) # # Capture module # - PLATFORM_CXX_SRC="pcap-haiku.cpp" + PLATFORM_CXX_SRC="pcap-haiku.cpp" # # Just for the sake of it. @@ -7815,7 +7815,7 @@ linux) # # Capture module # - PLATFORM_C_SRC="pcap-linux.c" + PLATFORM_C_SRC="pcap-linux.c" # # Do we have the wireless extensions? @@ -7938,7 +7938,7 @@ fi # # That failed - report an error. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 $as_echo "error" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7969,7 +7969,7 @@ See the pkg-config man page for more details." "$LINENO" 5 # # We don't have pkg-config, so it didn't work. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 $as_echo "not found (pkg-config not found)" >&6; } else # @@ -8115,7 +8115,7 @@ bpf) # # Capture module # - PLATFORM_C_SRC="pcap-bpf.c" + PLATFORM_C_SRC="pcap-bpf.c" # # Check whether we have the *BSD-style ioctls. @@ -8160,21 +8160,21 @@ pf) # # Capture module # - PLATFORM_C_SRC="pcap-pf.c" + PLATFORM_C_SRC="pcap-pf.c" ;; snit) # # Capture module # - PLATFORM_C_SRC="pcap-snit.c" + PLATFORM_C_SRC="pcap-snit.c" ;; snoop) # # Capture module # - PLATFORM_C_SRC="pcap-snoop.c" + PLATFORM_C_SRC="pcap-snoop.c" ;; dag) @@ -8221,7 +8221,7 @@ null) # # Capture module # - PLATFORM_C_SRC="pcap-null.c" + PLATFORM_C_SRC="pcap-null.c" ;; *) @@ -9387,7 +9387,7 @@ fi # # That failed - report an error. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 $as_echo "error" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -9418,7 +9418,7 @@ See the pkg-config man page for more details." "$LINENO" 5 # # We don't have pkg-config, so it didn't work. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 $as_echo "not found (pkg-config not found)" >&6; } else # @@ -12879,7 +12879,7 @@ fi # # That failed - report an error. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 $as_echo "error" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -12910,7 +12910,7 @@ See the pkg-config man page for more details." "$LINENO" 5 # # We don't have pkg-config, so it didn't work. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 $as_echo "not found (pkg-config not found)" >&6; } else # @@ -13350,7 +13350,7 @@ fi # # That failed - report an error. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 $as_echo "error" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -13375,7 +13375,7 @@ fi # # We don't have pkg-config, so it didn't work. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 $as_echo "not found (pkg-config not found)" >&6; } else # @@ -13549,7 +13549,7 @@ fi # # That failed - report an error. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 $as_echo "error" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -13580,7 +13580,7 @@ See the pkg-config man page for more details." "$LINENO" 5 # # We don't have pkg-config, so it didn't work. # - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5 $as_echo "not found (pkg-config not found)" >&6; } else # @@ -14428,7 +14428,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pcap $as_me 1.10.3, which was +This file was extended by pcap $as_me 1.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14494,7 +14494,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pcap config.status 1.10.3 +pcap config.status 1.10.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/libpcap/configure.ac b/contrib/libpcap/configure.ac index ff7e49066fb7..ec601c8445e9 100644 --- a/contrib/libpcap/configure.ac +++ b/contrib/libpcap/configure.ac @@ -14,7 +14,7 @@ dnl # config.sub. # -AC_PREREQ(2.64) +AC_PREREQ(2.69) AC_INIT(pcap, m4_esyscmd_s([cat VERSION])) AC_CONFIG_SRCDIR(pcap.c) @@ -220,7 +220,7 @@ main(void) ) ], [ - # GNU-style + # GNU-style AC_MSG_RESULT(yes) AC_DEFINE(HAVE_GNU_STRERROR_R,, [Define to 1 if you have a GNU-style `strerror_r' function.]) @@ -783,9 +783,9 @@ else V_PCAP=linux VALGRINDTEST_SRC=valgrindtest.c elif test "$ac_cv_header_net_pfilt_h" = yes; then - # - # DEC OSF/1, Digital UNIX, Tru64 UNIX - # + # + # DEC OSF/1, Digital UNIX, Tru64 UNIX + # V_PCAP=pf elif test "$ac_cv_header_net_enet_h" = yes; then # @@ -982,14 +982,14 @@ enet) # # Capture module # - PLATFORM_C_SRC="pcap-enet.c" + PLATFORM_C_SRC="pcap-enet.c" ;; haiku) # # Capture module # - PLATFORM_CXX_SRC="pcap-haiku.cpp" + PLATFORM_CXX_SRC="pcap-haiku.cpp" # # Just for the sake of it. @@ -1001,7 +1001,7 @@ linux) # # Capture module # - PLATFORM_C_SRC="pcap-linux.c" + PLATFORM_C_SRC="pcap-linux.c" # # Do we have the wireless extensions? @@ -1102,7 +1102,7 @@ bpf) # # Capture module # - PLATFORM_C_SRC="pcap-bpf.c" + PLATFORM_C_SRC="pcap-bpf.c" # # Check whether we have the *BSD-style ioctls. @@ -1127,21 +1127,21 @@ pf) # # Capture module # - PLATFORM_C_SRC="pcap-pf.c" + PLATFORM_C_SRC="pcap-pf.c" ;; snit) # # Capture module # - PLATFORM_C_SRC="pcap-snit.c" + PLATFORM_C_SRC="pcap-snit.c" ;; snoop) # # Capture module # - PLATFORM_C_SRC="pcap-snoop.c" + PLATFORM_C_SRC="pcap-snoop.c" ;; dag) @@ -1188,7 +1188,7 @@ null) # # Capture module # - PLATFORM_C_SRC="pcap-null.c" + PLATFORM_C_SRC="pcap-null.c" ;; *) diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c index 87a6e962b012..496e02f377e6 100644 --- a/contrib/libpcap/gencode.c +++ b/contrib/libpcap/gencode.c @@ -7990,7 +7990,7 @@ gen_broadcast(compiler_state_t *cstate, int proto) default: bpf_error(cstate, "not a broadcast link"); } - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_IP: /* @@ -8655,7 +8655,7 @@ gen_acode(compiler_state_t *cstate, const char *s, struct qual q) return (b); } else bpf_error(cstate, "ARCnet address used in non-arc expression"); - /*NOTREACHED*/ + /*NOTREACHED*/ default: bpf_error(cstate, "aid supported only on ARCnet"); @@ -8691,27 +8691,27 @@ gen_ahostop(compiler_state_t *cstate, const u_char *eaddr, int dir) case Q_ADDR1: bpf_error(cstate, "'addr1' and 'address1' are only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_ADDR2: bpf_error(cstate, "'addr2' and 'address2' are only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_ADDR3: bpf_error(cstate, "'addr3' and 'address3' are only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_ADDR4: bpf_error(cstate, "'addr4' and 'address4' are only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_RA: bpf_error(cstate, "'ra' is only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ case Q_TA: bpf_error(cstate, "'ta' is only supported on 802.11"); - /*NOTREACHED*/ + /*NOTREACHED*/ } abort(); /*NOTREACHED*/ diff --git a/contrib/libpcap/mkdep b/contrib/libpcap/mkdep index ef120bdb2b3a..f85a447a79c6 100755 --- a/contrib/libpcap/mkdep +++ b/contrib/libpcap/mkdep @@ -92,7 +92,7 @@ _EOF_ # hack can't deal with anything that requires a search path, and doesn't # even try for anything using bracket (<>) syntax. # -# egrep '^#include[ ]*".*"' /dev/null $* | +# grep -E '^#include[[:blank:]]*".*"' /dev/null $* | # sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' | # diff --git a/contrib/libpcap/msdos/makefile b/contrib/libpcap/msdos/makefile index 599a619f402e..84819aae3f0c 100644 --- a/contrib/libpcap/msdos/makefile +++ b/contrib/libpcap/msdos/makefile @@ -104,7 +104,7 @@ clean: # pkt_rx0.obj: msdos\pkt_rx0.asm -bpf_filt.obj: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h gnuc.h +bpf_filt.obj: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h bpf_imag.obj: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h @@ -134,7 +134,7 @@ nametoad.obj: nametoad.c pcap-int.h pcap.h pcap-bpf.h gencode.h \ pcap-dos.obj: pcap-dos.c pcap.h pcap-bpf.h pcap-dos.h pcap-int.h \ msdos\pktdrvr.h -pktdrvr.obj: msdos\pktdrvr.c gnuc.h pcap-dos.h pcap-int.h \ +pktdrvr.obj: msdos\pktdrvr.c pcap-dos.h pcap-int.h \ pcap.h pcap-bpf.h msdos\pktdrvr.h msdos\pkt_stub.inc ndis2.obj: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \ @@ -142,7 +142,7 @@ ndis2.obj: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \ pkt_rx0.o32: msdos\pkt_rx0.asm -bpf_filt.o32: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h gnuc.h +bpf_filt.o32: bpf_filt.c pcap-int.h pcap.h pcap-bpf.h bpf_imag.o32: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h @@ -172,7 +172,7 @@ nametoad.o32: nametoad.c pcap-int.h pcap.h pcap-bpf.h gencode.h \ pcap-dos.o32: pcap-dos.c pcap.h pcap-bpf.h pcap-dos.h pcap-int.h \ msdos\pktdrvr.h -pktdrvr.o32: msdos\pktdrvr.c gnuc.h pcap-dos.h pcap-int.h \ +pktdrvr.o32: msdos\pktdrvr.c pcap-dos.h pcap-int.h \ pcap.h pcap-bpf.h msdos\pktdrvr.h msdos\pkt_stub.inc ndis2.o32: msdos\ndis2.c pcap-dos.h pcap-int.h pcap.h pcap-bpf.h \ diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c index 55f93897b9f8..7a04a61dbd6c 100644 --- a/contrib/libpcap/nametoaddr.c +++ b/contrib/libpcap/nametoaddr.c @@ -267,7 +267,7 @@ pcap_nametonetaddr(const char *name) * *not* always get set if getnetbyname_r() succeeds. */ np = NULL; - err = getnetbyname_r(name, &result_buf, buf, sizeof buf, &np, + err = getnetbyname_r(name, &result_buf, buf, sizeof buf, &np, &h_errnoval); if (err != 0) { /* @@ -296,16 +296,16 @@ pcap_nametonetaddr(const char *name) else np = &result_buf; #else - /* - * We don't have any getnetbyname_r(); either we have a - * getnetbyname() that uses thread-specific data, in which - * case we're thread-safe (sufficiently recent FreeBSD, - * sufficiently recent Darwin-based OS, sufficiently recent - * HP-UX, sufficiently recent Tru64 UNIX), or we have the - * traditional getnetbyname() (everything else, including - * current NetBSD and OpenBSD), in which case we're not - * thread-safe. - */ + /* + * We don't have any getnetbyname_r(); either we have a + * getnetbyname() that uses thread-specific data, in which + * case we're thread-safe (sufficiently recent FreeBSD, + * sufficiently recent Darwin-based OS, sufficiently recent + * HP-UX, sufficiently recent Tru64 UNIX), or we have the + * traditional getnetbyname() (everything else, including + * current NetBSD and OpenBSD), in which case we're not + * thread-safe. + */ np = getnetbyname(name); #endif if (np != NULL) @@ -552,16 +552,16 @@ pcap_nametoproto(const char *str) else p = &result_buf; #else - /* - * We don't have any getprotobyname_r(); either we have a - * getprotobyname() that uses thread-specific data, in which - * case we're thread-safe (sufficiently recent FreeBSD, - * sufficiently recent Darwin-based OS, sufficiently recent - * HP-UX, sufficiently recent Tru64 UNIX, Windows), or we have + /* + * We don't have any getprotobyname_r(); either we have a + * getprotobyname() that uses thread-specific data, in which + * case we're thread-safe (sufficiently recent FreeBSD, + * sufficiently recent Darwin-based OS, sufficiently recent + * HP-UX, sufficiently recent Tru64 UNIX, Windows), or we have * the traditional getprotobyname() (everything else, including - * current NetBSD and OpenBSD), in which case we're not - * thread-safe. - */ + * current NetBSD and OpenBSD), in which case we're not + * thread-safe. + */ p = getprotobyname(str); #endif if (p != 0) diff --git a/contrib/libpcap/optimize.c b/contrib/libpcap/optimize.c index 0ad0c4163bb0..9af4c15d2ca7 100644 --- a/contrib/libpcap/optimize.c +++ b/contrib/libpcap/optimize.c @@ -3029,14 +3029,14 @@ dot_dump_edge(struct icode *ic, struct block *block, FILE *out) * * example DOT for BPF `ip src host 1.1.1.1' is: digraph BPF { - block0 [shape=ellipse, id="block-0" label="BLOCK0\n\n(000) ldh [12]\n(001) jeq #0x800 jt 2 jf 5" tooltip="val[A]=0 val[X]=0"]; - block1 [shape=ellipse, id="block-1" label="BLOCK1\n\n(002) ld [26]\n(003) jeq #0x1010101 jt 4 jf 5" tooltip="val[A]=0 val[X]=0"]; - block2 [shape=ellipse, id="block-2" label="BLOCK2\n\n(004) ret #68" tooltip="val[A]=0 val[X]=0", peripheries=2]; - block3 [shape=ellipse, id="block-3" label="BLOCK3\n\n(005) ret #0" tooltip="val[A]=0 val[X]=0", peripheries=2]; - "block0":se -> "block1":n [label="T"]; - "block0":sw -> "block3":n [label="F"]; - "block1":se -> "block2":n [label="T"]; - "block1":sw -> "block3":n [label="F"]; + block0 [shape=ellipse, id="block-0" label="BLOCK0\n\n(000) ldh [12]\n(001) jeq #0x800 jt 2 jf 5" tooltip="val[A]=0 val[X]=0"]; + block1 [shape=ellipse, id="block-1" label="BLOCK1\n\n(002) ld [26]\n(003) jeq #0x1010101 jt 4 jf 5" tooltip="val[A]=0 val[X]=0"]; + block2 [shape=ellipse, id="block-2" label="BLOCK2\n\n(004) ret #68" tooltip="val[A]=0 val[X]=0", peripheries=2]; + block3 [shape=ellipse, id="block-3" label="BLOCK3\n\n(005) ret #0" tooltip="val[A]=0 val[X]=0", peripheries=2]; + "block0":se -> "block1":n [label="T"]; + "block0":sw -> "block3":n [label="F"]; + "block1":se -> "block2":n [label="T"]; + "block1":sw -> "block3":n [label="F"]; } * * After install graphviz on https://www.graphviz.org/, save it as bpf.dot diff --git a/contrib/libpcap/pcap-bt-linux.c b/contrib/libpcap/pcap-bt-linux.c index 37c805658253..c7bfef1dfad7 100644 --- a/contrib/libpcap/pcap-bt-linux.c +++ b/contrib/libpcap/pcap-bt-linux.c @@ -367,9 +367,9 @@ bt_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char case HCI_CMSG_DIR: memcpy(&in, CMSG_DATA(cmsg), sizeof in); break; - case HCI_CMSG_TSTAMP: - memcpy(&pkth.ts, CMSG_DATA(cmsg), - sizeof pkth.ts); + case HCI_CMSG_TSTAMP: + memcpy(&pkth.ts, CMSG_DATA(cmsg), + sizeof pkth.ts); break; } cmsg = CMSG_NXTHDR(&msg, cmsg); diff --git a/contrib/libpcap/pcap-common.c b/contrib/libpcap/pcap-common.c index 4f12d8abb18e..75461b12cf26 100644 --- a/contrib/libpcap/pcap-common.c +++ b/contrib/libpcap/pcap-common.c @@ -964,7 +964,7 @@ * which is stored with each packet: * * EXP_PDU_TAG_DISSECTOR_NAME the name of the Wireshark dissector - * that can make sense of the data stored. + * that can make sense of the data stored. * * EXP_PDU_TAG_HEUR_DISSECTOR_NAME the name of the Wireshark heuristic * dissector that can make sense of the @@ -1240,7 +1240,7 @@ static struct linktype_map { { DLT_FR, LINKTYPE_FRELAY }, #endif - { DLT_ATM_RFC1483, LINKTYPE_ATM_RFC1483 }, + { DLT_ATM_RFC1483, LINKTYPE_ATM_RFC1483 }, { DLT_RAW, LINKTYPE_RAW }, { DLT_SLIP_BSDOS, LINKTYPE_SLIP_BSDOS }, { DLT_PPP_BSDOS, LINKTYPE_PPP_BSDOS }, diff --git a/contrib/libpcap/pcap-libdlpi.c b/contrib/libpcap/pcap-libdlpi.c index 70cb5d45f77f..f281fb93393b 100644 --- a/contrib/libpcap/pcap-libdlpi.c +++ b/contrib/libpcap/pcap-libdlpi.c @@ -344,7 +344,7 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf) linknamelist_t *entry, *next; linkwalk_t lw = {NULL, 0}; - int save_errno; + int save_errno; /* * Get the list of regular interfaces first. diff --git a/contrib/libpcap/pcap-linux.c b/contrib/libpcap/pcap-linux.c index 43d2a9f0eec6..13bd8529f65c 100644 --- a/contrib/libpcap/pcap-linux.c +++ b/contrib/libpcap/pcap-linux.c @@ -2,7 +2,7 @@ * pcap-linux.c: Packet capture interface to the Linux kernel * * Copyright (c) 2000 Torsten Landschoff <torsten@debian.org> - * Sebastian Krahmer <krahmer@cs.uni-potsdam.de> + * Sebastian Krahmer <krahmer@cs.uni-potsdam.de> * * License: BSD *** 430 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501291933.50TJXUK1039700>