Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/neverlord/broker-bump'

Browse source 
* origin/topic/neverlord/broker-bump:
  Update Broker submodule
This commit is contained in:
Tim Wojtulewicz 2024-03-18 16:15:44 -07:00
commit aac723cfe5
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 7.0.0-dev.72 | 2024-03-18 09:55:51 +0100
* btest/spicy: Remove most port usages (Arne Welzel, Corelight) * btest/spicy: Remove most port usages (Arne Welzel, Corelight)

8
CMakeLists.txt
View file

@ -324,13 +324,13 @@ endfunction ()
add_zeek_dynamic_plugin_build_interface_include_directories( add_zeek_dynamic_plugin_build_interface_include_directories(
${PROJECT_SOURCE_DIR}/src/include ${PROJECT_SOURCE_DIR}/src/include
${PROJECT_SOURCE_DIR}/auxil/binpac/lib ${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/paraglob/include
${PROJECT_SOURCE_DIR}/auxil/rapidjson/include ${PROJECT_SOURCE_DIR}/auxil/rapidjson/include
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/include ${CMAKE_BINARY_DIR}/src/include
${CMAKE_BINARY_DIR}/auxil/binpac/lib ${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 # threading/formatters/JSON.h includes rapidjson headers and may be used
# by external plugins, extend the include path. # by external plugins, extend the include path.
@ -902,8 +902,8 @@ else ()
list(APPEND zeekdeps broker) list(APPEND zeekdeps broker)
endif () endif ()
set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/auxil/broker/include set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/auxil/broker/libbroker
${CMAKE_CURRENT_BINARY_DIR}/auxil/broker/include) ${CMAKE_CURRENT_BINARY_DIR}/auxil/broker/libbroker)
if (BUILD_STATIC_BROKER) if (BUILD_STATIC_BROKER)
set(ZEEK_HAS_STATIC_BROKER ON) set(ZEEK_HAS_STATIC_BROKER ON)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.72 7.0.0-dev.76

2
auxil/broker

@ -1 +1 @@
Subproject commit 861c20612e8b28811458ff9a96f091cc6de0c005 Subproject commit e730286f3e068f07f23ebffdc442d25532962480

2
cmake_templates/hilti-cxx-include-dirs.in
View file

@ -15,6 +15,6 @@ PATHS=$PATHS:@CMAKE_BINARY_DIR@/src
PATHS=$PATHS:@CMAKE_BINARY_DIR@/src/include PATHS=$PATHS:@CMAKE_BINARY_DIR@/src/include
PATHS=$PATHS:@CMAKE_SOURCE_DIR@/src PATHS=$PATHS:@CMAKE_SOURCE_DIR@/src
PATHS=$PATHS:@CMAKE_SOURCE_DIR@/src/include 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 echo $PATHS