From facbc32faeb42f1df25b4ca2bbd99e383e3d3fbc Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Thu, 20 Aug 2026 16:05:10 +0200
Subject: [PATCH 1/3] Revert "Protect state dir against concurrent operations"

This reverts commit bfe12246db70e490b568f4dd173e2f7c7c343082.

This is a straight revert, and we do not attempt a proper fix at this
point since that would require careful granular locking around mutating
operations which currently are scattered all over.
---
 testing/tests/concurrent-state-lock | 18 ------------------
 zeekpkg/manager.py                  |  7 -------
 2 files changed, 25 deletions(-)
 delete mode 100644 testing/tests/concurrent-state-lock

diff --git a/testing/tests/concurrent-state-lock b/testing/tests/concurrent-state-lock
deleted file mode 100644
index cde4667b..00000000
--- a/testing/tests/concurrent-state-lock
+++ /dev/null
@@ -1,18 +0,0 @@
-# @TEST-DOC: Concurrent zkg invocations must not race on shared state.
-#
-# @TEST-EXEC: bash %INPUT
-# @TEST-EXEC: btest-bg-wait 30
-#
-# @TEST-EXEC: test ! -s r1/.stderr
-# @TEST-EXEC: test ! -s r2/.stderr
-
-# `btest-bg-run` changes the working directory, so `zkg list` needs an explicit cd to find the test state.
-#
-# This test assumes `zkg list` mutates state, without that the race may not trigger.
-testdir=$(pwd)
-cat > run-zkg-list <<EOF
-cd $testdir && zkg list
-EOF
-
-BTEST_BG_RUN_SLEEP=0 btest-bg-run r1 "sh $testdir/run-zkg-list"
-BTEST_BG_RUN_SLEEP=0 btest-bg-run r2 "sh $testdir/run-zkg-list"
diff --git a/zeekpkg/manager.py b/zeekpkg/manager.py
index 22c3ad86..faf387cd 100644
--- a/zeekpkg/manager.py
+++ b/zeekpkg/manager.py
@@ -5,7 +5,6 @@
 
 import configparser
 import copy
-import fcntl
 import filecmp
 import json
 import os
@@ -292,13 +291,7 @@ def __init__(
         self.manifest = os.path.join(self.state_dir, "manifest.json")
         self.autoload_script = os.path.join(self.script_dir, "packages.zeek")
         self.autoload_package = os.path.join(self.script_dir, "__load__.zeek")
-
         make_dir(self.state_dir)
-
-        # The lock file lives inside `state_dir`, so we open it after ensuring the dir exists.
-        self._state_lock = open(os.path.join(self.state_dir, ".lock"), "a")
-        fcntl.flock(self._state_lock, fcntl.LOCK_EX)
-
         make_dir(self.log_dir)
         make_dir(self.scratch_dir)
         make_dir(self.source_clonedir)

From 30124bf1ccf85687c7a24edfd19d360de6a44311 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Thu, 20 Aug 2026 16:13:44 +0200
Subject: [PATCH 2/3] Update CI for Zeek now shipping a shiv-bundled zkg

---
 .github/workflows/test.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 00e8d72b..7ba6f82c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,10 +43,11 @@ jobs:
       - name: Remove zkg installation
         # Rule out confusion between test environment and pre-existing zkg:
         run: |
-          rm $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1
-          rm -r $ZEEKROOT/etc/zkg
-          rm -r $ZEEKROOT/lib/zeek/python/zeekpkg
-          rm -r $ZEEKROOT/var/lib/zkg
+          rm -f $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1
+          rm -f -r $ZEEKROOT/etc/zkg
+          rm -f -r $ZEEKROOT/lib/zeek/python/zeekpkg
+          rm -f -r $ZEEKROOT/bin/zkg
+          rm -f -r $ZEEKROOT/var/lib/zkg
       - uses: actions/checkout@v4
 
       - name: Install uv

From 7ae364e50d3fd1abdd756f19065284bb13a11e5c Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Thu, 20 Aug 2026 16:33:31 +0200
Subject: [PATCH 3/3] Fix version canonifier to deal with multidigit versions

The previous canonifier expected versions to be single digit, so it
did not work properly with the freshly released zeek-8.0.10.
---
 testing/tests/bundle-unsatisfied-dependency | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/tests/bundle-unsatisfied-dependency b/testing/tests/bundle-unsatisfied-dependency
index efbed3e8..05692c67 100644
--- a/testing/tests/bundle-unsatisfied-dependency
+++ b/testing/tests/bundle-unsatisfied-dependency
@@ -8,7 +8,7 @@
 # @TEST-EXEC: zkg unbundle bundle.tar >> output
 # @TEST-EXEC: zkg list >> output
 # @TEST-EXEC: btest-diff output
-# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g" | sed -r "s/\(.\..\..\)/(X.X.X)/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/\([0-9]+\.[0-9]+\.[0-9]+\)/(X.X.X)/g" | sed -r "s/[0-9]{2}/XX/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
 # @TEST-EXEC: btest-diff package.log
 #