From b7a937372d1e8c8518fde0ca0ea9410cf9054933 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 09:25:19 +0200 Subject: [PATCH] Merge branch 'gcc15' of https://github.com/i2z1/zeek * 'gcc15' of https://github.com/i2z1/zeek: Include cstdint header to support uint8_t/uint64_t in GCC 15+ (cherry picked from commit 60efc7741dda72766123dd4a1aef9d9487f05fc2) --- CHANGES | 6 ++++++ NEWS | 5 +++++ VERSION | 2 +- src/cluster/websocket/WebSocket.h | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 527ee8411c..61914b149d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.2.0-3 | 2025-05-19 09:26:16 -0700 + + * Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1) + + (cherry picked from commit 60efc7741dda72766123dd4a1aef9d9487f05fc2) + 7.2.0-2 | 2025-05-19 09:23:58 -0700 * fix for ZAM optimization when an aggregate is modified inside of a loop (Vern Paxson, Corelight) diff --git a/NEWS b/NEWS index c3602709aa..3a72411f79 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,11 @@ This document summarizes the most important changes in the current Zeek release. For an exhaustive list of changes, see the ``CHANGES`` file (note that submodules, such as Broker, come with their own ``CHANGES``.) +Zeek 7.2.1 +========== + +We would like to thank Ivan Navi (@i2z1) for their contribution to this release. + Zeek 7.2.0 ========== diff --git a/VERSION b/VERSION index d3bb868b32..56788e985d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-2 +7.2.0-3 diff --git a/src/cluster/websocket/WebSocket.h b/src/cluster/websocket/WebSocket.h index 296c9a731d..685c16b077 100644 --- a/src/cluster/websocket/WebSocket.h +++ b/src/cluster/websocket/WebSocket.h @@ -2,6 +2,7 @@ #pragma once +#include #include #include #include