diff --git a/CHANGES b/CHANGES index 146e43661f..d2a8ce1624 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +6.0.0-dev.491 | 2023-05-03 09:31:36 -0700 + + * Surround string assignments in zeek-config in quotes (Tim Wojtulewicz, Corelight) + 6.0.0-dev.489 | 2023-05-03 09:31:19 -0700 * Remove parser error message for bro_init, et al (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 9a856c2b27..b2b8480dfe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.489 +6.0.0-dev.491 diff --git a/zeek-config.in b/zeek-config.in index 98396dc989..91182796bc 100755 --- a/zeek-config.in +++ b/zeek-config.in @@ -1,22 +1,22 @@ #!/bin/sh -binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@ -broker_root=@ZEEK_CONFIG_BROKER_ROOT_DIR@ -btest_tools_dir=@ZEEK_CONFIG_BTEST_TOOLS_DIR@ -build_type=@CMAKE_BUILD_TYPE_LOWER@ -cmake_dir=@ZEEK_CMAKE_CONFIG_DIR@ -config_dir=@ZEEK_ETC_INSTALL_DIR@ -have_spicy=@USE_SPICY_ANALYZERS@ -include_dir=@CMAKE_INSTALL_PREFIX@/include -lib_dir=@CMAKE_INSTALL_FULL_LIBDIR@ -plugin_dir=@ZEEK_PLUGIN_DIR@ -prefix=@CMAKE_INSTALL_PREFIX@ -python_dir=@PY_MOD_INSTALL_DIR@ -script_dir=@ZEEK_SCRIPT_INSTALL_PATH@ -site_dir=@ZEEK_SCRIPT_INSTALL_PATH@/site -version=@VERSION@ -zeek_dist=@ZEEK_DIST@ -zeekpath=@DEFAULT_ZEEKPATH@ +binpac_root="@ZEEK_CONFIG_BINPAC_ROOT_DIR@" +broker_root="@ZEEK_CONFIG_BROKER_ROOT_DIR@" +btest_tools_dir="@ZEEK_CONFIG_BTEST_TOOLS_DIR@" +build_type="@CMAKE_BUILD_TYPE_LOWER@" +cmake_dir="@ZEEK_CMAKE_CONFIG_DIR@" +config_dir="@ZEEK_ETC_INSTALL_DIR@" +have_spicy="@USE_SPICY_ANALYZERS@" +include_dir="@CMAKE_INSTALL_PREFIX@/include" +lib_dir="@CMAKE_INSTALL_FULL_LIBDIR@" +plugin_dir="@ZEEK_PLUGIN_DIR@" +prefix="@CMAKE_INSTALL_PREFIX@" +python_dir="@PY_MOD_INSTALL_DIR@" +script_dir="@ZEEK_SCRIPT_INSTALL_PATH@" +site_dir="@ZEEK_SCRIPT_INSTALL_PATH@/site" +version="@VERSION@" +zeek_dist="@ZEEK_DIST@" +zeekpath="@DEFAULT_ZEEKPATH@" add_path() { # $1: existing path