zeekGH-239: Rename bro to zeek, bro-config to zeek-config, and bro-pa…

…th-dev to zeek-path-dev. This also installs symlinks from "zeek" and "bro-config" to a wrapper script that prints a deprecation warning. The btests pass, but this is still WIP. broctl renaming is still missing. zeek#239
LCHOICEzz · May 1, 2019 · 789cb37 · 789cb37
1 parent 375b151
commit 789cb37
Show file tree

Hide file tree

Showing 1,119 changed files with 1,692 additions and 1,653 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,15 +39,15 @@ get_filename_component(BRO_SCRIPT_INSTALL_PATH ${BRO_SCRIPT_INSTALL_PATH}
 
 set(BRO_PLUGIN_INSTALL_PATH ${BRO_ROOT_DIR}/lib/bro/plugins CACHE STRING "Installation path for plugins" FORCE)
 
-configure_file(bro-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev)
+configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.sh
-     "export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n"
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.sh
+     "export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
      "export BRO_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
      "export PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.csh
-     "setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n"
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.csh
+     "setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
      "setenv BRO_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
      "setenv PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
 
@@ -254,36 +254,43 @@ if ( NOT BINARY_PACKAGING_MODE )
 endif ()
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h)
+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}/bro-config.h DESTINATION include/bro)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/bro)
 
 if ( CAF_ROOT_DIR )
