From 2f38ff6c877df20c275095cfa9e45f8bbb7423d5 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 26 Aug 2025 08:59:20 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/bbannier/issue-3266'

* origin/topic/bbannier/issue-3266:
  Fix installation of symlink with `DESTDIR`

(cherry picked from commit d7db612b0f1f802316ab745e292c03aa3d69c5bd)
---
 CHANGES                | 18 ++++++++++++++++++
 VERSION                |  2 +-
 testing/CMakeLists.txt |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 347f581413..817ea39135 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+8.0.0-11 | 2025-08-26 09:04:29 -0700
+
+  * Fix installation of symlink with `DESTDIR` (Benjamin Bannier, Corelight)
+
+    We install test data which we also make available under an alternative
+    path for backwards compatibility. The installation of this symlink did
+    not take `DESTDIR` installs like used by Zeek's packaging into account
+    which caused installations from packages to behave different from
+    installs from source.
+
+    This patch fixes the symlink to respect a possible `DESTDIR`.
+
+    (cherry picked from commit d7db612b0f1f802316ab745e292c03aa3d69c5bd)
+
+  * Update zeekctl submodule for docs fixes [nomail] [skip ci] (Tim Wojtulewicz, Corelight)
+
+  * Update docs submodule for v8.0.1 [nomail] [skip ci] (Tim Wojtulewicz, Corelight)
+
 8.0.0-8 | 2025-08-25 12:31:35 -0700
 
   * Merge branch 'topic/christian/news-typos' (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index e115759a9f..bf82ea0d68 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.0-8
+8.0.0-11
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index f3c12302e4..9d2e26883c 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -14,7 +14,7 @@ install(
     CODE "execute_process( \
     COMMAND ${CMAKE_COMMAND} -E create_symlink \
     ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \
-    ${CMAKE_INSTALL_PREFIX}/share/zeek/tests \
+    \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \
     )")
 
 install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts