Rename aux/ to auxil/

Since "aux" is not an allowed file/dir name on Windows.

.gitmodules

@@ -1,14 +1,14 @@
-[submodule "aux/zeek-aux"]
-	path = aux/zeek-aux
+[submodule "auxil/zeek-aux"]
+	path = auxil/zeek-aux
 	url = https://github.com/zeek/zeek-aux
-[submodule "aux/binpac"]
-	path = aux/binpac
+[submodule "auxil/binpac"]
+	path = auxil/binpac
 	url = https://github.com/zeek/binpac
-[submodule "aux/zeekctl"]
-	path = aux/zeekctl
+[submodule "auxil/zeekctl"]
+	path = auxil/zeekctl
 	url = https://github.com/zeek/zeekctl
-[submodule "aux/btest"]
-	path = aux/btest
+[submodule "auxil/btest"]
+	path = auxil/btest
 	url = https://github.com/zeek/btest
 [submodule "cmake"]
 	path = cmake
@@ -16,27 +16,27 @@
 [submodule "src/3rdparty"]
 	path = src/3rdparty
 	url = https://github.com/zeek/zeek-3rdparty
-[submodule "aux/broker"]
-	path = aux/broker
+[submodule "auxil/broker"]
+	path = auxil/broker
 	url = https://github.com/zeek/broker
-[submodule "aux/netcontrol-connectors"]
-	path = aux/netcontrol-connectors
+[submodule "auxil/netcontrol-connectors"]
+	path = auxil/netcontrol-connectors
 	url = https://github.com/zeek/zeek-netcontrol
-[submodule "aux/bifcl"]
-	path = aux/bifcl
+[submodule "auxil/bifcl"]
+	path = auxil/bifcl
 	url = https://github.com/zeek/bifcl
 [submodule "doc"]
 	path = doc
 	url = https://github.com/zeek/zeek-docs
-[submodule "aux/paraglob"]
-	path = aux/paraglob
+[submodule "auxil/paraglob"]
+	path = auxil/paraglob
 	url = https://github.com/zeek/paraglob
-[submodule "aux/rapidjson"]
-	path = aux/rapidjson
+[submodule "auxil/rapidjson"]
+	path = auxil/rapidjson
 	url = https://github.com/zeek/rapidjson
-[submodule "aux/libkqueue"]
-	path = aux/libkqueue
+[submodule "auxil/libkqueue"]
+	path = auxil/libkqueue
 	url = https://github.com/zeek/libkqueue
-[submodule "aux/highwayhash"]
-	path = aux/highwayhash
+[submodule "auxil/highwayhash"]
+	path = auxil/highwayhash
 	url = https://github.com/zeek/highwayhash

CMakeLists.txt

@@ -1,5 +1,5 @@
 # When changing the minimum version here, also adapt
-# aux/zeek-aux/plugin-support/skeleton/CMakeLists.txt
+# auxil/zeek-aux/plugin-support/skeleton/CMakeLists.txt
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 project(Zeek C CXX)
@@ -186,7 +186,7 @@ FindRequiredPackage(OpenSSL)
 FindRequiredPackage(BIND)
 FindRequiredPackage(ZLIB)
 
-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/auxil/binpac/CMakeLists.txt)
 
     set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
 
@@ -194,13 +194,13 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
       set(ENABLE_STATIC_ONLY true)
     endif()
 
-    add_subdirectory(aux/binpac)
+    add_subdirectory(auxil/binpac)
     set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
 endif ()
 FindRequiredPackage(BinPAC)
 
 if ( NOT BIFCL_EXE_PATH )
-  add_subdirectory(aux/bifcl)
+  add_subdirectory(auxil/bifcl)
 endif ()
 
 if (ENABLE_JEMALLOC)
@@ -228,7 +228,7 @@ if ( CAF_ROOT_DIR )
   find_package(CAF COMPONENTS core io openssl REQUIRED)
 endif ()
 
-add_subdirectory(aux/paraglob)
+add_subdirectory(auxil/paraglob)
 set(zeekdeps ${zeekdeps} paraglob)
 
 if ( BROKER_ROOT_DIR )
@@ -250,7 +250,7 @@ else ()
     set(ENABLE_STATIC_ONLY true)
   endif()
 
-  add_subdirectory(aux/broker)
+  add_subdirectory(auxil/broker)
   set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
 
   if ( BUILD_STATIC_BROKER )
