Merge remote-tracking branch 'origin/topic/awelzel/bump-cmake-plugin-dereference-symlinks'

* origin/topic/awelzel/bump-cmake-plugin-dereference-symlinks:
  tests: Add regression tests for zeek/cmake#61
  tests/bifs-and-scripts-install: Remove unused activate.zeek
  Update cmake submodule

CHANGES

@@ -1,3 +1,15 @@
+6.0.0-dev.126 | 2023-02-27 09:52:31 +0100
+
+  * Update cmake submodule (Arne Welzel, Corelight)
+
+    To pull in zeek/cmake#62.
+
+  * cirrus: Also add ccache limits to container builds (Arne Welzel, Corelight)
+
+  * cirrus: Add an epoch to the ccache fingerprint, bump to 1000M (Arne Welzel, Corelight)
+
+  * cirrus: Cap ccache max size to 500M and max files to 20000 (Arne Welzel, Corelight)
+
 6.0.0-dev.117 | 2023-02-23 08:27:12 -0700
 
   * GH-2730: Use binary mode when opening files in Extract file analyzer (Tim Wojtulewicz)

VERSION

@@ -1 +1 @@
-6.0.0-dev.117
+6.0.0-dev.126

cmake

@@ -1 +1 @@
-Subproject commit 756a2a9ebb867ff2d560c5087d82ef679991bb55
+Subproject commit 7ca0a258bbfd283a2495517566dfb8603f4ef060

testing/btest/Baseline/plugins.bifs-and-scripts-install-delete-source/output

@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Demo::Foo - <Insert description> (dynamic, version 0.1.0)
+    [Function] hello_plugin_world
+    [Event] plugin_event
+
+===
+plugin: automatically loaded at startup
+===
+plugin: automatically loaded at startup
+plugin: manually loaded
+calling bif, Hello from the plugin!

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

@@ -0,0 +1,47 @@
+# @TEST-DOC: Create a plugin, build it, copy its tgz file, delete the source tree, install via the tgz. This ensures the tgz is self-contained and does not have anything pointing back to the source.
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u the-plugin Demo Foo
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC: cd ./the-plugin && ./configure --zeek-dist=${DIST} --install-root=`pwd`/test-install && make
+# @TEST-EXEC: cp -H ./the-plugin/build/Demo_Foo.tgz .
+# @TEST-EXEC: rm -rf ./the-plugin
+# @TEST-EXEC: ${DIST}/cmake/zeek-plugin-install-package.sh Demo_Foo `pwd`/test-install
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd`/test-install zeek -NN Demo::Foo >>output
+# @TEST-EXEC: echo "===" >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd`/test-install zeek -r $TRACES/empty.trace >>output
+# @TEST-EXEC: echo "===" >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd`/test-install zeek Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
+
+mkdir -p the-plugin/scripts/Demo/Foo/base/
+
+cat >the-plugin/scripts/__load__.zeek <<EOF
+@load ./Demo/Foo/base/at-startup.zeek
+EOF
+
+cat >the-plugin/scripts/Demo/Foo/__load__.zeek <<EOF
+@load ./manually.zeek
+EOF
+
+cat >the-plugin/scripts/Demo/Foo/manually.zeek <<EOF
+event zeek_init() &priority=-10
+        {
+        print "plugin: manually loaded";
+        print "calling bif", hello_plugin_world();
+        }
+EOF
+
+cat >the-plugin/scripts/Demo/Foo/base/at-startup.zeek <<EOF
+event zeek_init() &priority=10
+        {
+        print "plugin: automatically loaded at startup";
+        }
+EOF
+
+cat >the-plugin/src/foo.bif <<EOF
+function hello_plugin_world%(%): string
+        %{
+        return zeek::make_intrusive<zeek::StringVal>("Hello from the plugin!");
+        %}
+
+event plugin_event%(foo: count%);
+EOF

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

@@ -40,7 +40,3 @@ function hello_plugin_world%(%): string
 
 event plugin_event%(foo: count%);
 EOF
-
-cat >activate.zeek <<EOF
-@load-plugin Demo::Foo
-EOF