Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/jsiwek/add-zeek-archiver-submodule'

Browse source 
* origin/topic/jsiwek/add-zeek-archiver-submodule:
  Update zeek-archiver submodule
  Add zeek-archiver tool as submodule
This commit is contained in:
Tim Wojtulewicz 2020-07-21 12:39:34 -07:00
commit ebf0f65f55
6 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -40,3 +40,6 @@
[submodule "auxil/highwayhash"] [submodule "auxil/highwayhash"]
path = auxil/highwayhash path = auxil/highwayhash
url = https://github.com/zeek/highwayhash url = https://github.com/zeek/highwayhash
[submodule "auxil/zeek-archiver"]
path = auxil/zeek-archiver
url = https://github.com/zeek/zeek-archiver

8
CHANGES
View file

@ -1,4 +1,12 @@
3.2.0-dev.962 | 2020-07-21 12:39:34 -0700
* Add zeek-archiver tool as submodule
This is added to the default Zeek build as a convenience since it's the
new suggested method for archiving the logs produced by a Supervised
Zeek Cluster. (Jon Siwek, Corelight)
3.2.0-dev.959 | 2020-07-21 15:34:59 +0000 3.2.0-dev.959 | 2020-07-21 15:34:59 +0000
* Broker Store table synchronizatio, (Johanna Amann, Corelight) * Broker Store table synchronizatio, (Johanna Amann, Corelight)

1
CMakeLists.txt
View file

@ -432,6 +432,7 @@ include(CheckOptionalBuildSources)
CheckOptionalBuildSources(auxil/zeekctl ZeekControl INSTALL_ZEEKCTL) CheckOptionalBuildSources(auxil/zeekctl ZeekControl INSTALL_ZEEKCTL)
CheckOptionalBuildSources(auxil/zeek-aux Zeek-Aux INSTALL_AUX_TOOLS) CheckOptionalBuildSources(auxil/zeek-aux Zeek-Aux INSTALL_AUX_TOOLS)
CheckOptionalBuildSources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER)
######################################################################## ########################################################################
## Packaging Setup ## Packaging Setup

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.959 3.2.0-dev.962

1
auxil/zeek-archiver Submodule

@ -0,0 +1 @@
Subproject commit 46532660c828e0a1bee947d1ef10f8f321544da4

5
configure vendored
View file

@ -58,6 +58,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-rocksdb try to find a RocksDB installation for use in Broker --enable-rocksdb try to find a RocksDB installation for use in Broker
--disable-zeekctl don't install ZeekControl --disable-zeekctl don't install ZeekControl
--disable-auxtools don't build or install auxiliary tools --disable-auxtools don't build or install auxiliary tools
--disable-archiver don't build or install zeek-archiver tool
--disable-python don't try to build python bindings for Broker --disable-python don't try to build python bindings for Broker
--disable-broker-tests don't try to build Broker unit tests --disable-broker-tests don't try to build Broker unit tests
@ -155,6 +156,7 @@ append_cache_entry ENABLE_PERFTOOLS BOOL false
append_cache_entry ENABLE_JEMALLOC BOOL false append_cache_entry ENABLE_JEMALLOC BOOL false
append_cache_entry BUILD_SHARED_LIBS BOOL true append_cache_entry BUILD_SHARED_LIBS BOOL true
append_cache_entry INSTALL_AUX_TOOLS BOOL true append_cache_entry INSTALL_AUX_TOOLS BOOL true
append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL true
append_cache_entry INSTALL_ZEEKCTL BOOL true append_cache_entry INSTALL_ZEEKCTL BOOL true
append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
append_cache_entry ENABLE_MOBILE_IPV6 BOOL false append_cache_entry ENABLE_MOBILE_IPV6 BOOL false
@ -267,6 +269,9 @@ while [ $# -ne 0 ]; do
--disable-auxtools) --disable-auxtools)
append_cache_entry INSTALL_AUX_TOOLS BOOL false append_cache_entry INSTALL_AUX_TOOLS BOOL false
;; ;;
--disable-archiver)
append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false
;;
--disable-python) --disable-python)
append_cache_entry DISABLE_PYTHON_BINDINGS BOOL true append_cache_entry DISABLE_PYTHON_BINDINGS BOOL true
;; ;;