@@ -258,17 +258,17 @@ else ()
   else()
     set(zeekdeps ${zeekdeps} broker)
   endif()
-  set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker/include ${CMAKE_CURRENT_BINARY_DIR}/aux/broker/include)
+  set(broker_includes ${CMAKE_CURRENT_SOURCE_DIR}/auxil/broker/include ${CMAKE_CURRENT_BINARY_DIR}/auxil/broker/include)
 endif ()
 
 # CAF_LIBRARIES and CAF_INCLUDE_DIRS are defined either by calling
-# find_package(CAF) or by calling add_subdirectory(aux/broker). In either case,
+# find_package(CAF) or by calling add_subdirectory(auxil/broker). In either case,
 # we have to care about CAF here because Broker headers can pull in CAF
 # headers.
 set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
 include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/paraglob/include)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/rapidjson/include)
 include_directories(BEFORE
                     ${PCAP_INCLUDE_DIR}
                     ${BIND_INCLUDE_DIR}
@@ -277,7 +277,7 @@ include_directories(BEFORE
                     ${JEMALLOC_INCLUDE_DIR}
 )
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include/rapidjson
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/auxil/rapidjson/include/rapidjson
         DESTINATION include/zeek/3rdparty/rapidjson/include)
 
 # Optional Dependencies
@@ -332,7 +332,7 @@ endif ()
 include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
 
 # Make everyone find the highwayhash includes
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/highwayhash)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
 
 # Alpine support
 if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux AND EXISTS /etc/os-release )
@@ -437,8 +437,8 @@ add_subdirectory(man)
 
 include(CheckOptionalBuildSources)
 
-CheckOptionalBuildSources(aux/zeekctl   ZeekControl INSTALL_ZEEKCTL)
-CheckOptionalBuildSources(aux/zeek-aux  Zeek-Aux  INSTALL_AUX_TOOLS)
+CheckOptionalBuildSources(auxil/zeekctl   ZeekControl INSTALL_ZEEKCTL)
+CheckOptionalBuildSources(auxil/zeek-aux  Zeek-Aux  INSTALL_AUX_TOOLS)
 
 ########################################################################
 ## Packaging Setup

COPYING.3rdparty

@@ -500,7 +500,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ==============================================================================
 
-%%% aux/highwayhash
+%%% auxil/highwayhash
 
 ==============================================================================
 

Makefile

@@ -42,7 +42,7 @@ dist:
 	@tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL)
 	@echo Package: $(VERSION_FULL).tar.gz
 	@mv $(VERSION_FULL) $(VERSION_MIN)
