diff --git a/.cirrus.yml b/.cirrus.yml index b9e13ef708..8a7a08dc43 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 +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 - -fedora39_task: - container: - # Fedora 39 EOL: Around Nov 2024 - dockerfile: ci/fedora-39/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR centosstream9_task: @@ -395,7 +395,7 @@ freebsd14_task: freebsd13_task: freebsd_instance: # FreeBSD 13 EOL: January 31, 2026 - image_family: freebsd-13-3 + image_family: freebsd-13-4 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh diff --git a/CHANGES b/CHANGES index f408c20b80..1b1e418ddc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +7.1.0-dev.535 | 2024-11-13 17:28:09 -0800 + + * CI: Use FEDORA40 crypto policy in Fedora 41 (Johanna Amann, Corelight) + + * Bump zeekjs to 0.13.0 (Arne Welzel, Corelight) + + * CI: bump FreeBSD 13 to 13.4, released in September (Christian Kreibich, Corelight) + + * CI: drop Fedora 39, add 41 (Christian Kreibich, Corelight) + + * Update doc submodule [nomail] [skip ci] (zeek-bot) + 7.1.0-dev.529 | 2024-11-13 14:36:04 -0700 * Add NEWS entry for ip_proto feature (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 3e3344d615..e3738d79b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0-dev.529 +7.1.0-dev.535 diff --git a/auxil/zeekjs b/auxil/zeekjs index acae06c60c..805a4663f9 160000 --- a/auxil/zeekjs +++ b/auxil/zeekjs @@ -1 +1 @@ -Subproject commit acae06c60c4631892c5b497557c5e12283e4218f +Subproject commit 805a4663f9326726d179f6af15a592ab4d9c2952 diff --git a/ci/fedora-39/Dockerfile b/ci/fedora-41/Dockerfile similarity index 69% rename from ci/fedora-39/Dockerfile rename to ci/fedora-41/Dockerfile index 4daaa89308..7551a2739f 100644 --- a/ci/fedora-39/Dockerfile +++ b/ci/fedora-41/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:39 +FROM fedora:41 # 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 20231208 +ENV DOCKERFILE_VERSION 20241112 RUN dnf -y install \ bison \ @@ -28,6 +28,11 @@ RUN dnf -y install \ swig \ which \ zlib-devel \ + crypto-policies-scripts \ && dnf clean all && rm -rf /var/cache/dnf RUN pip3 install websockets junit2html + +# Required to allow validation of certificates with SHA1 signatures +# See: https://fedoraproject.org/wiki/Changes/OpenSSLDistrustSHA1SigVer +RUN update-crypto-policies --set FEDORA40