From 9743023d4839ee4f7df7dff278451c6a3df63da2 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 19 Apr 2024 11:57:55 -0700
Subject: [PATCH] Remove zeek-archiver from build config, deprecate
 --disable-archiver in configure

---
 CMakeLists.txt | 2 --
 configure      | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1138c3b43e..5a95e64969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ option(INSTALL_AUX_TOOLS "Install additional tools from auxil." ${ZEEK_INSTALL_T
 option(INSTALL_BTEST "Install btest alongside Zeek." ${ZEEK_INSTALL_TOOLS_DEFAULT})
 option(INSTALL_BTEST_PCAPS "Install pcap files for testing." ${ZEEK_INSTALL_TOOLS_DEFAULT})
 option(INSTALL_ZEEKCTL "Install zeekctl." ${ZEEK_INSTALL_TOOLS_DEFAULT})
-option(INSTALL_ZEEK_ARCHIVER "Install the zeek-archiver." ${ZEEK_INSTALL_TOOLS_DEFAULT})
 option(INSTALL_ZEEK_CLIENT "Install the zeek-client." ${ZEEK_INSTALL_TOOLS_DEFAULT})
 option(INSTALL_ZKG "Install zkg." ${ZEEK_INSTALL_TOOLS_DEFAULT})
 option(PREALLOCATE_PORT_ARRAY "Pre-allocate all ports for zeek::Val." ON)
@@ -1317,7 +1316,6 @@ checkoptionalbuildsources(auxil/btest BTest INSTALL_BTEST)
 checkoptionalbuildsources(auxil/package-manager ZKG INSTALL_ZKG)
 checkoptionalbuildsources(auxil/zeekctl ZeekControl INSTALL_ZEEKCTL)
 checkoptionalbuildsources(auxil/zeek-aux Zeek-Aux INSTALL_AUX_TOOLS)
-checkoptionalbuildsources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER)
 checkoptionalbuildsources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT)
 
 # Generate Spicy helper scripts referenced in e.g., `zeek-path-dev.*`. These
diff --git a/configure b/configure
index 0f2aaa705b..40f052a220 100755
--- a/configure
+++ b/configure
@@ -70,7 +70,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-werror        build with -Werror
     --enable-ZAM-profiling build with ZAM profiling enabled (--enable-debug implies this)
     --disable-af-packet    don't include native AF_PACKET support (Linux only)
-    --disable-archiver     don't build or install zeek-archiver tool
     --disable-auxtools     don't build or install auxiliary tools
     --disable-broker-tests don't try to build Broker unit tests
     --disable-btest        don't install BTest
@@ -179,6 +178,7 @@ append_cache_entry() {
 builddir=build
 CMakeCacheEntries=""
 display_cmake=0
+has_disable_archiver=0
 
 # parse arguments
 while [ $# -ne 0 ]; do
@@ -314,7 +314,7 @@ while [ $# -ne 0 ]; do
             append_cache_entry DISABLE_AF_PACKET BOOL true
             ;;
         --disable-archiver)
-            append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false
+            has_disable_archiver=1
             ;;
         --disable-auxtools)
             append_cache_entry INSTALL_AUX_TOOLS BOOL false
@@ -492,3 +492,8 @@ eval ${cmake} 2>&1
 echo "# This is the command used to configure this build" >config.status
 echo $command >>config.status
 chmod u+x config.status
+
+if [ $has_disable_archiver -eq 1 ]; then
+    echo
+    echo "NOTE: The --disable-archiver argument no longer has any effect and will be removed in v7.1. zeek-archiver is now part of zeek-aux, so consider --disable-auxtools instead."
+fi