From b377fb1d5ac05dce4a46ed0643dfadc1b8dbb12e Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Thu, 8 May 2025 13:18:52 +0200
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/awelzel/ci-fedora-42'

* origin/topic/awelzel/ci-fedora-42:
  probabilistic/BitVector: Add include <cstdint>
  Bump spicy to fix build with GCC 15.1
  CI: Drop fedora-40
  CI: Add fedora-42

(cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
---
 .cirrus.yml                            | 14 +++++++-------
 CHANGES                                | 14 ++++++++++++++
 VERSION                                |  2 +-
 ci/{fedora-40 => fedora-42}/Dockerfile |  9 ++++++---
 src/probabilistic/BitVector.h          |  1 +
 5 files changed, 29 insertions(+), 11 deletions(-)
 rename ci/{fedora-40 => fedora-42}/Dockerfile (83%)

diff --git a/.cirrus.yml b/.cirrus.yml
index 99f0cafa84..55c992e3d7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -174,19 +174,19 @@ env:
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
+fedora42_task:
+  container:
+    # Fedora 42 EOL: Around May 2026
+    dockerfile: ci/fedora-42/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 fedora41_task:
   container:
     # Fedora 41 EOL: Around Nov 2025
     dockerfile: ci/fedora-41/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-
-fedora40_task:
-  container:
-    # Fedora 40 EOL: Around May 2025
-    dockerfile: ci/fedora-40/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
 centosstream9_task:
diff --git a/CHANGES b/CHANGES
index 61914b149d..c9f721ee09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+7.2.0-4 | 2025-05-19 09:29:01 -0700
+
+  * probabilistic/BitVector: Add include <cstdint> (Arne Welzel, Corelight)
+
+    (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
+
+  * CI: Drop fedora-40 (Arne Welzel, Corelight)
+
+    (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
+
+  * CI: Add fedora-42 (Arne Welzel, Corelight)
+
+    (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
+
 7.2.0-3 | 2025-05-19 09:26:16 -0700
 
   * Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1)
diff --git a/VERSION b/VERSION
index 56788e985d..de200606ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.2.0-3
+7.2.0-4
diff --git a/ci/fedora-40/Dockerfile b/ci/fedora-42/Dockerfile
similarity index 83%
rename from ci/fedora-40/Dockerfile
rename to ci/fedora-42/Dockerfile
index f2615b7007..578f168b26 100644
--- a/ci/fedora-40/Dockerfile
+++ b/ci/fedora-42/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora:40
+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 20241024
+ENV DOCKERFILE_VERSION 20250508
 
 RUN dnf -y install \
     bison \
@@ -10,8 +10,9 @@ RUN dnf -y install \
     cmake \
     cppzmq-devel \
     diffutils \
-    dnsmasq \
+    findutils \
     flex \
+    gawk \
     gcc \
     gcc-c++ \
     git \
@@ -22,12 +23,14 @@ RUN dnf -y install \
     openssl \
     openssl-devel \
     procps-ng \
+    python3 \
     python3-devel \
     python3-pip\
     sqlite \
     swig \
     which \
     zlib-devel \
+    crypto-policies-scripts \
   && dnf clean all && rm -rf /var/cache/dnf
 
 RUN pip3 install websockets junit2html
diff --git a/src/probabilistic/BitVector.h b/src/probabilistic/BitVector.h
index 5ddd582e63..e1b5ce35be 100644
--- a/src/probabilistic/BitVector.h
+++ b/src/probabilistic/BitVector.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iterator>
 #include <memory>
 #include <optional>