git: 031e50f70fb9 - main - security/zeek: Update to 9.0.0

From: Craig Leres <leres_at_FreeBSD.org>
Date: Tue, 15 Sep 2026 23:12:48 UTC
The branch main has been updated by leres:

URL: https://cgit.FreeBSD.org/ports/commit/?id=031e50f70fb996278b5c90ddd8df2b7e48029a3b

commit 031e50f70fb996278b5c90ddd8df2b7e48029a3b
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2026-09-15 23:12:26 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2026-09-15 23:12:26 +0000

    security/zeek: Update to 9.0.0
    
    This is the next long-term support (LTS) release of zeek.
    
        https://github.com/zeek/zeek/releases/tag/v9.0.0
        https://zeek.org/2026/08/zeek-9-0-development-update/
    
    Reported by:    Tim Wojtulewicz
---
 security/zeek/Makefile                             |  45 +---
 security/zeek/distinfo                             |   6 +-
 ...xil_highwayhash_highwayhash_instruction__sets.h |  32 ---
 ...patch-auxil_spicy_3rdparty_fiber_CMakeLists.txt |  11 -
 ...picy_3rdparty_fiber_include_fiber_fiber__mach.h |  11 -
 .../patch-auxil_spicy_hilti_runtime_src_fiber.cc   |  29 ---
 security/zeek/files/patch-src_CMakeLists.txt       |  14 --
 security/zeek/pkg-plist                            | 230 ++++++++++++---------
 8 files changed, 140 insertions(+), 238 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index 165f9ea29ade..ccb40ba9048a 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zeek
-DISTVERSION=	8.0.10
+DISTVERSION=	9.0.0
 CATEGORIES=	security
 MASTER_SITES=	https://download.zeek.org/
 
@@ -11,10 +11,12 @@ LICENSE=	CC-BY-4.0
 
 BUILD_DEPENDS=	bison>=3.3:devel/bison \
 		flex>=2.6:textproc/flex \
-		swig>=4.0.2:devel/swig
+		swig>=4.0.2:devel/swig \
+		${PYTHON_PKGNAMEPREFIX}websockets>=11.0.0:devel/py-websockets@${PY_FLAVOR}
 LIB_DEPENDS=	libcares.so:dns/c-ares \
 		libzmq.so:net/libzmq4
-RUN_DEPENDS=	c-ares>=1.25.0:dns/c-ares
+RUN_DEPENDS=	c-ares>=1.25.0:dns/c-ares \
+		${PYTHON_PKGNAMEPREFIX}websockets>=11.0.0:devel/py-websockets@${PY_FLAVOR}
 
 USES=		bison cmake compiler:c++20-lang cpe gettext-runtime perl5 \
 		python shebangfix ssl
@@ -29,43 +31,10 @@ BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTSCOUT=	limit:^[0-9]*\.0\.
 
 SHEBANG_FILES=	\
-	auxil/broker/bindings/python/3rdparty/pybind11/docs/conf.py \
-	auxil/broker/bindings/python/3rdparty/pybind11/setup.py \
-	auxil/broker/bindings/python/3rdparty/pybind11/tools/make_changelog.py \
-	auxil/broker/bindings/python/3rdparty/pybind11/tools/setup_global.py.in \
-	auxil/broker/bindings/python/3rdparty/pybind11/tools/setup_main.py.in \
-	auxil/btest/btest \
-	auxil/btest/btest-setsid \
-	auxil/netcontrol-connectors/acld/acld.py \
-	auxil/netcontrol-connectors/command-line/command-line.py \
-	auxil/netcontrol-connectors/openflow/controller.py \
-	auxil/netcontrol-connectors/test/simple-client.py \
-	auxil/package-manager/zkg \
-	auxil/spicy/3rdparty/benchmark/tools/compare.py \
-	auxil/spicy/3rdparty/benchmark/tools/strip_asm.py \
-	auxil/spicy/3rdparty/doctest/scripts/bench/bench.py \
-	auxil/spicy/3rdparty/doctest/scripts/bench/run_all.py \
-	auxil/spicy/doc/scripts/spicy-doc-to-rst \
-	auxil/spicy/tests/Scripts/license-header.py \
-	auxil/spicy/tests/Scripts/stray_baselines.py \
-	auxil/vcpkg/ports/gobject-introspection/portfile.cmake \
-	auxil/zeek-aux/devel-tools/github-manage \
-	auxil/zeek-client/man/build.py \
 	auxil/zeek-client/zeek-client \
-	auxil/zeekctl/ZeekControl/test_cli.py \
-	auxil/zeekctl/auxil/pysubnettree/setup.py \
 	auxil/zeekctl/auxil/trace-summary/trace-summary \
 	auxil/zeekctl/bin/stats-to-csv \
-	auxil/zeekctl/bin/zeekctl.in \
-	auxil/zeekctl/bin/zeekctld.in \
-	auxil/zeekctl/testing/Cfg/bin/zeek__test \
-	auxil/zeekctl/testing/Scripts/diff-to-bytes-output \
-	auxil/zeekctl/util/extract-strictly-local-conns \
-	auxil/zeekctl/util/reformat-stats \
-	ci/collect-repo-info.py \
-	testing/coverage/coverage_cleanup.py \
-	testing/scripts/coverage-calc \
-	testing/scripts/httpd.py
+	auxil/zeekctl/bin/zeekctl.in
 
 SUB_FILES=	pkg-message
 NO_MTREE=	yes
@@ -168,6 +137,8 @@ post-patch:
 post-install:
 	${MV} ${STAGEDIR}${DATADIR}/site/local.zeek \
 	    ${STAGEDIR}${DATADIR}/site/local.zeek.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/zeek/zeek.conf \
+	    ${STAGEDIR}${PREFIX}/etc/zeek/zeek.conf.sample
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/zeek-cut
 	@${RM} ${STAGEDIR}${PREFIX}/share/zeek/tests
 	${LN} -s ../btest/data ${STAGEDIR}${PREFIX}/share/zeek/tests
