From f300ddb9fe018fe26209310e13ea2f7e4eb95702 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 19 Nov 2024 12:31:05 -0700
Subject: [PATCH] Update CHANGES, VERSION, and NEWS for 7.0.4 release

---
 CHANGES |  4 ++++
 NEWS    | 12 ++++++++++++
 VERSION |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e4cb5ab849..11d5f09f13 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+7.0.4 | 2024-11-19 12:31:05 -0700
+
+  * Update CHANGES, VERSION, and NEWS for 7.0.4 release (Tim Wojtulewicz, Corelight)
+
 7.0.3-27 | 2024-11-19 11:19:00 -0700
 
   * Bump zeekjs to 0.13.2 (Arne Welzel, Corelight)
diff --git a/NEWS b/NEWS
index ea07332454..d9174642a0 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,18 @@ This release fixes the following bugs:
   ``connection_state_remove()``, allowing other scripts to reuse its value
   early.
 
+- The input framework will no longer get stuck and use 100% of the CPU when
+  encountering lines not immediately terminated by a new line.
+
+- The Modbus analyzer added some additional protocol checks and should no longer
+  over-match on traffic that's not specifically on port 502.
+
+- ZeekJS was updated to version v0.13.2, which brings support for newer versions
+  of Node.js and a fix for a segfault when running under Alpine.
+
+- A minor bug was fixed in the detect-sqli policy script to handle spaces being
+  encoded as plus signs.
+
 Zeek 7.0.3
 ==========
 
diff --git a/VERSION b/VERSION
index c91c73a9ec..4489f5a6df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.3-27
+7.0.4