Merge branch 'topic/christian/enable-zeekclient'

* topic/christian/enable-zeekclient:
  Provide zeek-client by default

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TEST_TAG: zeek:latest
-      CONFFLAGS: --generator=Ninja --build-type=Release --enable-zeek-client
+      CONFFLAGS: --generator=Ninja --build-type=Release
     steps:
       - uses: actions/checkout@v2
         with:

CHANGES

@@ -1,3 +1,7 @@
+5.1.0-dev.75 | 2022-06-22 12:06:00 -0700
+
+  * Provide zeek-client by default (Christian Kreibich, Corelight)
+
 5.1.0-dev.73 | 2022-06-22 09:40:05 -0700
 
   * GH-1991: Add option to limit the number of tunnel_changed events (Tim Wojtulewicz, Corelight)

CMakeLists.txt

@@ -809,6 +809,7 @@ message(
     "\nCXXFLAGS:          ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BuildType}}"
     "\nCPP:               ${CMAKE_CXX_COMPILER}"
     "\n"
+    "\nzeek-client:       ${INSTALL_ZEEK_CLIENT}"
     "\nZeekControl:       ${INSTALL_ZEEKCTL}"
     "\nAux. Tools:        ${INSTALL_AUX_TOOLS}"
     "\nBifCL:             ${_bifcl_exe_path}"

VERSION

@@ -1 +1 @@
-5.1.0-dev.73
+5.1.0-dev.75

configure

@@ -62,7 +62,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-perftools-debug use Google's perftools for debugging
     --enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
     --enable-static-broker build Broker statically (ignored if --with-broker is specified)
-    --enable-zeek-client   install the Zeek cluster management client (experimental)
     --disable-archiver     don't build or install zeek-archiver tool
     --disable-auxtools     don't build or install auxiliary tools
     --disable-broker-tests don't try to build Broker unit tests
@@ -71,6 +70,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --disable-cpp-tests    don't build Zeek's C++ unit tests
     --disable-python       don't try to build python bindings for Broker
     --disable-spicy        don't include Spicy
+    --disable-zeek-client  don't install Zeek cluster management client
     --disable-zeekctl      don't install ZeekControl
     --disable-zkg          don't install zkg
 
@@ -173,6 +173,7 @@ append_cache_entry INSTALL_AUX_TOOLS BOOL true
 append_cache_entry INSTALL_BTEST BOOL true
 append_cache_entry INSTALL_BTEST_PCAPS BOOL true
 append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL true
+append_cache_entry INSTALL_ZEEK_CLIENT BOOL true
 append_cache_entry INSTALL_ZEEKCTL BOOL true
 append_cache_entry INSTALL_ZKG BOOL true
 append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
@@ -293,9 +294,6 @@ while [ $# -ne 0 ]; do
         --enable-static-broker)
             append_cache_entry BUILD_STATIC_BROKER BOOL true
             ;;
-        --enable-zeek-client)
-            append_cache_entry INSTALL_ZEEK_CLIENT BOOL true
-            ;;
         --disable-archiver)
             append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false
             ;;
@@ -321,6 +319,9 @@ while [ $# -ne 0 ]; do
         --disable-spicy)
             append_cache_entry DISABLE_SPICY BOOL true
             ;;
+        --disable-zeek-client)
+            append_cache_entry INSTALL_ZEEK_CLIENT BOOL false
+            ;;
         --disable-zeekctl)
             append_cache_entry INSTALL_ZEEKCTL BOOL false
             ;;