-	@(cd $(VERSION_MIN) && for i in aux/*; do rm -rf $$i/*; done)
+	@(cd $(VERSION_MIN) && for i in auxil/*; do rm -rf $$i/*; done)
 	@tar -czf $(VERSION_MIN).tar.gz $(VERSION_MIN)
 	@echo Package: $(VERSION_MIN).tar.gz
 	@rm -rf $(VERSION_MIN)
@@ -55,10 +55,10 @@ test:
 	-@( cd testing && make )
 
 test-aux:
-	-test -d aux/zeekctl && ( cd aux/zeekctl && make test-all )
-	-test -d aux/btest  && ( cd aux/btest && make test )
-	-test -d aux/zeek-aux && ( cd aux/zeek-aux && make test )
-	-test -d aux/plugins && ( cd aux/plugins && make test-all )
+	-test -d auxil/zeekctl && ( cd auxil/zeekctl && make test-all )
+	-test -d auxil/btest  && ( cd auxil/btest && make test )
+	-test -d auxil/zeek-aux && ( cd auxil/zeek-aux && make test )
+	-test -d auxil/plugins && ( cd auxil/plugins && make test-all )
 
 test-all: test test-aux
 

aux/zeek-aux

@@ -1 +0,0 @@
-Subproject commit 8615abced86b5559fa3203264be55e664b887094

aux/zeekctl

@@ -1 +0,0 @@
-Subproject commit bee11c63923b69a4468838d56067f15bc6ae3a52

auxil/zeek-aux

@@ -0,0 +1 @@
+Subproject commit 131e9fb1184af9da29745b5fb27d4cd59fc6825d

auxil/zeekctl

@@ -0,0 +1 @@
+Subproject commit 6e39564420c47b3fd6d03d4383758d7871bc87bf

ci/test.sh

@@ -5,7 +5,7 @@
 # the value of `nproc` if available, otherwise just a single core.
 
 result=0
-BTEST=$(pwd)/aux/btest/btest
+BTEST=$(pwd)/auxil/btest/btest
 
 if [[ -z "${CIRRUS_CI}" ]]; then
     # Set default values to use in place of env. variables set by Cirrus CI.

cmake

@@ -1 +1 @@
-Subproject commit 23f4b88f91c537c59ef9a3ad56ec08f021ec2b2c
+Subproject commit 8d97340ccb2536c9c356bc77009b4af0ed3044dc

doc

@@ -1 +1 @@
-Subproject commit 23dbe360d105d1ffadc231b1d9fb06dea437b110
+Subproject commit c9567769f1f57b4aa259e8a658b08dda909266d5

src/CMakeLists.txt

@@ -325,14 +325,14 @@ set(THIRD_PARTY_SRCS
 # Highwayhash. Highwayhash is a bit special since it has architecture dependent code...
 
 set(HH_SRCS
-    ../aux/highwayhash/highwayhash/sip_hash.cc
-    ../aux/highwayhash/highwayhash/sip_tree_hash.cc
-    ../aux/highwayhash/highwayhash/scalar_sip_tree_hash.cc
-    ../aux/highwayhash/highwayhash/arch_specific.cc
-    ../aux/highwayhash/highwayhash/instruction_sets.cc
-    ../aux/highwayhash/highwayhash/nanobenchmark.cc
-    ../aux/highwayhash/highwayhash/os_specific.cc
-    ../aux/highwayhash/highwayhash/hh_portable.cc
+    ../auxil/highwayhash/highwayhash/sip_hash.cc
+    ../auxil/highwayhash/highwayhash/sip_tree_hash.cc
+    ../auxil/highwayhash/highwayhash/scalar_sip_tree_hash.cc
+    ../auxil/highwayhash/highwayhash/arch_specific.cc
+    ../auxil/highwayhash/highwayhash/instruction_sets.cc
+    ../auxil/highwayhash/highwayhash/nanobenchmark.cc
+    ../auxil/highwayhash/highwayhash/os_specific.cc
+    ../auxil/highwayhash/highwayhash/hh_portable.cc
 )
 
 if (${COMPILER_ARCHITECTURE} STREQUAL "arm")
@@ -340,23 +340,23 @@ if (${COMPILER_ARCHITECTURE} STREQUAL "arm")
                               -mfloat-abi=hard -march=armv7-a -mfpu=neon)
 elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")
   list(APPEND HH_SRCS
-       ../aux/highwayhash/highwayhash/hh_neon.cc
+       ../auxil/highwayhash/highwayhash/hh_neon.cc
   )
 elseif (${COMPILER_ARCHITECTURE} STREQUAL "power")
-  set_source_files_properties(../aux/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
+  set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
                               -mvsx)
   list(APPEND HH_SRCS
-       ../aux/highwayhash/highwayhash/hh_vsc.cc
+       ../auxil/highwayhash/highwayhash/hh_vsc.cc
   )
 elseif(${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
-  set_source_files_properties(../aux/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
+  set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
                               -mavx2)
-  set_source_files_properties(../aux/highwayhash/highwayhash/hh_sse41.cc PROPERTIES COMPILE_FLAGS
+  set_source_files_properties(../auxil/highwayhash/highwayhash/hh_sse41.cc PROPERTIES COMPILE_FLAGS
                               -msse4.1)
 
   list(APPEND HH_SRCS
-      ../aux/highwayhash/highwayhash/hh_avx2.cc
-      ../aux/highwayhash/highwayhash/hh_sse41.cc
+      ../auxil/highwayhash/highwayhash/hh_avx2.cc
+      ../auxil/highwayhash/highwayhash/hh_sse41.cc
   )
 endif ()
 

testing/btest/Makefile

@@ -1,6 +1,6 @@
 
 DIAG=diag.log
-BTEST=../../aux/btest/btest
+BTEST=../../auxil/btest/btest
 SCRIPT_COV=.tmp/script-coverage
 
 all: cleanup btest-verbose coverage

testing/btest/btest.cfg

@@ -11,8 +11,8 @@ ZEEK_SEED_FILE=%(testbase)s/random.seed
 ZEEK_PLUGIN_PATH=
 TZ=UTC
 LC_ALL=C
-BTEST_PATH=%(testbase)s/../../aux/btest
-PATH=%(testbase)s/../../build/src:%(testbase)s/../scripts:%(testbase)s/../../aux/btest:%(testbase)s/../../build/aux/zeek-aux/zeek-cut:%(testbase)s/../../aux/btest/sphinx:%(default_path)s:/sbin
+BTEST_PATH=%(testbase)s/../../auxil/btest
+PATH=%(testbase)s/../../build/src:%(testbase)s/../scripts:%(testbase)s/../../auxil/btest:%(testbase)s/../../build/auxil/zeek-aux/zeek-cut:%(testbase)s/../../auxil/btest/sphinx:%(default_path)s:/sbin
 TRACES=%(testbase)s/Traces
 FILES=%(testbase)s/Files
 SCRIPTS=%(testbase)s/../scripts

testing/btest/plugins/bifs-and-scripts-install.sh

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: bash %INPUT
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} --install-root=`pwd`/test-install
 # @TEST-EXEC: make

testing/btest/plugins/bifs-and-scripts.sh

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: bash %INPUT
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output

testing/btest/plugins/binpac-flowbuffer-frame-length.zeek

@@ -29,7 +29,7 @@
 # This causes out-of-bounds exceptions to be thrown for inputs that should
 # actually be possible to incrementally parse via flowbuffer.
 
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Foo FOO
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Foo FOO
 # @TEST-EXEC: cp -r %DIR/binpac-flowbuffer-frame-length-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/mmsX.pcap %INPUT >output

testing/btest/plugins/file.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/file-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output

testing/btest/plugins/func-hook.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
 # @TEST-EXEC: cp -r %DIR/func-hook-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Demo::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | grep foo >output

testing/btest/plugins/hooks.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
 # @TEST-EXEC: cp -r %DIR/hooks-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Demo::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/http/get.trace %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output

testing/btest/plugins/init-plugin.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output

testing/btest/plugins/legacy-func-hook.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
 # @TEST-EXEC: cp -r %DIR/legacy-func-hook-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Demo::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | grep foo >output

testing/btest/plugins/logging-hooks.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Log Hooks
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Log Hooks
 # @TEST-EXEC: cp -r %DIR/logging-hooks-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Log::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output

testing/btest/plugins/pktdumper.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/pktdumper-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output

testing/btest/plugins/pktsrc.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/pktsrc-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output

testing/btest/plugins/plugin-nopatchversion.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing NoPatchVersion
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Testing NoPatchVersion
 # @TEST-EXEC: cp -r %DIR/plugin-nopatchversion-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=$(pwd) zeek -N Testing::NoPatchVersion >> output

testing/btest/plugins/plugin-withpatchversion.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing WithPatchVersion
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Testing WithPatchVersion
 # @TEST-EXEC: cp -r %DIR/plugin-withpatchversion-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=$(pwd) zeek -N Testing::WithPatchVersion >> output

testing/btest/plugins/protocol.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/protocol-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output

testing/btest/plugins/reader.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin  -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin  -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/reader-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output

testing/btest/plugins/reporter-hook.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Reporter Hook
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Reporter Hook
 # @TEST-EXEC: cp -r %DIR/reporter-hook-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output

testing/btest/plugins/writer.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/writer-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output

testing/external/commit-hash.zeek-testing

@@ -1 +1 @@
-f035d3c81512c5a6faf1175ff60148a1b40bfed4
+d242bb7e8a231f01fa2af5027e938bbd4fe6ecba

testing/external/commit-hash.zeek-testing-private

@@ -1 +1 @@
-74de2295ad7bb95b9a4b8c11bc3be1234eb31c00
+b77a24eb48231f0ca34ca06465e22a4e5053d8a2

testing/external/scripts/skel/Makefile

@@ -1,6 +1,6 @@
 
 DIAG=diag.log
-BTEST=../../../aux/btest/btest
+BTEST=../../../auxil/btest/btest
 
 all: update-traces
 	@rm -f $(DIAG)

testing/external/subdir-btest.cfg

@@ -10,7 +10,7 @@ ZEEKPATH=`bash -c %(testbase)s/../../../build/zeek-path-dev`:%(testbase)s/../scr
 ZEEK_SEED_FILE=%(testbase)s/../random.seed
 TZ=UTC
 LC_ALL=C
-PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(testbase)s/../../scripts:%(default_path)s
+PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../auxil/btest:%(testbase)s/../../scripts:%(default_path)s
 TEST_DIFF_CANONIFIER=%(testbase)s/../../scripts/diff-canonifier-external
 TEST_DIFF_BRIEF=1
 TRACES=%(testbase)s/Traces