From b76096a9eef6aa039e30b8dbef8df1f4870e2408 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 26 Jul 2024 10:09:48 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/bbannier/bump-spicy'

* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot

(cherry picked from commit 4c0c7581c835b4dcd5339a4b34c2b82fcfc40dc3)
---
 CHANGES     | 8 ++++++++
 VERSION     | 2 +-
 auxil/spicy | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index bbc39852e1..4f14dba6d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+7.0.0-rc4 | 2024-07-26 10:12:34 -0700
+
+  * Bump auxil/spicy to latest development snapshot (Benjamin Bannier, Corelight)
+    
+    This in particular pulls in a fix for zeek/spicy#1808.
+
+    (cherry picked from commit 4c0c7581c835b4dcd5339a4b34c2b82fcfc40dc3)
+
 7.0.0-rc3 | 2024-07-25 10:52:29 -0700
 
   * Generate docs for 7.0.0-rc3 (Tim Wojtulewicz)
diff --git a/VERSION b/VERSION
index 0761c39a86..12751eb9a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.0-rc3
+7.0.0-rc4
diff --git a/auxil/spicy b/auxil/spicy
index 04c5ed3c27..4c5c26bf34 160000
--- a/auxil/spicy
+++ b/auxil/spicy
@@ -1 +1 @@
-Subproject commit 04c5ed3c27879459de69d12efc417c6915f304b9
+Subproject commit 4c5c26bf34c2cf2cedf56270e84f1271fcf94465