diff --git a/CHANGES b/CHANGES index b2ff8af546..ac52339f2d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +8.0.0-dev.491 | 2025-06-23 10:39:31 -0700 + + * Remove unneeded include dirs in zeromq CMakeLists.txt (Tim Wojtulewicz, Corelight) + 8.0.0-dev.489 | 2025-06-23 10:36:38 -0700 * Deprecate BRO_PLUGIN_INSTALL_PATH constant (Tim Wojtulewicz, Corelight) @@ -8,6 +12,8 @@ * Fix clang-tidy warnings in headers (Tim Wojtulewicz, Corelight) + This entry is a large collection of commits. + * Change clang-tidy configuration to also scan headers (Tim Wojtulewicz, Corelight) * Don't pass local source/binary directory to zeek_add_plugin for Redis backend (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 22e4c84c99..0b57925b5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.489 +8.0.0-dev.491 diff --git a/src/cluster/backend/zeromq/CMakeLists.txt b/src/cluster/backend/zeromq/CMakeLists.txt index 3e21808621..7f97a7878e 100644 --- a/src/cluster/backend/zeromq/CMakeLists.txt +++ b/src/cluster/backend/zeromq/CMakeLists.txt @@ -4,7 +4,7 @@ find_package(ZeroMQ REQUIRED) zeek_add_plugin( Zeek Cluster_Backend_ZeroMQ - INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZeroMQ_INCLUDE_DIRS} + INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS} DEPENDENCIES ${ZeroMQ_LIBRARIES} SOURCES Plugin.cc ZeroMQ-Proxy.cc ZeroMQ.cc BIFS cluster_backend_zeromq.bif) diff --git a/src/cluster/backend/zeromq/cluster_backend_zeromq.bif b/src/cluster/backend/zeromq/cluster_backend_zeromq.bif index 4721a19c6b..440b14c0ac 100644 --- a/src/cluster/backend/zeromq/cluster_backend_zeromq.bif +++ b/src/cluster/backend/zeromq/cluster_backend_zeromq.bif @@ -1,5 +1,5 @@ %%{ -#include "ZeroMQ.h" +#include "zeek/cluster/backend/zeromq/ZeroMQ.h" %%} function Cluster::Backend::ZeroMQ::spawn_zmq_proxy_thread%(%): bool