diff --git a/security/zeek/distinfo b/security/zeek/distinfo
index 70155a325d0e..3a531178a86f 100644
--- a/security/zeek/distinfo
+++ b/security/zeek/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1787168749
-SHA256 (zeek-8.0.10.tar.gz) = dbb1cb6c1eac27a8883ee4bd229a378b2f1253fa18e16cdeaaef8a00f124ddf1
-SIZE (zeek-8.0.10.tar.gz) = 101045450
+TIMESTAMP = 1789416697
+SHA256 (zeek-9.0.0.tar.gz) = 1345474b3ea04c700f5421c30c7b81cf570056a16842abba03dfa5e2b6e3ed4e
+SIZE (zeek-9.0.0.tar.gz) = 100698813
diff --git a/security/zeek/files/patch-auxil_highwayhash_highwayhash_instruction__sets.h b/security/zeek/files/patch-auxil_highwayhash_highwayhash_instruction__sets.h
deleted file mode 100644
index 2a3dd0145eff..000000000000
--- a/security/zeek/files/patch-auxil_highwayhash_highwayhash_instruction__sets.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- auxil/highwayhash/highwayhash/instruction_sets.h.orig	2024-04-18 09:56:24 UTC
-+++ auxil/highwayhash/highwayhash/instruction_sets.h
-@@ -38,7 +38,11 @@ class InstructionSets {
-   static TargetBits Supported();
- #elif HH_ARCH_PPC
-   static HH_INLINE TargetBits Supported() {
-+#ifdef __LITTLE_ENDIAN__
-     return HH_TARGET_VSX | HH_TARGET_Portable;
-+#else
-+    return HH_TARGET_Portable;
-+#endif
-   }
- #elif HH_ARCH_NEON
-   static HH_INLINE TargetBits Supported() {
-@@ -64,7 +68,7 @@ class InstructionSets {
-       Func<HH_TARGET_SSE41>()(std::forward<Args>(args)...);
-       return HH_TARGET_SSE41;
-     }
--#elif HH_ARCH_PPC
-+#elif HH_ARCH_PPC && defined(__LITTLE_ENDIAN__)
-     const TargetBits supported = Supported();
-     if (supported & HH_TARGET_VSX) {
-       Func<HH_TARGET_VSX>()(std::forward<Args>(args)...);
-@@ -96,7 +100,7 @@ class InstructionSets {
-     if (supported & HH_TARGET_SSE41) {
-       Func<HH_TARGET_SSE41>()(std::forward<Args>(args)...);
-     }
--#elif HH_ARCH_PPC
-+#elif HH_ARCH_PPC && defined(__LITTLE_ENDIAN__)
-     if (supported & HH_TARGET_VSX) {
-       Func<HH_TARGET_VSX>()(std::forward<Args>(args)...);
-     }
diff --git a/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_CMakeLists.txt b/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_CMakeLists.txt
deleted file mode 100644
index 51f97e7fb174..000000000000
--- a/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- auxil/spicy/3rdparty/fiber/CMakeLists.txt.orig	2026-09-04 12:06:27 UTC
-+++ auxil/spicy/3rdparty/fiber/CMakeLists.txt	2026-09-04 12:06:27 UTC
-@@ -82,7 +82,7 @@
-   endif()
- elseif(CMU_OS_POSIX AND CMU_ARCH_RISCV)
-   set(asm_sources src/fiber_asm_riscv_elf.S)
--elseif(CMU_OS_POSIX AND CMU_ARCH_PPC AND FIBER_BITS_64 AND CMU_LITTLE_ENDIAN)
-+elseif(CMU_OS_POSIX AND CMU_ARCH_PPC AND FIBER_BITS_64)
-   set(asm_sources src/fiber_asm_ppc64le_elf2.S)
- endif()
- 
diff --git a/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_include_fiber_fiber__mach.h b/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_include_fiber_fiber__mach.h
deleted file mode 100644
index 5d9233a7d1ca..000000000000
--- a/security/zeek/files/patch-auxil_spicy_3rdparty_fiber_include_fiber_fiber__mach.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- auxil/spicy/3rdparty/fiber/include/fiber/fiber_mach.h.orig	2026-09-04 12:06:27 UTC
-+++ auxil/spicy/3rdparty/fiber/include/fiber/fiber_mach.h	2026-09-04 12:06:27 UTC
-@@ -104,7 +104,7 @@
-         void *s[12];                                                           \
-         double fs[12]
- 
--#elif HU_ARCH_PPC_P && HU_BITS_64_P && HU_LITTLE_ENDIAN_P && HU_OBJFMT_ELF_P
-+#elif HU_ARCH_PPC_P && HU_BITS_64_P && HU_OBJFMT_ELF_P
- #    define FIBER_TARGET_PPC64LE_ELF 1
- #    define FIBER_DEFAULT_STACK_ALIGNMENT 16
- #    if !defined(_CALL_ELF) || _CALL_ELF != 2
diff --git a/security/zeek/files/patch-auxil_spicy_hilti_runtime_src_fiber.cc b/security/zeek/files/patch-auxil_spicy_hilti_runtime_src_fiber.cc
deleted file mode 100644
index 57105c30bc0d..000000000000
--- a/security/zeek/files/patch-auxil_spicy_hilti_runtime_src_fiber.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- auxil/spicy/hilti/runtime/src/fiber.cc.orig	2026-09-04 12:06:27 UTC
-+++ auxil/spicy/hilti/runtime/src/fiber.cc	2026-09-04 12:06:27 UTC
-@@ -213,7 +213,7 @@
-             if ( limit.rlim_cur < min_size )
-                 throw RuntimeError(fmt("process stack size too small, need at least %zu KB", min_size / 1024));
- 
--#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__
-+#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__ || __powerpc64__
-             // There's a bit of fuzziness here as the current frame won't start
-             // exactly at the beginning of the stack---but should be good
-             // enough.
-@@ -330,7 +330,7 @@
-     // The direction in which the stack grows is platform-specific. It's
-     // probably gong to be growing downwards pretty much everywhere, but to be
-     // safe we whitelist platforms that we have confirmed to do so.
--#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__
-+#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__ || __powerpc64__
-     auto* lower = reinterpret_cast<char*>(_fiber->regs.sp);
-     auto* upper = reinterpret_cast<char*>(_fiber->regs.sp) + fiber_stack_used_size(_fiber);
- #else
-@@ -349,7 +349,7 @@
-     assert(::fiber_is_executing(_fiber)); // must be live
- 
-     // Whitelist architectures where we know how to do this.
--#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__
-+#if __x86_64__ || __arm__ || __arm64__ || __aarch64__ || __i386__ || __powerpc64__
-     // See
-     // https://stackoverflow.com/questions/20059673/print-out-value-of-stack-pointer
-     // for discussion of how to get stack pointer.
diff --git a/security/zeek/files/patch-src_CMakeLists.txt b/security/zeek/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 986332e37a0f..000000000000
--- a/security/zeek/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/CMakeLists.txt.orig	2026-09-03 07:08:53 UTC
-+++ src/CMakeLists.txt	2026-09-03 07:08:53 UTC
-@@ -509,9 +509,11 @@
-     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_neon.cc)
-     list(APPEND hhash_sources ${hhash_dir}/hh_neon.cc)
- elseif (${COMPILER_ARCHITECTURE} STREQUAL "power")
-+    if (CMAKE_CXX_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
-     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_vsx.cc)
-     set_source_files_properties(${hhash_dir}/hh_vsx.cc PROPERTIES COMPILE_FLAGS -mvsx)
-     list(APPEND hhash_sources ${hhash_dir}/hh_vsx.cc)
-+    endif ()
- elseif (${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
-     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_avx2.cc ${hhash_dir}/hh_sse41.cc)
-     if (MSVC)
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 6adc2f5afddd..d526054027b6 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1,7 +1,6 @@
 bin/bifcl
 bin/binpac
 %%ZEEKCTL%%bin/capstats
-bin/gen-zam
 %%SPICY%%bin/hilti-config
 %%SPICY%%bin/hiltic
 bin/paraglob-test
@@ -16,11 +15,13 @@ bin/paraglob-test
 bin/zeek
 bin/zeek-archiver
 bin/zeek-client
+bin/zeek-cluster-layout-generator
 bin/zeek-config
 bin/zeek-cut
 %%ZEEKCTL%%bin/zeekctl
 %%ZEEKCTL%%@sample etc/networks.cfg.sample
 %%ZEEKCTL%%@sample etc/node.cfg.sample
+%%ZEEKCTL%%@sample etc/zeek/zeek.conf.sample
 %%ZEEKCTL%%@sample etc/zeekctl.cfg.sample
 include/binpac/binpac.h
 include/binpac/binpac_analyzer.h
@@ -46,7 +47,6 @@ include/broker/data.hh
 include/broker/data_envelope.hh
 include/broker/defaults.hh
 include/broker/detail/abstract_backend.hh
-include/broker/detail/algorithms.hh
 include/broker/detail/appliers.hh
 include/broker/detail/assert.hh
 include/broker/detail/comparable.hh
@@ -57,9 +57,7 @@ include/broker/detail/hash.hh
 include/broker/detail/inspect_enum.hh
 include/broker/detail/make_backend.hh
 include/broker/detail/memory_backend.hh
-include/broker/detail/monotonic_buffer_resource.hh
 include/broker/detail/native_socket.hh
-include/broker/detail/next_tick.hh
 include/broker/detail/opaque_type.hh
 include/broker/detail/overload.hh
 include/broker/detail/peer_status_map.hh
@@ -171,6 +169,7 @@ include/broker/zeek.hh
 %%SPICY%%include/hilti/ast/declaration.h
 %%SPICY%%include/hilti/ast/declarations/all.h
 %%SPICY%%include/hilti/ast/declarations/constant.h
+%%SPICY%%include/hilti/ast/declarations/export.h
 %%SPICY%%include/hilti/ast/declarations/expression.h
 %%SPICY%%include/hilti/ast/declarations/field.h
 %%SPICY%%include/hilti/ast/declarations/function.h
@@ -186,7 +185,6 @@ include/broker/zeek.hh
 %%SPICY%%include/hilti/ast/expression.h
 %%SPICY%%include/hilti/ast/expressions/all.h
 %%SPICY%%include/hilti/ast/expressions/assign.h
-%%SPICY%%include/hilti/ast/expressions/builtin-function.h
 %%SPICY%%include/hilti/ast/expressions/coerced.h
 %%SPICY%%include/hilti/ast/expressions/condition-test.h
 %%SPICY%%include/hilti/ast/expressions/ctor.h
@@ -332,7 +330,10 @@ include/broker/zeek.hh
 %%SPICY%%include/hilti/compiler/detail/cxx/formatter.h
 %%SPICY%%include/hilti/compiler/detail/cxx/linker.h
 %%SPICY%%include/hilti/compiler/detail/cxx/unit.h
-%%SPICY%%include/hilti/compiler/detail/optimizer.h
+%%SPICY%%include/hilti/compiler/detail/optimizer/collector-callers.h
+%%SPICY%%include/hilti/compiler/detail/optimizer/optimizer.h
+%%SPICY%%include/hilti/compiler/detail/optimizer/pass-id.h
+%%SPICY%%include/hilti/compiler/detail/optimizer/pass.h
 %%SPICY%%include/hilti/compiler/detail/parser/driver.h
 %%SPICY%%include/hilti/compiler/detail/parser/scanner.h
 %%SPICY%%include/hilti/compiler/detail/resolver.h
@@ -348,8 +349,53 @@ include/broker/zeek.hh
 %%SPICY%%include/hilti/hilti.h
 %%SPICY%%include/hilti/rt/3rdparty/ArticleEnumClass-v2/EnumClass.h
 %%SPICY%%include/hilti/rt/3rdparty/SafeInt/SafeInt.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/safe_math.h
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/safe_math_impl.h
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/adl_serializer.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/byte_container_with_subtype.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/abi_macros.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/conversions/from_json.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/conversions/to_chars.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/conversions/to_json.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/exceptions.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/hash.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/binary_reader.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/input_adapters.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/json_sax.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/lexer.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/parser.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/input/position_t.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/internal_iterator.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/iter_impl.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/iteration_proxy.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/iterator_traits.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/json_reverse_iterator.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/iterators/primitive_iterator.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/json_custom_base_class.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/json_pointer.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/json_ref.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/macro_scope.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/macro_unscope.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/call_std/begin.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/call_std/end.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/cpp_future.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/detected.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/identity_tag.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/is_sax.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/std_fs.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/type_traits.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/meta/void_t.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/output/binary_writer.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/output/output_adapters.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/output/serializer.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/string_concat.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/string_escape.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/detail/value_t.hpp
 %%SPICY%%include/hilti/rt/3rdparty/nlohmann/json.hpp
 %%SPICY%%include/hilti/rt/3rdparty/nlohmann/json_fwd.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/ordered_map.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/thirdparty/hedley/hedley.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/thirdparty/hedley/hedley_undef.hpp
 %%SPICY%%include/hilti/rt/3rdparty/tinyformat/tinyformat.h
 %%SPICY%%include/hilti/rt/any.h
 %%SPICY%%include/hilti/rt/autogen/config.h
@@ -378,6 +424,7 @@ include/broker/zeek.hh
 %%SPICY%%include/hilti/rt/library.h
 %%SPICY%%include/hilti/rt/linker.h
 %%SPICY%%include/hilti/rt/logging.h
+%%SPICY%%include/hilti/rt/macros.h
 %%SPICY%%include/hilti/rt/profiler-state.h
 %%SPICY%%include/hilti/rt/profiler.h
 %%SPICY%%include/hilti/rt/result.h
@@ -614,7 +661,6 @@ include/zeek/ScriptProfile.h
 include/zeek/ScriptValidation.h
 include/zeek/SerializationFormat.h
 include/zeek/SmithWaterman.h
-include/zeek/Span.h
 include/zeek/Stats.h
 include/zeek/Stmt.h
 include/zeek/StmtBase.h
@@ -630,6 +676,7 @@ include/zeek/UID.h
 include/zeek/Val.h
 include/zeek/Var.h
 include/zeek/WeirdState.h
+include/zeek/WinHandle.h
 include/zeek/ZVal.h
 include/zeek/ZeekArgs.h
 include/zeek/ZeekList.h
@@ -968,81 +1015,29 @@ include/zeek/broker/comm.bif.h
 include/zeek/broker/data.bif.h
 include/zeek/broker/messaging.bif.h
 include/zeek/broker/store.bif.h
+include/zeek/builtin-plugins/zeek-packet-source-udp/packet_source_udp.bif.h
 include/zeek/cluster/Backend.h
 include/zeek/cluster/BifSupport.h
 include/zeek/cluster/Component.h
 include/zeek/cluster/Event.h
 include/zeek/cluster/Manager.h
 include/zeek/cluster/OnLoop.h
+include/zeek/cluster/PublishOnChangeState.h
 include/zeek/cluster/Serializer.h
 include/zeek/cluster/Telemetry.h
 include/zeek/cluster/backend/zeromq/Plugin.h
 include/zeek/cluster/backend/zeromq/ZeroMQ-Proxy.h
+include/zeek/cluster/backend/zeromq/ZeroMQ-ZAP.h
 include/zeek/cluster/backend/zeromq/ZeroMQ.h
 include/zeek/cluster/backend/zeromq/cluster_backend_zeromq.bif.h
 include/zeek/cluster/cluster.bif.h
+include/zeek/cluster/publish_on_change.bif.h
 include/zeek/cluster/serializer/binary-serialization-format/Plugin.h
 include/zeek/cluster/serializer/binary-serialization-format/Serializer.h
 include/zeek/cluster/serializer/broker/Plugin.h
 include/zeek/cluster/serializer/broker/Serializer.h
 include/zeek/cluster/websocket/Plugin.h
 include/zeek/cluster/websocket/WebSocket.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/common/IXLog.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/common/IXPdu.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXBase64.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXBench.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXCancellationRequest.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXConnectionState.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXDNSLookup.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXExponentialBackoff.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXGetFreePort.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXGzipCodec.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttp.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttpClient.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttpServer.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXNetSystem.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXProgressCallback.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterrupt.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptFactory.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSetThreadName.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocket.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketAppleSSL.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketConnect.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketFactory.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketMbedTLS.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketOpenSSL.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketServer.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketTLSOptions.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXStrCaseCompare.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUdpSocket.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUniquePtr.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUrlParser.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUserAgent.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUtf8Validator.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUuid.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocket.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketCloseConstants.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketCloseInfo.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketErrorInfo.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHandshake.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHandshakeKeyGen.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHttpHeaders.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketInitResult.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketMessage.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketMessageType.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketOpenInfo.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketProxyServer.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketSendData.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketSendInfo.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketServer.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketTransport.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketVersion.h
-include/zeek/cluster/websocket/auxil/IXWebSocket/test/IXTest.h
 include/zeek/cluster/websocket/events.bif.h
 include/zeek/communityid.bif.func_h
 include/zeek/communityid.bif.netvar_h
@@ -1089,9 +1084,9 @@ include/zeek/file_analysis/analyzer/x509/x509-signed_certificate_timestamp.pac
 include/zeek/file_analysis/file_analysis.bif.h
 include/zeek/fuzzers/FuzzBuffer.h
 include/zeek/fuzzers/fuzzer-setup.h
-include/zeek/include/zeek
 include/zeek/input.h
 include/zeek/input/Component.h
+include/zeek/input/InputFile.h
 include/zeek/input/Manager.h
 include/zeek/input/ReaderBackend.h
 include/zeek/input/ReaderFrontend.h
@@ -1116,9 +1111,12 @@ include/zeek/iosource/Manager.h
 include/zeek/iosource/Packet.h
 include/zeek/iosource/PktDumper.h
 include/zeek/iosource/PktSrc.h
+include/zeek/iosource/af_packet/AF_Packet.h
+include/zeek/iosource/af_packet/RX_Ring.h
 include/zeek/iosource/pcap/Dumper.h
 include/zeek/iosource/pcap/Source.h
 include/zeek/iosource/pcap/pcap.bif.h
+include/zeek/iosource/pcapng/Source.h
 include/zeek/logging/Component.h
 include/zeek/logging/Manager.h
 include/zeek/logging/Types.h
@@ -1271,21 +1269,22 @@ include/zeek/script_opt/ZAM/ZBody.h
 include/zeek/script_opt/ZAM/ZInst.h
 include/zeek/script_opt/ZAM/ZInstAux.h
 include/zeek/script_opt/ZAM/ZOp.h
+include/zeek/script_opt/ZAM/zam-prof.bif.h
 include/zeek/session/Key.h
 include/zeek/session/Manager.h
 include/zeek/session/Session.h
-include/zeek/spicy/cookie.h
-include/zeek/spicy/file-analyzer.h
-include/zeek/spicy/manager.h
-include/zeek/spicy/packet-analyzer.h
-include/zeek/spicy/port-range.h
-include/zeek/spicy/protocol-analyzer.h
-include/zeek/spicy/runtime-support.h
+%%SPICY%%include/zeek/spicy/cookie.h
+%%SPICY%%include/zeek/spicy/file-analyzer.h
+%%SPICY%%include/zeek/spicy/manager.h
+%%SPICY%%include/zeek/spicy/packet-analyzer.h
+%%SPICY%%include/zeek/spicy/port-range.h
+%%SPICY%%include/zeek/spicy/protocol-analyzer.h
+%%SPICY%%include/zeek/spicy/runtime-support.h
 %%SPICY%%include/zeek/spicy/spicy.bif.h
 %%SPICY%%include/zeek/spicy/spicyz/config.h
-include/zeek/spicy/spicyz/driver.h
-include/zeek/spicy/spicyz/glue-compiler.h
-include/zeek/spicy/spicyz/zeek-version.h
+%%SPICY%%include/zeek/spicy/spicyz/driver.h
+%%SPICY%%include/zeek/spicy/spicyz/glue-compiler.h
+%%SPICY%%include/zeek/spicy/spicyz/zeek-version.h
 include/zeek/stats.bif.func_h
 include/zeek/stats.bif.netvar_h
 include/zeek/storage/Backend.h
@@ -1332,6 +1331,7 @@ include/zeek/types.bif.func_h
 include/zeek/types.bif.netvar_h
 include/zeek/util-types.h
 include/zeek/util.h
+include/zeek/val-convert.h
 include/zeek/zeek-affinity.h
 include/zeek/zeek-bif.h
 include/zeek/zeek-config-paths.h
@@ -1358,8 +1358,6 @@ lib/cmake/Broker/BrokerConfigVersion.cmake
 lib/cmake/Broker/BrokerTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Broker/BrokerTargets.cmake
 lib/libbinpac.so
-lib/libbinpac.so.0
-lib/libbinpac.so.0.61
 lib/libbroker.a
 %%SPICY%%lib/libhilti-rt-debug.a
 %%SPICY%%lib/libhilti-rt.a
@@ -1424,31 +1422,32 @@ share/btest/data/Scripts/diff-remove-abspath
 share/btest/data/Scripts/diff-remove-timestamps
 share/btest/data/Scripts/diff-sort
 share/btest/data/Scripts/run-zeek
-share/btest/data/Scripts/spicy-version
+%%SPICY%%share/btest/data/Scripts/spicy-version
 share/btest/data/Scripts/zeek-version
 share/btest/data/random.seed
 share/btest/scripts/diff-canonifier
 share/btest/scripts/diff-canonifier-external
-share/btest/scripts/diff-canonifier-spicy
+%%SPICY%%share/btest/scripts/diff-canonifier-spicy
 share/btest/scripts/diff-clean-doctest
 share/btest/scripts/diff-remove-abspath
 share/btest/scripts/diff-remove-fields
 share/btest/scripts/diff-remove-file-ids
 share/btest/scripts/diff-remove-first-timestamp
 share/btest/scripts/diff-remove-fractions
+share/btest/scripts/diff-remove-locations
 share/btest/scripts/diff-remove-openclose-timestamps
-share/btest/scripts/diff-remove-spicy-abspath
+%%SPICY%%share/btest/scripts/diff-remove-spicy-abspath
 share/btest/scripts/diff-remove-timestamps
 share/btest/scripts/diff-remove-timestamps-and-sort
 share/btest/scripts/diff-remove-uids
-share/btest/scripts/diff-remove-x509-key-info
 share/btest/scripts/diff-remove-x509-names
 share/btest/scripts/diff-sort
 share/btest/scripts/diff-sort-and-remove-abspath
 share/btest/scripts/diff-sort-set-elements
-share/btest/scripts/spicy/diff-remove-abspath
-share/btest/scripts/spicy/diff-remove-timestamps
-share/btest/scripts/spicy/diff-sort
+share/btest/scripts/diff-time-zone
+%%SPICY%%share/btest/scripts/spicy/diff-remove-abspath
+%%SPICY%%share/btest/scripts/spicy/diff-remove-timestamps
+%%SPICY%%share/btest/scripts/spicy/diff-sort
 %%SPICY%%share/hilti/hilti.hlt
 %%ZEEKCTL%%share/man/man1/trace-summary.1.gz
 share/man/man1/zeek-client.1.gz
@@ -1457,6 +1456,7 @@ share/man/man8/zeek.8.gz
 %%ZEEKCTL%%share/man/man8/zeekctl.8.gz
 %%SPICY%%share/spicy/filter.spicy
 %%SPICY%%share/spicy/finger/finger.spicy
+%%SPICY%%share/spicy/igmp/igmp.spicy
 %%SPICY%%share/spicy/ldap/asn1.spicy
 %%SPICY%%share/spicy/ldap/ldap.spicy
 %%SPICY%%share/spicy/ldap/ldap_zeek.spicy
@@ -1470,6 +1470,8 @@ share/man/man8/zeek.8.gz
 %%SPICY%%share/spicy/spicy_rt.hlt
 %%SPICY%%share/spicy/syslog/syslog.spicy
 %%SPICY%%share/spicy/websocket/websocket.spicy
+%%SPICY%%share/spicy/zip/zeek_zip.spicy
+%%SPICY%%share/spicy/zip/zip.spicy
 %%DATADIR%%/base/bif/CPP-load.bif.zeek
 %%DATADIR%%/base/bif/__load__.zeek
 %%DATADIR%%/base/bif/analyzer.bif.zeek
@@ -1551,6 +1553,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/bif/plugins/Zeek_POP3.consts.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_POP3.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_PPPoE.functions.bif.zeek
+%%DATADIR%%/base/bif/plugins/Zeek_PacketSourceUDP.packet_source_udp.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_RADIUS.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_RDP.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_RDP.types.bif.zeek
@@ -1625,6 +1628,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/bif/plugins/Zeek_X509.types.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_XMPP.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/__load__.zeek
+%%DATADIR%%/base/bif/publish_on_change.bif.zeek
 %%DATADIR%%/base/bif/reporter.bif.zeek
 %%SPICY%%%%DATADIR%%/base/bif/spicy.bif.zeek
 %%DATADIR%%/base/bif/stats.bif.zeek
@@ -1640,6 +1644,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/bif/telemetry_types.bif.zeek
 %%DATADIR%%/base/bif/top-k.bif.zeek
 %%DATADIR%%/base/bif/types.bif.zeek
+%%DATADIR%%/base/bif/zam-prof.bif.zeek
 %%DATADIR%%/base/bif/zeek.bif.zeek
 %%DATADIR%%/base/bif/zeekygen.bif.zeek
 %%DATADIR%%/base/files/extract/__load__.zeek
@@ -1653,6 +1658,9 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/files/x509/certificate-event-cache.zeek
 %%DATADIR%%/base/files/x509/log-ocsp.zeek
 %%DATADIR%%/base/files/x509/main.zeek
+%%DATADIR%%/base/files/zip/__load__.zeek
+%%DATADIR%%/base/files/zip/main.zeek
+%%DATADIR%%/base/files/zip/types.zeek
 %%DATADIR%%/base/frameworks/analyzer/__load__.zeek
 %%DATADIR%%/base/frameworks/analyzer/dpd.zeek
 %%DATADIR%%/base/frameworks/analyzer/logging.zeek
@@ -1663,18 +1671,20 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/frameworks/broker/main.zeek
 %%DATADIR%%/base/frameworks/broker/store.zeek
 %%DATADIR%%/base/frameworks/cluster/__load__.zeek
-%%DATADIR%%/base/frameworks/cluster/broker-backpressure.zeek
 %%DATADIR%%/base/frameworks/cluster/broker-stores.zeek
-%%DATADIR%%/base/frameworks/cluster/broker-telemetry.zeek
 %%DATADIR%%/base/frameworks/cluster/main.zeek
 %%DATADIR%%/base/frameworks/cluster/nodes/logger.zeek
 %%DATADIR%%/base/frameworks/cluster/nodes/manager.zeek
 %%DATADIR%%/base/frameworks/cluster/nodes/proxy.zeek
 %%DATADIR%%/base/frameworks/cluster/nodes/worker.zeek
 %%DATADIR%%/base/frameworks/cluster/pools.zeek
+%%DATADIR%%/base/frameworks/cluster/publish-on-change.zeek
+%%DATADIR%%/base/frameworks/cluster/pubsub.zeek
 %%DATADIR%%/base/frameworks/cluster/setup-connections.zeek
+%%DATADIR%%/base/frameworks/cluster/setup-subscriptions.zeek
 %%DATADIR%%/base/frameworks/cluster/supervisor.zeek
 %%DATADIR%%/base/frameworks/cluster/telemetry.zeek
+%%DATADIR%%/base/frameworks/cluster/types.zeek
 %%DATADIR%%/base/frameworks/config/__load__.zeek
 %%DATADIR%%/base/frameworks/config/input.zeek
 %%DATADIR%%/base/frameworks/config/main.zeek
@@ -1759,10 +1769,10 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/frameworks/signatures/main.zeek
 %%DATADIR%%/base/frameworks/software/__load__.zeek
 %%DATADIR%%/base/frameworks/software/main.zeek
-%%DATADIR%%/base/frameworks/spicy/__load__.zeek
-%%DATADIR%%/base/frameworks/spicy/init-bare.zeek
-%%DATADIR%%/base/frameworks/spicy/init-framework.zeek
-%%DATADIR%%/base/frameworks/spicy/main.zeek
+%%SPICY%%%%DATADIR%%/base/frameworks/spicy/__load__.zeek
+%%SPICY%%%%DATADIR%%/base/frameworks/spicy/init-bare.zeek
+%%SPICY%%%%DATADIR%%/base/frameworks/spicy/init-framework.zeek
+%%SPICY%%%%DATADIR%%/base/frameworks/spicy/main.zeek
 %%DATADIR%%/base/frameworks/storage/__load__.zeek
 %%DATADIR%%/base/frameworks/storage/async.zeek
 %%DATADIR%%/base/frameworks/storage/main.zeek
@@ -1819,6 +1829,10 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/packet-protocols/ieee802_11/main.zeek
 %%DATADIR%%/base/packet-protocols/ieee802_11_radio/__load__.zeek
 %%DATADIR%%/base/packet-protocols/ieee802_11_radio/main.zeek
+%%DATADIR%%/base/packet-protocols/igmp/__load__.zeek
+%%DATADIR%%/base/packet-protocols/igmp/main.zeek
+%%SPICY%%%%DATADIR%%/base/packet-protocols/igmp/spicy-events.zeek
+%%DATADIR%%/base/packet-protocols/igmp/types.zeek
 %%DATADIR%%/base/packet-protocols/ip/__load__.zeek
 %%DATADIR%%/base/packet-protocols/ip/main.zeek
 %%DATADIR%%/base/packet-protocols/iptunnel/__load__.zeek
@@ -1889,7 +1903,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/protocols/dns/main.zeek
 %%DATADIR%%/base/protocols/finger/__load__.zeek
 %%DATADIR%%/base/protocols/finger/main.zeek
-%%DATADIR%%/base/protocols/finger/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/finger/spicy-events.zeek
 %%DATADIR%%/base/protocols/ftp/__load__.zeek
 %%DATADIR%%/base/protocols/ftp/dpd.sig
 %%DATADIR%%/base/protocols/ftp/files.zeek
@@ -1920,7 +1934,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/protocols/ldap/consts.zeek
 %%DATADIR%%/base/protocols/ldap/dpd.sig
 %%DATADIR%%/base/protocols/ldap/main.zeek
-%%DATADIR%%/base/protocols/ldap/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/ldap/spicy-events.zeek
 %%DATADIR%%/base/protocols/modbus/__load__.zeek
 %%DATADIR%%/base/protocols/modbus/consts.zeek
 %%DATADIR%%/base/protocols/modbus/main.zeek
@@ -1942,11 +1956,12 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/protocols/postgresql/consts.zeek
 %%DATADIR%%/base/protocols/postgresql/dpd.sig
 %%DATADIR%%/base/protocols/postgresql/main.zeek
-%%DATADIR%%/base/protocols/postgresql/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/postgresql/spicy-events.zeek
 %%DATADIR%%/base/protocols/quic/__load__.zeek
 %%DATADIR%%/base/protocols/quic/consts.zeek
+%%DATADIR%%/base/protocols/quic/dpd.sig
 %%DATADIR%%/base/protocols/quic/main.zeek
-%%DATADIR%%/base/protocols/quic/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/quic/spicy-events.zeek
 %%DATADIR%%/base/protocols/radius/__load__.zeek
 %%DATADIR%%/base/protocols/radius/consts.zeek
 %%DATADIR%%/base/protocols/radius/main.zeek
@@ -1957,7 +1972,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/protocols/redis/__load__.zeek
 %%DATADIR%%/base/protocols/redis/dpd.sig
 %%DATADIR%%/base/protocols/redis/main.zeek
-%%DATADIR%%/base/protocols/redis/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/redis/spicy-events.zeek
 %%DATADIR%%/base/protocols/rfb/__load__.zeek
 %%DATADIR%%/base/protocols/rfb/dpd.sig
 %%DATADIR%%/base/protocols/rfb/main.zeek
@@ -1997,7 +2012,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/protocols/syslog/__load__.zeek
 %%DATADIR%%/base/protocols/syslog/consts.zeek
 %%DATADIR%%/base/protocols/syslog/main.zeek
-%%DATADIR%%/base/protocols/syslog/spicy-events.zeek
+%%SPICY%%share/zeek/base/protocols/syslog/spicy-events.zeek
 %%DATADIR%%/base/protocols/tunnels/__load__.zeek
 %%DATADIR%%/base/protocols/tunnels/dpd.sig
 %%DATADIR%%/base/protocols/websocket/__load__.zeek
@@ -2027,6 +2042,10 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/base/utils/thresholds.zeek
 %%DATADIR%%/base/utils/time.zeek
 %%DATADIR%%/base/utils/urls.zeek
+%%ZEEKCTL%%%%DATADIR%%/builtin-plugins/Zeek_PacketSourceUDP/__load__.zeek
+%%ZEEKCTL%%%%DATADIR%%/builtin-plugins/Zeek_PacketSourceUDP/policy/frameworks/conn_key/packet_source/udp/geneve_vni.zeek
+%%ZEEKCTL%%%%DATADIR%%/builtin-plugins/Zeek_PacketSourceUDP/policy/frameworks/conn_key/packet_source/udp/geneve_vxlan_vni.zeek
+%%ZEEKCTL%%%%DATADIR%%/builtin-plugins/Zeek_PacketSourceUDP/policy/frameworks/conn_key/packet_source/udp/vxlan_vni.zeek
 %%ZEEKCTL%%%%DATADIR%%/builtin-plugins/__load__.zeek
 %%ZEEKCTL%%%%DATADIR%%/builtin-plugins/__preload__.zeek
 %%DATADIR%%/cmake/.cmake-format.json
@@ -2100,20 +2119,24 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/cmake/zeek-plugin-create-package.sh
 %%DATADIR%%/cmake/zeek-plugin-install-package.sh
 %%DATADIR%%/policy/files/x509/disable-certificate-events-known-certs.zeek
+%%DATADIR%%/policy/files/zip/register.zeek
 %%DATADIR%%/policy/frameworks/analyzer/debug-logging.zeek
-%%DATADIR%%/policy/frameworks/analyzer/deprecated-dpd-log.zeek
 %%DATADIR%%/policy/frameworks/analyzer/detect-protocols.zeek
 %%DATADIR%%/policy/frameworks/analyzer/packet-segment-logging.zeek
+%%DATADIR%%/policy/frameworks/cluster/backend/broker/__load__.zeek
+%%DATADIR%%/policy/frameworks/cluster/backend/broker/backpressure.zeek
+%%DATADIR%%/policy/frameworks/cluster/backend/broker/main.zeek
+%%DATADIR%%/policy/frameworks/cluster/backend/broker/telemetry.zeek
 %%DATADIR%%/policy/frameworks/cluster/backend/zeromq/__load__.zeek
 %%DATADIR%%/policy/frameworks/cluster/backend/zeromq/connect.zeek
 %%DATADIR%%/policy/frameworks/cluster/backend/zeromq/main.zeek
+%%DATADIR%%/policy/frameworks/cluster/backend/zeromq/options.zeek
 %%DATADIR%%/policy/frameworks/cluster/experimental.zeek
 %%DATADIR%%/policy/frameworks/cluster/nodes-experimental/manager.zeek
+%%DATADIR%%/policy/frameworks/cluster/websocket/server.zeek
 %%DATADIR%%/policy/frameworks/conn_key/vlan_fivetuple.zeek
 %%DATADIR%%/policy/frameworks/control/controllee.zeek
 %%DATADIR%%/policy/frameworks/control/controller.zeek
-%%DATADIR%%/policy/frameworks/dpd/detect-protocols.zeek
-%%DATADIR%%/policy/frameworks/dpd/packet-segment-logging.zeek
 %%DATADIR%%/policy/frameworks/files/detect-MHR.zeek
 %%DATADIR%%/policy/frameworks/files/entropy-test-all-files.zeek
 %%DATADIR%%/policy/frameworks/files/extract-all-files.zeek
@@ -2174,8 +2197,8 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/frameworks/software/version-changes.zeek
 %%DATADIR%%/policy/frameworks/software/vulnerable.zeek
 %%DATADIR%%/policy/frameworks/software/windows-version-detection.zeek
-%%DATADIR%%/policy/frameworks/spicy/record-spicy-batch.zeek
-%%DATADIR%%/policy/frameworks/spicy/resource-usage.zeek
+%%SPICY%%share/zeek/policy/frameworks/spicy/record-spicy-batch.zeek
+%%SPICY%%share/zeek/policy/frameworks/spicy/resource-usage.zeek
 %%DATADIR%%/policy/frameworks/storage/backend/redis/__load__.zeek
 %%DATADIR%%/policy/frameworks/storage/backend/redis/main.zeek
 %%DATADIR%%/policy/frameworks/storage/backend/sqlite/__load__.zeek
@@ -2191,9 +2214,11 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/misc/loaded-scripts.zeek
 %%DATADIR%%/policy/misc/profiling.zeek
 %%DATADIR%%/policy/misc/stats.zeek
+%%DATADIR%%/policy/misc/systemd-generator.zeek
 %%DATADIR%%/policy/misc/trim-trace-file.zeek
 %%DATADIR%%/policy/misc/unknown-protocols.zeek
 %%DATADIR%%/policy/misc/weird-stats.zeek
+%%DATADIR%%/policy/misc/zeromq-multi-host-auto-setup.zeek
 %%DATADIR%%/policy/protocols/conn/community-id-logging.zeek
 %%DATADIR%%/policy/protocols/conn/disable-unknown-ip-proto-support.zeek
 %%DATADIR%%/policy/protocols/conn/failed-service-logging.zeek
@@ -2201,6 +2226,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/protocols/conn/known-hosts.zeek
 %%DATADIR%%/policy/protocols/conn/known-services.zeek
 %%DATADIR%%/policy/protocols/conn/mac-logging.zeek
+%%DATADIR%%/policy/protocols/conn/multicast-participants.zeek
 %%DATADIR%%/policy/protocols/conn/pppoe-session-id-logging.zeek
 %%DATADIR%%/policy/protocols/conn/speculative-service.zeek
 %%DATADIR%%/policy/protocols/conn/vlan-logging.zeek
@@ -2210,12 +2236,12 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/protocols/dhcp/sub-opts.zeek
 %%DATADIR%%/policy/protocols/dns/auth-addl.zeek
 %%DATADIR%%/policy/protocols/dns/detect-external-names.zeek
+%%DATADIR%%/policy/protocols/dns/disable-opcode-log-fields.zeek
 %%DATADIR%%/policy/protocols/dns/log-original-query-case.zeek
 %%DATADIR%%/policy/protocols/ftp/detect-bruteforcing.zeek
 %%DATADIR%%/policy/protocols/ftp/detect.zeek
 %%DATADIR%%/policy/protocols/ftp/software.zeek
 %%DATADIR%%/policy/protocols/http/detect-sql-injection.zeek
-%%DATADIR%%/policy/protocols/http/detect-sqli.zeek
 %%DATADIR%%/policy/protocols/http/detect-webapps.sig
 %%DATADIR%%/policy/protocols/http/detect-webapps.zeek
 %%DATADIR%%/policy/protocols/http/header-names.zeek
@@ -2223,6 +2249,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/protocols/http/software.zeek
 %%DATADIR%%/policy/protocols/http/var-extraction-cookies.zeek
 %%DATADIR%%/policy/protocols/http/var-extraction-uri.zeek
+%%DATADIR%%/policy/protocols/krb/md5-ticket-logging.zeek
 %%DATADIR%%/policy/protocols/krb/ticket-logging.zeek
 %%DATADIR%%/policy/protocols/modbus/known-masters-slaves.zeek
 %%DATADIR%%/policy/protocols/modbus/track-memmap.zeek
@@ -2236,6 +2263,7 @@ share/man/man8/zeek.8.gz
 %%DATADIR%%/policy/protocols/ssh/detect-bruteforcing.zeek
 %%DATADIR%%/policy/protocols/ssh/geo-data.zeek
 %%DATADIR%%/policy/protocols/ssh/interesting-hostnames.zeek
+%%DATADIR%%/policy/protocols/ssh/md5-host-key-logging.zeek
 %%DATADIR%%/policy/protocols/ssh/software.zeek
 %%DATADIR%%/policy/protocols/ssl/certificate-request-info.zeek
 %%DATADIR%%/policy/protocols/ssl/decryption.zeek