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 175cfadeee..031b4d2919 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +8.0.0-dev.72 | 2025-05-08 13:18:52 +0200 + + * probabilistic/BitVector: Add include (Arne Welzel, Corelight) + + * Bump spicy to fix build with GCC 15.1 (Arne Welzel, Corelight) + + * CI: Drop fedora-40 (Arne Welzel, Corelight) + + * CI: Add fedora-42 (Arne Welzel, Corelight) + 8.0.0-dev.67 | 2025-05-08 09:25:19 +0200 * Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1) diff --git a/VERSION b/VERSION index 33a3ad64fb..88942b808d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.67 +8.0.0-dev.72 diff --git a/auxil/spicy b/auxil/spicy index e15e0bd959..cb1b9c96ae 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit e15e0bd959a03d06822ae76b53eef6181daf01a2 +Subproject commit cb1b9c96aeabcdd9850bff95a5edd865af1050d4 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 #include #include #include