Merge remote-tracking branch 'origin/topic/timw/ci-updates'

* origin/topic/timw/ci-updates:
  CI: Force all other CI docker images to rebuild
  CI: Drop macOS Sonoma, add macOS Sequoia and Tahoe
  CI: Drop Ubuntu 24.10, add Ubuntu 25.04
  CI: Drop OpenSUSE Leap 15.5, add OpenSUSE Leap 16.0
  CI: Drop debian 11, add debian 13
  CI: Add centos stream 10
  CI: Drop Fedora 41, add Fedora 43
  CI: Bump FreeBSD to 14.3 and 13.5

Author: timwoj

.cirrus.yml

@@ -15,16 +15,22 @@ ci_template: &CI_TEMPLATE
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
+fedora43_task:
+  container:
+    # Fedora 43 EOL: Around Nov 2026
+    dockerfile: ci/fedora-43/Dockerfile
+  << : *CI_TEMPLATE
+
 fedora42_task:
   container:
     # Fedora 42 EOL: Around May 2026
     dockerfile: ci/fedora-42/Dockerfile
   << : *CI_TEMPLATE
 
-fedora41_task:
+centosstream10_task:
   container:
-    # Fedora 41 EOL: Around Nov 2025
-    dockerfile: ci/fedora-41/Dockerfile
+    # Stream 10 EOL: 01 January 2030
+    dockerfile: ci/centos-stream-10/Dockerfile
   << : *CI_TEMPLATE
 
 centosstream9_task:
@@ -33,27 +39,27 @@ centosstream9_task:
     dockerfile: ci/centos-stream-9/Dockerfile
   << : *CI_TEMPLATE
 
-debian12_task:
+debian13_task:
   container:
-    # Debian 12 EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    # Debian 13 (trixie) EOL: TBD
+    dockerfile: ci/debian-13/Dockerfile
   << : *CI_TEMPLATE
 
-debian11_task:
+debian12_task:
   container:
-    # Debian 11 EOL: June 2026
-    dockerfile: ci/debian-11/Dockerfile
+    # Debian 12 (bookworm) EOL: TBD
+    dockerfile: ci/debian-12/Dockerfile
   << : *CI_TEMPLATE
 
-opensuse_leap_15_5_task:
+opensuse_leap_16_0_task:
   container:
-    # Opensuse Leap 15.5 EOL: Around Dec 25
-    dockerfile: ci/opensuse-leap-15.5/Dockerfile
+    # Opensuse Leap 15.6 EOL: 31 October 2026
+    dockerfile: ci/opensuse-leap-16.0/Dockerfile
   << : *CI_TEMPLATE
 
 opensuse_leap_15_6_task:
   container:
-    # Opensuse Leap 15.6 EOL: ~Dec 2025
+    # Opensuse Leap 15.6 EOL: 30 April 2026
     dockerfile: ci/opensuse-leap-15.6/Dockerfile
   << : *CI_TEMPLATE
 
@@ -64,10 +70,10 @@ opensuse_tumbleweed_task:
   prepare_script: ./ci/opensuse-tumbleweed/prepare.sh
   << : *CI_TEMPLATE
 
-ubuntu24_10_task:
+ubuntu25_task:
   container:
-    # Ubuntu 24.10 EOL: 2025-07-30
-    dockerfile: ci/ubuntu-24.10/Dockerfile
+    # Ubuntu 25.04 EOL: 2026-01-31
+    dockerfile: ci/ubuntu-25.04/Dockerfile
   << : *CI_TEMPLATE
 
 ubuntu24_task:
@@ -82,24 +88,29 @@ ubuntu22_task:
     dockerfile: ci/ubuntu-22.04/Dockerfile
   << : *CI_TEMPLATE
 
-# Cirrus currently only supports running on Sonoma.
-macos_sonoma_task:
+macos_tahoe_task:
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-runner:tahoe
+  prepare_script: ./ci/macos/prepare.sh
+  << : *CI_TEMPLATE
+
+macos_sequoia_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:sonoma
+    image: ghcr.io/cirruslabs/macos-runner:sequoia
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
 
 # FreeBSD EOL timelines: https://www.freebsd.org/security/#sup
 freebsd14_task:
   freebsd_instance:
     # FreeBSD 14 EOL: Nov 30 2028
