diff --git a/CHANGES b/CHANGES index ff21d36f63..10c9e83d8d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.0.0-dev.76 | 2024-03-18 16:15:44 -0700 + + * Update Broker submodule (Dominik Charousset, Corelight) + + * cirrus: Remove misleading and always empty AWS_ECR_USERNAME (Arne Welzel, Corelight) + 7.0.0-dev.72 | 2024-03-18 09:55:51 +0100 * btest/spicy: Remove most port usages (Arne Welzel, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index f57e928ef0..a7d7a23816 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,13 +324,13 @@ endfunction () add_zeek_dynamic_plugin_build_interface_include_directories( ${PROJECT_SOURCE_DIR}/src/include ${PROJECT_SOURCE_DIR}/auxil/binpac/lib - ${PROJECT_SOURCE_DIR}/auxil/broker/include + ${PROJECT_SOURCE_DIR}/auxil/broker/libbroker ${PROJECT_SOURCE_DIR}/auxil/paraglob/include ${PROJECT_SOURCE_DIR}/auxil/rapidjson/include ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/include ${CMAKE_BINARY_DIR}/auxil/binpac/lib - ${CMAKE_BINARY_DIR}/auxil/broker/include) + ${CMAKE_BINARY_DIR}/auxil/broker/libbroker) # threading/formatters/JSON.h includes rapidjson headers and may be used # by external plugins, extend the include path. @@ -902,8 +902,8 @@ else () list(APPEND zeekdeps broker) endif () - set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/auxil/broker/include - ${CMAKE_CURRENT_BINARY_DIR}/auxil/broker/include) + set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/auxil/broker/libbroker + ${CMAKE_CURRENT_BINARY_DIR}/auxil/broker/libbroker) if (BUILD_STATIC_BROKER) set(ZEEK_HAS_STATIC_BROKER ON) diff --git a/VERSION b/VERSION index 343217bda7..ed734ae4a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.72 +7.0.0-dev.76 diff --git a/auxil/broker b/auxil/broker index 861c20612e..e730286f3e 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit 861c20612e8b28811458ff9a96f091cc6de0c005 +Subproject commit e730286f3e068f07f23ebffdc442d25532962480 diff --git a/cmake_templates/hilti-cxx-include-dirs.in b/cmake_templates/hilti-cxx-include-dirs.in index 0bc6a8c33b..d1aa9cd5d7 100755 --- a/cmake_templates/hilti-cxx-include-dirs.in +++ b/cmake_templates/hilti-cxx-include-dirs.in @@ -15,6 +15,6 @@ PATHS=$PATHS:@CMAKE_BINARY_DIR@/src PATHS=$PATHS:@CMAKE_BINARY_DIR@/src/include PATHS=$PATHS:@CMAKE_SOURCE_DIR@/src PATHS=$PATHS:@CMAKE_SOURCE_DIR@/src/include -PATHS=$PATHS:@CMAKE_SOURCE_DIR@/auxil/broker/include/ +PATHS=$PATHS:@CMAKE_SOURCE_DIR@/auxil/broker/libbroker echo $PATHS