From 993502e0b6b8f634ea7730f36ae39e97ce144bcb Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 1 Aug 2025 09:43:54 +0200
Subject: [PATCH 1/2] cluster/zeromq: Bail on missing ZeroMQ by default

---
 NEWS                               | 6 ++++++
 src/cluster/backend/CMakeLists.txt | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index a5666e10c9..98752beea4 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,12 @@ release.
 Breaking Changes
 ----------------
 
+- Zeek by default now depends on the availability of the ZeroMQ library for building
+  and running. This is in preparation of switching to the ZeroMQ-based cluster backend
+  by default in future Zeek versions. On an Ubuntu based system, the required system
+  packages are ``libzmq5``, ``libzmq3-dev`` and ``cppzmq-dev``. See the Dockerfiles
+  in the ``ci/`` directory for other supported platforms.
+
 - Zeek and all of its associated submodules now require C++20-capable compilers to
   build. This will let us move forward in using more modern C++ features and replace some
   workarounds that we have been carrying. Minimum recommended versions of compilers are
diff --git a/src/cluster/backend/CMakeLists.txt b/src/cluster/backend/CMakeLists.txt
index 109bdc411f..e577282233 100644
--- a/src/cluster/backend/CMakeLists.txt
+++ b/src/cluster/backend/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(ZeroMQ)
 #
 # If a user enabled the cluster backend explicitly (-D ENABLE_CLUSTER_BACKEND_ZEROMQ:bool=ON),
 # but ZeroMQ wasn' found, hard bail.
-option(ENABLE_CLUSTER_BACKEND_ZEROMQ "Enable the ZeroMQ cluster backend" ${ZeroMQ_FOUND})
+option(ENABLE_CLUSTER_BACKEND_ZEROMQ "Enable the ZeroMQ cluster backend" ON)
 
 if (ENABLE_CLUSTER_BACKEND_ZEROMQ)
     if (NOT ZeroMQ_FOUND)

From 7a68208ecf045e41ed241750202f274d0cd3f130 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 1 Aug 2025 10:17:10 +0200
Subject: [PATCH 2/2] ci/windows: No ZeroMQ cluster backend

Doesn't seems there's libzmq available, so just skip building.
---
 ci/windows/build.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/windows/build.cmd b/ci/windows/build.cmd
index a539846c6f..be1c92eede 100644
--- a/ci/windows/build.cmd
+++ b/ci/windows/build.cmd
@@ -7,5 +7,5 @@ call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliar
 mkdir build
 cd build
 
-cmake.exe .. -DCMAKE_BUILD_TYPE=release -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DENABLE_ZEEK_UNIT_TESTS=yes -G Ninja
+cmake.exe .. -DCMAKE_BUILD_TYPE=release -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DENABLE_ZEEK_UNIT_TESTS=yes -DENABLE_CLUSTER_BACKEND_ZEROMQ=no -G Ninja
 cmake.exe --build .