Merge branch 'the-tcpdump-group:master' into haiku-ci

Author: korli

.appveyor.yml

@@ -10,61 +10,51 @@ matrix:
   fast_finish: true
 
 install:
-  - appveyor DownloadFile https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip
-  - 7z x .\WpdPack_4_1_2.zip -oc:\projects\libpcap\Win32
-  - appveyor DownloadFile https://npcap.com/dist/npcap-sdk-1.12.zip
-  - 7z x .\npcap-sdk-1.12.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.12
+  - appveyor DownloadFile https://npcap.com/dist/npcap-sdk-1.13.zip
+  - 7z x .\npcap-sdk-1.13.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.13
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GENERATOR: "Visual Studio 14 2015"
-      SDK: WpdPack
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GENERATOR: "Visual Studio 14 2015 Win64"
-      SDK: WpdPack
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GENERATOR: "Visual Studio 14 2015"
-      SDK: npcap-sdk-1.12
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GENERATOR: "Visual Studio 14 2015 Win64"
-      SDK: npcap-sdk-1.12
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: "Visual Studio 15 2017"
-      SDK: WpdPack
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      GENERATOR: "Visual Studio 15 2017 Win64"
-      SDK: WpdPack
+      PLATFORM: Win32
+      SDK: npcap-sdk-1.13
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: "Visual Studio 15 2017"
-      SDK: npcap-sdk-1.12
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      GENERATOR: "Visual Studio 15 2017 Win64"
-      SDK: npcap-sdk-1.12
+      PLATFORM: x64
+      SDK: npcap-sdk-1.13
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: "Visual Studio 16 2019"
       PLATFORM: Win32
-      SDK: WpdPack
+      SDK: npcap-sdk-1.13
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: "Visual Studio 16 2019"
       PLATFORM: x64
-      SDK: WpdPack
+      SDK: npcap-sdk-1.13
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: "Visual Studio 16 2019"
+      PLATFORM: ARM64
+      SDK: npcap-sdk-1.13
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      GENERATOR: "Visual Studio 17 2022"
       PLATFORM: Win32
-      SDK: npcap-sdk-1.12
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      GENERATOR: "Visual Studio 16 2019"
+      SDK: npcap-sdk-1.13
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      GENERATOR: "Visual Studio 17 2022"
       PLATFORM: x64
-      SDK: npcap-sdk-1.12
+      SDK: npcap-sdk-1.13
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      GENERATOR: "Visual Studio 17 2022"
+      PLATFORM: ARM64
+      SDK: npcap-sdk-1.13
 
 build_script:
   #
   # Appveyor defaults to cmd.exe, so use cmd.exe syntax.
   #
+  - git show --oneline -s
   - type NUL >.devel
   - md build
   - cd build
-  - if NOT DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" ..
-  - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% ..
+  - cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% ..
   - msbuild /m /nologo /p:Configuration=Release tcpdump.sln

.cirrus.yml

@@ -1,23 +1,19 @@
 env:
   CIRRUS_CLONE_DEPTH: 3 # The internal git client reads CIRRUS_CLONE_DEPTH.
   LIBPCAP_GIT: https://github.com/the-tcpdump-group/libpcap.git
+  AUTOCONF_WARNINGS: no-obsolete
 
 freebsd_task:
   name: freebsd-amd64
   only_if: $CIRRUS_BRANCH != 'coverity_scan'
   freebsd_instance:
     # FreeBSD fails to start with 1 GB. 8 CPUs max concurrency.
     # The number of CPU cores must be either 1 or a multiple of 2.
-    matrix:
-      - image_family: freebsd-13-2
-        cpu: 2
-        memory: 2G
-      - image_family: freebsd-14-0
-        cpu: 2
-        memory: 2G
+    cpu: 1
+    memory: 2G
+    image_family: freebsd-13-4
   env:
     IGNORE_OSVERSION: yes
-    MAKEFLAGS: -j 3
     MATRIX_CC: clang17 gcc13
   script:
     - pkg install -qy git autoconf gcc13 llvm17
@@ -34,36 +30,29 @@ linux_task:
   container:
     # Linux works just fine with 1 GB. 16 CPUs max concurrency.
     # The number of CPU cores must be either 1 or a multiple of 2.
-    cpu: 4
+    cpu: 1
     memory: 1G
-    image: ubuntu:22.04
+    image: ubuntu:24.04
   env:
     DEBIAN_FRONTEND: noninteractive
-    MAKEFLAGS: -j 5
-    MATRIX_CC: gcc clang-15
     LANG: C
   script:
     - apt-get -qy update >/dev/null
-    - apt-get -qy install git autoconf make cmake clang-15 gcc >/dev/null
+    - apt-get -qy install autoconf make gcc libpcap-dev >/dev/null # for "./configure"
     - apt-get -qy install flex bison libdbus-1-dev libbluetooth-dev libnl-genl-3-dev libibverbs-dev >/dev/null # for libpcap
-    - apt-get -qy install libssl-dev libsmi2-dev libcap-ng-dev libpcap-dev binutils-dev >/dev/null
-    - apt-get -qy install sudo >/dev/null # for some tcpdump commands
+    - apt-get -qy install cmake git binutils-dev >/dev/null # for "make releasecheck"
     - apt-get -qy install shellcheck >/dev/null
-    - apt list --installed 'lib*-dev'
-    - echo '$ git clone [...] libpcap.git'
-    - git -C .. clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet ${LIBPCAP_GIT}
     - ./autogen.sh
     - ./configure --quiet # build the Makefile
     - make releasecheck
     - make whitespacecheck
     - make shellcheck
-    - ./build_matrix.sh
 
 macos_task:
   name: macos-aarch64
   only_if: $CIRRUS_BRANCH != 'coverity_scan'
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # macOS 13 with Xcode 14.1
+    image: ghcr.io/cirruslabs/macos-runner:sonoma # last 3 versions of Xcode
   env:
     MAKEFLAGS: '-j 4'
   script:
@@ -77,12 +66,12 @@ coverity_task:
   name: Coverity Scan
   only_if: $CIRRUS_BRANCH == 'coverity_scan'
   container:
-    cpu: 4
+    cpu: 1
     memory: 2G
-    image: ubuntu:22.04
+    image: ubuntu:24.04
   env:
     DEBIAN_FRONTEND: noninteractive
-    MAKEFLAGS: -j 5
+    LANG: C
     COVERITY_SCAN_PROJECT_NAME: $CIRRUS_REPO_FULL_NAME
     COVERITY_SCAN_TOKEN: ENCRYPTED[1b6f994cabfe74267ce2dce81fd9e49f694e9cfe69fb99f7d1580907bec1266efd7b38df3a47ccab53d5af98636f8e9c]
     COVERITY_SCAN_BUILD_COMMAND_PREPEND: ./configure --enable-instrument-functions --enable-smb

.gitignore

@@ -2,6 +2,8 @@
 *.rej
 /Makefile
 *~
+.*.swo
+.*.swp
 /*.o
 *.gcda
 *.gcno