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

* origin/topic/jsiwek/add-zeek-archiver-submodule:
  Update zeek-archiver submodule
  Add zeek-archiver tool as submodule

.gitmodules

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

CHANGES

@@ -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
 
   * Broker Store table synchronizatio, (Johanna Amann, Corelight)

CMakeLists.txt

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

VERSION

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

auxil/zeek-archiver

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

configure

@@ -58,6 +58,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-rocksdb       try to find a RocksDB installation for use in Broker
     --disable-zeekctl      don't install ZeekControl
     --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-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 BUILD_SHARED_LIBS    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 CPACK_SOURCE_IGNORE_FILES STRING
 append_cache_entry ENABLE_MOBILE_IPV6   BOOL   false
@@ -267,6 +269,9 @@ while [ $# -ne 0 ]; do
         --disable-auxtools)
             append_cache_entry INSTALL_AUX_TOOLS    BOOL   false
             ;;
+        --disable-archiver)
+            append_cache_entry INSTALL_ZEEK_ARCHIVER    BOOL   false
+            ;;
         --disable-python)
             append_cache_entry DISABLE_PYTHON_BINDINGS     BOOL   true
             ;;