diff --git a/CHANGES b/CHANGES index 5140b3b96bd..1b0d83adca7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-288 | 2019-05-14 17:47:55 -0700 + + * Update CMake to use aux/zeekctl and aux/zeek-aux submodules (Jon Siwek, Corelight) + 2.6-287 | 2019-05-14 17:40:40 -0700 * Rename broctl submodule to zeekctl (Jon Siwek, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index f49fdfcdb6d..7fe5c3e2ee4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,8 +331,8 @@ add_subdirectory(man) include(CheckOptionalBuildSources) -CheckOptionalBuildSources(aux/broctl ZeekControl INSTALL_ZEEKCTL) -CheckOptionalBuildSources(aux/bro-aux Bro-Aux INSTALL_AUX_TOOLS) +CheckOptionalBuildSources(aux/zeekctl ZeekControl INSTALL_ZEEKCTL) +CheckOptionalBuildSources(aux/zeek-aux Zeek-Aux INSTALL_AUX_TOOLS) ######################################################################## ## Packaging Setup diff --git a/VERSION b/VERSION index 6d6eb4e3cef..b2c215b835e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-287 +2.6-288