-  set(BRO_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
+  set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
 else ()
-  set(BRO_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
+  set(ZEEK_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
 endif ()
 
 if ( BinPAC_ROOT_DIR )
-  set(BRO_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
+  set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
 else ()
-  set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
+  set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
 endif ()
 
 if ( BROKER_ROOT_DIR )
-  set(BRO_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
+  set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
 else ()
-  set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
+  set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
 endif ()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in
-               ${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin)
+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
         USE_SOURCE_PERMISSIONS)
 
+# Install wrapper script for Bro-to-Zeek renaming.
+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")
+
 ########################################################################
 ## Recurse on sub-directories
 

diff --git a/doc b/doc
diff --git a/man/bro.8 → man/zeek.8 b/man/bro.8 → man/zeek.8
diff --git a/scripts/policy/frameworks/control/controllee.zeek b/scripts/policy/frameworks/control/controllee.zeek
@@ -5,7 +5,7 @@
 ##! to the specific analysis scripts desired.  It may also need a node
 ##! configured as a controller node in the communications nodes configuration::
 ##!
-##!     bro <scripts> frameworks/control/controllee
+##!     zeek <scripts> frameworks/control/controllee
 
 @load base/frameworks/control
 @load base/frameworks/broker

diff --git a/scripts/policy/frameworks/control/controller.zeek b/scripts/policy/frameworks/control/controller.zeek
@@ -4,7 +4,7 @@
 ##!
 ##! It's intended to be used from the command line like this::
 ##!
-##!     bro <scripts> frameworks/control/controller Control::host=<host_addr> Control::host_port=<host_port> Control::cmd=<command> [Control::arg=<arg>]
+##!     zeek <scripts> frameworks/control/controller Control::host=<host_addr> Control::host_port=<host_port> Control::cmd=<command> [Control::arg=<arg>]
 
 @load base/frameworks/control
 @load base/frameworks/broker

diff --git a/src/Attr.cc b/src/Attr.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Attr.h"
 #include "Expr.h"

diff --git a/src/Base64.cc b/src/Base64.cc
@@ -1,4 +1,4 @@
-#include "bro-config.h"
+#include "zeek-config.h"
 #include "Base64.h"
 #include <math.h>
 

diff --git a/src/BroString.cc b/src/BroString.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <algorithm>
 #include <ctype.h>

diff --git a/src/CCL.cc b/src/CCL.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "CCL.h"
 #include "RE.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -353,24 +353,28 @@ set(bro_SRCS
 collect_headers(bro_HEADERS ${bro_SRCS})
 
 if ( bro_HAVE_OBJECT_LIBRARIES )
-    add_executable(bro ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
-    target_link_libraries(bro ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+    add_executable(zeek ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
+    target_link_libraries(zeek ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 else ()
-    add_executable(bro ${bro_SRCS} ${bro_HEADERS})
-    target_link_libraries(bro ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+    add_executable(zeek ${bro_SRCS} ${bro_HEADERS})
+    target_link_libraries(zeek ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 endif ()
 
 if ( NOT "${bro_LINKER_FLAGS}" STREQUAL "" )
-    set_target_properties(bro PROPERTIES LINK_FLAGS "${bro_LINKER_FLAGS}")
+    set_target_properties(zeek PROPERTIES LINK_FLAGS "${bro_LINKER_FLAGS}")
 endif ()
 
-install(TARGETS bro DESTINATION bin)
+install(TARGETS zeek DESTINATION bin)
 
-set(BRO_EXE bro
-    CACHE STRING "Bro executable binary" FORCE)
+# Install wrapper script for Bro-to-Zeek renaming.
+include(InstallSymlink)
+InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro")
 
-set(BRO_EXE_PATH ${CMAKE_CURRENT_BINARY_DIR}/bro
-    CACHE STRING "Path to Bro executable binary" FORCE)
+set(BRO_EXE zeek
+    CACHE STRING "Zeek executable binary" FORCE)
+
+set(BRO_EXE_PATH ${CMAKE_CURRENT_BINARY_DIR}/zeek
+    CACHE STRING "Path to Zeek executable binary" FORCE)
 
 # Target to create all the autogenerated files.
 add_custom_target(generate_outputs_stage1)
@@ -389,12 +393,12 @@ add_dependencies(generate_outputs generate_outputs_stage2a generate_outputs_stag
 # Build __load__.zeek files for standard *.bif.zeek.
 bro_bif_create_loader(bif_loader "${bro_BASE_BIF_SCRIPTS}")
 add_dependencies(bif_loader ${bro_SUBDIRS})
-add_dependencies(bro bif_loader)
+add_dependencies(zeek bif_loader)
 
 # Build __load__.zeek files for plugins/*.bif.zeek.
 bro_bif_create_loader(bif_loader_plugins "${bro_PLUGIN_BIF_SCRIPTS}")
 add_dependencies(bif_loader_plugins ${bro_SUBDIRS})
-add_dependencies(bro bif_loader_plugins)
+add_dependencies(zeek bif_loader_plugins)
 
 # Install *.bif.zeek.
 install(DIRECTORY ${CMAKE_BINARY_DIR}/scripts/base/bif DESTINATION ${BRO_SCRIPT_INSTALL_PATH}/base)

diff --git a/src/ChunkedIO.cc b/src/ChunkedIO.cc
@@ -11,7 +11,7 @@
 
 #include <algorithm>
 
-#include "bro-config.h"
+#include "zeek-config.h"
 #include "ChunkedIO.h"
 #include "NetVar.h"
 #include "RemoteSerializer.h"

diff --git a/src/ChunkedIO.h b/src/ChunkedIO.h
@@ -3,7 +3,7 @@
 #ifndef CHUNKEDIO_H
 #define CHUNKEDIO_H
 
-#include "bro-config.h"
+#include "zeek-config.h"
 #include "List.h"
 #include "util.h"
 #include "Flare.h"

diff --git a/src/CompHash.cc b/src/CompHash.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "CompHash.h"
 #include "Val.h"

diff --git a/src/Conn.cc b/src/Conn.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <ctype.h>
 

diff --git a/src/DFA.cc b/src/DFA.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "EquivClass.h"
 #include "DFA.h"

diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc
@@ -1,6 +1,6 @@
 // Implementation of breakpoints.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <assert.h>
 

diff --git a/src/DbgHelp.cc b/src/DbgHelp.cc
@@ -1,5 +1,5 @@
 // Bro Debugger Help
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Debug.h"
diff --git a/src/DbgWatch.cc b/src/DbgWatch.cc
@@ -1,6 +1,6 @@
 // Implementation of watches
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Debug.h"
 #include "DbgWatch.h"

diff --git a/src/Debug.cc b/src/Debug.cc
@@ -1,6 +1,6 @@
 // Debugging support for Bro policy files.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/DebugCmds.cc b/src/DebugCmds.cc
@@ -1,7 +1,7 @@
 // Support routines to help deal with Bro debugging commands and
 // implementation of most commands.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <sys/types.h>
 

diff --git a/src/Desc.cc b/src/Desc.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <stdlib.h>
 #include <errno.h>

diff --git a/src/Dict.cc b/src/Dict.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>

diff --git a/src/Discard.cc b/src/Discard.cc
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Net.h"
 #include "Var.h"

diff --git a/src/EquivClass.cc b/src/EquivClass.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "EquivClass.h"
 

diff --git a/src/Event.cc b/src/Event.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Event.h"
 #include "Func.h"

diff --git a/src/Expr.cc b/src/Expr.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Expr.h"
 #include "Event.h"

diff --git a/src/File.cc b/src/File.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME

diff --git a/src/Frag.cc b/src/Frag.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "util.h"
 #include "Hash.h"

diff --git a/src/Frame.cc b/src/Frame.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Frame.h"
 #include "Stmt.h"

diff --git a/src/Func.cc b/src/Func.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/Hash.cc b/src/Hash.cc
@@ -15,7 +15,7 @@
 // for the adversary to construct conflicts, though I do not know if
 // HMAC/MD5 is provably universal.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "Hash.h"
 #include "Reporter.h"

diff --git a/src/ID.cc b/src/ID.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "ID.h"
 #include "Expr.h"

diff --git a/src/IP.h b/src/IP.h
@@ -3,7 +3,7 @@
 #ifndef ip_h
 #define ip_h
 
-#include "bro-config.h"
+#include "zeek-config.h"
 #include "net_util.h"
 #include "IPAddr.h"
 #include "Reporter.h"

diff --git a/src/IntSet.cc b/src/IntSet.cc
@@ -1,4 +1,4 @@
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>

diff --git a/src/List.cc b/src/List.cc
@@ -1,4 +1,4 @@
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/NFA.cc b/src/NFA.cc
@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "bro-config.h"
+#include "zeek-config.h"
 
 #include "NFA.h"
 #include "EquivClass.h"