From 3b0bed2e38e60505ebdf44021037eba5db69b675 Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Fri, 17 Jun 2022 08:46:55 +0200 Subject: [PATCH] Bump Spicy and spicy-plugin to latest dev snapshot. This bump brings in fixes for the following issues: - zeek/spicy#1204 - zeek/spicy#1208 - zeek/spicy#1210 - zeek/spicy-plugin#112 - zeek/spicy-plugin#117 (cherry picked from commit d15ba0889088fc889a6bc841ddf71c32e94d93e1) --- CHANGES | 18 ++++++++++++++++++ VERSION | 2 +- auxil/spicy-plugin | 2 +- auxil/spicy/spicy | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ce05157d8c..5706aa103f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +5.0.0-rc1.7 | 2022-06-17 09:15:37 -0700 + + * Bump Spicy and spicy-plugin to latest dev snapshot. (Benjamin Bannier, Corelight) + + This bump brings in fixes for the following issues: + + - zeek/spicy#1204 + - zeek/spicy#1208 + - zeek/spicy#1210 + - zeek/spicy-plugin#112 + - zeek/spicy-plugin#117 + + (cherry picked from commit d15ba0889088fc889a6bc841ddf71c32e94d93e1) + + * Bump Spicy to the latest development version. (Benjamin Bannier, Corelight) + + (cherry picked from commit d796b3dd576877d48f5e225ce4248dead9fafde0) + 5.0.0-rc1.5 | 2022-06-15 12:39:13 -0700 * CI: Add Ubuntu 22.04 (LTS Release, EOL 04/2027) (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index e7a60d4769..47a8708d26 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.0-rc1.5 +5.0.0-rc1.7 diff --git a/auxil/spicy-plugin b/auxil/spicy-plugin index 454abb71af..8cd9a0b9f3 160000 --- a/auxil/spicy-plugin +++ b/auxil/spicy-plugin @@ -1 +1 @@ -Subproject commit 454abb71afb3ea23111d3fafabaa9a1ae37afcaf +Subproject commit 8cd9a0b9f38f130422f821966a3e865e59e8c036 diff --git a/auxil/spicy/spicy b/auxil/spicy/spicy index 6dd253e4cc..ca72a01484 160000 --- a/auxil/spicy/spicy +++ b/auxil/spicy/spicy @@ -1 +1 @@ -Subproject commit 6dd253e4cc1a5165dffa271f27c1c1b7acd5ae0a +Subproject commit ca72a01484a7c49f2de55fb8b8af631fdc0d6d42