diff --git a/CHANGES b/CHANGES index 11d5f09f13..986b2be8c9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +7.0.4-2 | 2024-12-12 12:44:36 -0700 + + * Bump zeekjs to v0.14.0 (Arne Welzel, Corelight) + 79b0c21 version: 0.14.0 + b75b384 docker: Use Fedora 41 packages + d65cbc8 Minor header cleanup + 4fd7e8b scripts: Remove __preload__.zeek and types.zeek + 93a8113 CreateEnvironment: Unset kOwnsProcessState and kOwnsInspector + 3b1f5d3 Instance::Init(): Replace parameters with Options struct + + (cherry picked from commit aac640ebffdd58b1e25e42eee538b7c8669b1dd4) + + * Fix documentation for `have_spicy` [skip CI] (Benjamin Bannier, Corelight) + + The continued line was incorrectly marked up (as a plain comment instead + of a Zeekygen comment) which caused only half of the docstring to be + rendered by Zeekygen. + + (cherry picked from commit 4a96d34af6fe68bad6afe12dffff6bd795e6b4b1) + 7.0.4 | 2024-11-19 12:31:05 -0700 * Update CHANGES, VERSION, and NEWS for 7.0.4 release (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 4489f5a6df..5174b1adf7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.4 +7.0.4-2 diff --git a/auxil/zeekjs b/auxil/zeekjs index d5bae4c4d2..79b0c2126f 160000 --- a/auxil/zeekjs +++ b/auxil/zeekjs @@ -1 +1 @@ -Subproject commit d5bae4c4d29e3c5e87d54f94d7a9b3f86ae856a8 +Subproject commit 79b0c2126fa0178dbc2e37536588fcd1db9f4443