From 34ef830b9cb4da5018bcae2af73ea07eb0b1be53 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 22 Oct 2024 11:24:50 +0200
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/awelzel/3978-zeekjs-0.12.1-bump'

* origin/topic/awelzel/3978-zeekjs-0.12.1-bump:
  Bump zeekjs to 0.12.1

(cherry picked from commit d74b073852b748aca7793f557f0a5378cb30ca19)
---
 CHANGES      | 9 +++++++++
 VERSION      | 2 +-
 auxil/zeekjs | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5c5e754ad1..59d61d1bcd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+7.0.3-12 | 2024-11-14 11:33:09 -0700
+
+  * GH-3978: Bump zeekjs to 0.12.1 (Arne Welzel, Corelight)
+        7ec0953 ci: Bump actions/upload-artifact
+        8e5914d ci/docker: Bump distros, update some OBS repos
+        129b737 Fix crash during shutdown
+
+    (cherry picked from commit d74b073852b748aca7793f557f0a5378cb30ca19)
+
 7.0.3-11 | 2024-11-14 11:31:35 -0700
 
   * GH-3962: Prevent non-Modbus on port 502 to be reported as Modbus (Emmanuele Zambon)
diff --git a/VERSION b/VERSION
index 0550c7cb26..bee16bfcd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.3-11
+7.0.3-12
diff --git a/auxil/zeekjs b/auxil/zeekjs
index 230f53c159..acae06c60c 160000
--- a/auxil/zeekjs
+++ b/auxil/zeekjs
@@ -1 +1 @@
-Subproject commit 230f53c1596ee88289e96397f0810ca60ed897e3
+Subproject commit acae06c60c4631892c5b497557c5e12283e4218f