Merge remote-tracking branch 'origin/topic/awelzel/3115-debian-12'

* origin/topic/awelzel/3115-debian-12:
  NEWS: Add entry about Debian 12
  docker: Add libnode to enable JavaScript support
  docker: Bump images to Debian 12

(cherry picked from commit 84d605602f)

CHANGES

@@ -1,3 +1,41 @@
+6.0.0-rc2.10 | 2023-06-15 13:16:56 -0700
+
+  * Force -std=c++17 mode for plugin targets, remove use of RequireCXX17.cmake (Tim Wojtulewicz, Corelight)
+
+  * plugin/Manager: Warn when plugin with the same name is found (Arne Welzel, Corelight)
+
+    This was brought up on Slack as a potential source of confusion during
+    development as it's not visible when plugin directories are ignored outside
+    of looking into the plugin debug stream. I'd actually prefer to just
+    FatalError() this, but a warning seems reasonably visible for interactive
+    usage.
+
+  * Options: Do not output full usage on --test error (Arne Welzel, Corelight)
+
+    ...mostly because the usage output is very long and the actual useful
+    error message scrolls off the screen.
+
+  * GH-3090: CMakeLists: Propagate DOCTEST defines to external plugins (Arne Welzel, Corelight)
+
+    If Zeek has not been built with doctest enabled then it's not easy
+    to run a plugin's tests (and if they really wanted to they could
+    again undef the DOCTEST_CONFIG_DISABLE and provide their own doctest
+    main() implementation.
+
+  * GH-3090: CMakeLists: Add rapidjson/include to zeek_dynamic_plugin_base (Arne Welzel, Corelight)
+
+    threading/formatters/JSON.h has a rapidjson include. Extend the
+    include directories of external plugins so they are setup to find
+    these in Zeek's install tree.
+
+  * GH-3090: ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE (Arne Welzel, Corelight)
+
+    ...and bump cmake to have plugin's make use of it.
+
+  * docker: Add libnode to enable JavaScript support (Arne Welzel, Corelight)
+
+  * docker: Bump images to Debian 12 (Arne Welzel, Corelight)
+
 6.0.0-rc2.4 | 2023-06-14 10:23:27 -0700
 
   * Bump Spicy to latest release. (Benjamin Bannier, Corelight)

NEWS

@@ -272,6 +272,9 @@ New Functionality
 Changed Functionality
 ---------------------
 
+- The base distribution of the Zeek container images has been upgraded to
+  Debian 12 "bookworm" and JavaScript support was enabled.
+
 - When ``get_file_handle()`` is invoked for an analyzer that did not register
   an appropriate callback function, log a warning and return a generic handle
   value based on the analyzer and connection information.

VERSION

@@ -1 +1 @@
-6.0.0-rc2.4
+6.0.0-rc2.10

docker/builder.Dockerfile

@@ -1,7 +1,7 @@
 # See the file "COPYING" in the main distribution directory for copyright.
 
 # Layer to build Zeek.
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
 
@@ -18,15 +18,20 @@ RUN apt-get -q update \
      git \
      libfl2 \
      libfl-dev \
+     libnode-dev \
      libmaxminddb-dev \
      libpcap-dev \
      libssl-dev \
+     libuv1-dev \
      libz-dev \
      make \
      python3-minimal \
-     python3.9-dev \
+     python3.11-dev \
      swig \
      ninja-build \
      python3-pip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
+
+# Tell git all the repositories are safe.
+RUN git config --global --add safe.directory '*'

docker/final.Dockerfile

@@ -1,7 +1,7 @@
 # See the file "COPYING" in the main distribution directory for copyright.
 
 # Final layer containing all artifacts.
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
 
@@ -10,9 +10,11 @@ RUN apt-get -q update \
      ca-certificates \
      git \
      libmaxminddb0 \
-     libpython3.9 \
+     libnode108 \
+     libpython3.11 \
      libpcap0.8 \
-     libssl1.1 \
+     libssl3 \
+     libuv1 \
      libz1 \
      python3-minimal \
      python3-git \