From 32fb85e3f8abe18a81e3d97f5409ee45f4850ffa Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 16 May 2024 10:23:37 -0700
Subject: [PATCH] Update CHANGES, VERSION, and NEWS for the v6.0.4 release

---
 CHANGES |  6 ++++++
 NEWS    | 26 ++++++++++++++++++++++++++
 VERSION |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index ecf5f0bf45..a079949d97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+6.0.4 | 2024-05-16 10:23:37 -0700
+
+  * Update CHANGES, VERSION, and NEWS for the v6.0.4 release (Tim Wojtulewicz, Corelight)
+
+  * Update baseline for plugins.hooks btest (Tim Wojtulewicz)
+
 6.0.3-18 | 2024-05-14 16:28:29 -0700
 
   * Update broker submodule [nomail] (Tim Wojtulewicz, Corelight)
diff --git a/NEWS b/NEWS
index 5a6b37e038..0804f9d00f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,32 @@ This document summarizes the most important changes in the current Zeek
 release. For an exhaustive list of changes, see the ``CHANGES`` file
 (note that submodules, such as Broker, come with their own ``CHANGES``.)
 
+Zeek 6.0.4
+==========
+
+This release fixes the following bugs:
+
+- The Mozilla CA and Google CT lists was updated to their latest versions.
+
+- A crash with ICMP packets involving errant length checking was fixed. Thank
+  you to Ronny Barkan from Microsoft for reporting this issue.
+
+- When a shadow file is empty/missing during rotation, Zeek aborts with an error
+  message, but if the shadow file was empty, it will still be there after the
+  restart. This results in an endless restart loop. This has been corrected to
+  overwrite the existing shadow file, using the default file extension and
+  post processing function.
+
+- A new function ``remove_exclude`` was added to the ``PacketFilter`` framework
+  which can be used to remove a previously added exclude filter by name.
+
+- A new option ``--localversion`` was added to the ``configure`` script. This
+  option allows a caller to add custom strings to the end of the Zeek version
+  reported by ``zeek -v``.
+
+- The highwayhash submodule was updated to fix a build issue for FreeBSD. Thank
+  you to community member Craig Leres for reporting this.
+
 Zeek 6.0.3
 ==========
 
diff --git a/VERSION b/VERSION
index cf5aef904a..1aa5e414fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.3-18
+6.0.4