-    image_family: freebsd-14-2
+    image_family: freebsd-14-3
   prepare_script: ./ci/freebsd/prepare.sh
   << : *CI_TEMPLATE
 
 freebsd13_task:
   freebsd_instance:
     # FreeBSD 13 EOL: January 31, 2026
-    image_family: freebsd-13-4
+    image_family: freebsd-13-5
   prepare_script: ./ci/freebsd/prepare.sh
   << : *CI_TEMPLATE

CHANGES

@@ -1,3 +1,21 @@
+0.50-213 | 2026-01-07 14:42:13 -0700
+
+  * CI: Force all other CI docker images to rebuild (Tim Wojtulewicz, Corelight)
+
+  * CI: Drop macOS Sonoma, add macOS Sequoia and Tahoe (Tim Wojtulewicz, Corelight)
+
+  * CI: Drop Ubuntu 24.10, add Ubuntu 25.04 (Tim Wojtulewicz, Corelight)
+
+  * CI: Drop OpenSUSE Leap 15.5, add OpenSUSE Leap 16.0 (Tim Wojtulewicz, Corelight)
+
+  * CI: Drop debian 11, add debian 13 (Tim Wojtulewicz, Corelight)
+
+  * CI: Add centos stream 10 (Tim Wojtulewicz, Corelight)
+
+  * CI: Drop Fedora 41, add Fedora 43 (Tim Wojtulewicz, Corelight)
+
+  * CI: Bump FreeBSD to 14.3 and 13.5 (Tim Wojtulewicz, Corelight)
+
 0.50-204 | 2026-01-07 11:25:22 -0700
 
   * Bump aiohttp from 3.12.15 to 3.13.3 in /devel-tools/cirrus-status (dependabot[bot])

README

@@ -1,7 +1,7 @@
 .. -*- mode: rst; -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.50-204
+.. |version| replace:: 0.50-213
 
 =======================
 Zeek Auxiliary Programs

VERSION

@@ -1 +1 @@
-0.50-204
+0.50-213

ci/centos-stream-10/Dockerfile

@@ -0,0 +1,30 @@
+FROM quay.io/centos/centos:stream10
+
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20260107
+
+# dnf config-manager isn't available at first, and
+# we need it to install the CRB repo below.
+RUN dnf -y install 'dnf-command(config-manager)'
+
+# What used to be powertools is now called "CRB".
+# We need it for some of the packages installed below.
+# https://docs.fedoraproject.org/en-US/epel/
+RUN dnf config-manager --set-enabled crb
+RUN dnf -y install \
+    https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
+
+RUN dnf -y update && dnf -y install \
+    cmake3 \
+    diffutils \
+    gcc-c++ \
+    git \
+    libpcap-devel \
+    make \
+    procps-ng \
+    python3 \
+    python3-pip\
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip install btest

ci/centos-stream-9/Dockerfile

@@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream9
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20230823
+ENV DOCKERFILE_VERSION 20260107
 
 # dnf config-manager isn't available at first, and
 # we need it to install the CRB repo below.

ci/debian-12/Dockerfile

@@ -2,7 +2,7 @@ FROM debian:12
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20231213
+ENV DOCKERFILE_VERSION 20260107
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 

ci/debian-11/Dockerfile ci/debian-13/Dockerfileci/debian-11/Dockerfile renamed to ci/debian-13/Dockerfile

@@ -1,8 +1,8 @@
-FROM debian:11
+FROM debian:13
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20230823
+ENV DOCKERFILE_VERSION 20260107
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
@@ -17,4 +17,4 @@ RUN apt-get update && apt-get -y install \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install btest
+RUN pip3 install --break-system-packages btest

ci/fedora-42/Dockerfile

@@ -2,7 +2,7 @@ FROM fedora:42
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20250508
+ENV DOCKERFILE_VERSION 20260107
 
 RUN dnf -y install \
     cmake \

ci/fedora-41/Dockerfile ci/fedora-43/Dockerfileci/fedora-41/Dockerfile renamed to ci/fedora-43/Dockerfile

@@ -1,8 +1,8 @@
-FROM fedora:41
+FROM fedora:43
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20241204
+ENV DOCKERFILE_VERSION 20260107
 
 RUN dnf -y install \
     cmake \