From 5a253d355b37010eba45e7665932c7de4af727d8 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Fri, 24 May 2019 03:32:14 -0500 Subject: [PATCH 1/2] Rename directories from bro to zeek --- CMakeLists.txt | 10 +++++----- configure | 10 +++++----- src/CMakeLists.txt | 6 +++--- zeek-config.in | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5edf896c0..eb830e3425 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ endif () set(ZEEK_ROOT_DIR ${CMAKE_INSTALL_PREFIX}) if (NOT ZEEK_SCRIPT_INSTALL_PATH) # set the default Zeek script installation path (user did not specify one) - set(ZEEK_SCRIPT_INSTALL_PATH ${ZEEK_ROOT_DIR}/share/bro) + set(ZEEK_SCRIPT_INSTALL_PATH ${ZEEK_ROOT_DIR}/share/zeek) endif () if (NOT ZEEK_MAN_INSTALL_PATH) @@ -37,7 +37,7 @@ endif () get_filename_component(ZEEK_SCRIPT_INSTALL_PATH ${ZEEK_SCRIPT_INSTALL_PATH} ABSOLUTE) -set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_ROOT_DIR}/lib/bro/plugins CACHE STRING "Installation path for plugins" FORCE) +set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_ROOT_DIR}/lib/zeek/plugins CACHE STRING "Installation path for plugins" FORCE) configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) @@ -257,7 +257,7 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/bro) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek) if ( CAF_ROOT_DIR ) set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR}) @@ -281,7 +281,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-config @ONLY) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/bro +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek USE_SOURCE_PERMISSIONS) # Install wrapper script for Bro-to-Zeek renaming. @@ -289,7 +289,7 @@ include(InstallShellScript) include(InstallSymlink) InstallShellScript("bin" "zeek-wrapper.in" "zeek-wrapper") InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro-config") -InstallSymlink("${CMAKE_INSTALL_PREFIX}/include/bro/zeek-config.h" "${CMAKE_INSTALL_PREFIX}/include/bro/bro-config.h") +InstallSymlink("${CMAKE_INSTALL_PREFIX}/include/zeek/zeek-config.h" "${CMAKE_INSTALL_PREFIX}/include/zeek/bro-config.h") ######################################################################## ## Recurse on sub-directories diff --git a/configure b/configure index b1ea7bdff5..eb6a38f1a0 100755 --- a/configure +++ b/configure @@ -31,9 +31,9 @@ Usage: $0 [OPTION]... [VAR=VALUE]... (useful for cross-compiling) Installation Directories: - --prefix=PREFIX installation directory [/usr/local/bro] + --prefix=PREFIX installation directory [/usr/local/zeek] --scriptdir=PATH root installation directory for Zeek scripts - [PREFIX/share/bro] + [PREFIX/share/zeek] --localstatedir=PATH when using ZeekControl, path to store log files and run-time data (within log/ and spool/ subdirs) [PREFIX] @@ -127,12 +127,12 @@ remove_cache_entry () { # set defaults builddir=build -prefix=/usr/local/bro +prefix=/usr/local/zeek CMakeCacheEntries="" append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix append_cache_entry ZEEK_ROOT_DIR PATH $prefix append_cache_entry PY_MOD_INSTALL_DIR PATH $prefix/lib/zeekctl -append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/bro +append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek append_cache_entry ZEEK_ETC_INSTALL_DIR PATH $prefix/etc append_cache_entry ENABLE_DEBUG BOOL false append_cache_entry ENABLE_PERFTOOLS BOOL false @@ -321,7 +321,7 @@ while [ $# -ne 0 ]; do done if [ "$user_set_scriptdir" != "true" ]; then - append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/bro + append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek fi if [ "$user_set_conffilesdir" != "true" ]; then diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 19d3799719..4176bc3c8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -418,7 +418,7 @@ install(CODE " ") install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ - DESTINATION include/bro + DESTINATION include/zeek FILES_MATCHING PATTERN "*.h" PATTERN "*.pac" @@ -426,7 +426,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ - DESTINATION include/bro + DESTINATION include/zeek FILES_MATCHING PATTERN "*.bif.func_h" PATTERN "*.bif.netvar_h" @@ -435,5 +435,5 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sqlite3.h - DESTINATION include/bro/3rdparty + DESTINATION include/zeek/3rdparty ) diff --git a/zeek-config.in b/zeek-config.in index 5afafb56ec..50d99b6645 100755 --- a/zeek-config.in +++ b/zeek-config.in @@ -8,8 +8,8 @@ site_dir=@ZEEK_SCRIPT_INSTALL_PATH@/site plugin_dir=@BRO_PLUGIN_INSTALL_PATH@ config_dir=@ZEEK_ETC_INSTALL_DIR@ python_dir=@PY_MOD_INSTALL_DIR@ -cmake_dir=@CMAKE_INSTALL_PREFIX@/share/bro/cmake -include_dir=@CMAKE_INSTALL_PREFIX@/include/bro +cmake_dir=@CMAKE_INSTALL_PREFIX@/share/zeek/cmake +include_dir=@CMAKE_INSTALL_PREFIX@/include/zeek zeekpath=@DEFAULT_ZEEKPATH@ zeek_dist=@ZEEK_DIST@ binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@ From 52b5124767ebdc701dd895e15faeaa6261088925 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Wed, 12 Jun 2019 02:44:37 -0500 Subject: [PATCH 2/2] Create local.zeek as symlink for upgrade installs Since the default install prefix has changed from /usr/local/bro to /usr/local/zeek, the local.zeek will be created as a symlink to the old local.bro if doing an upgrade install and if using the default install prefix. --- scripts/CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 266981dd9e..471c408dcf 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -26,6 +26,22 @@ if ( NOT BINARY_PACKAGING_MODE ) endif () endif () ") + + # If the user is installing into the default Zeek prefix and if the old Bro + # default prefix exists, then treat this install as an upgrade and install + # the new local.zeek as a symlink to the old local.bro. + set(_old_local_bro /usr/local/bro/share/bro/site/local.bro) + set(_bro_default_prefix /usr/local/bro) + set(_zeek_default_prefix /usr/local/zeek) + + install(CODE " + if ( EXISTS \"${_bro_default_prefix}\" AND \"${ZEEK_ROOT_DIR}\" STREQUAL \"${_zeek_default_prefix}\" ) + message(STATUS \"WARNING: installed ${_local_zeek_dst} as symlink to ${_old_local_bro}\") + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink + \"${_old_local_bro}\" \"${_local_zeek_dst}\") + endif () + ") + endif () # Install local script as a config file since it's meant to be modified directly.