Pull request #4606: build: generate and tag 3.7.0.0

Merge in SNORT/snort3 from ~PRBG/snort3:build__3.7.0.0 to master

Squashed commit of the following:

commit f664321fe8b841c7e0597a88efec8083dc4a11c9
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Tue Feb 4 17:28:46 2025 -0500

    build: generate and tag 3.7.0.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcaab5524b400e6e1162c51107adef3929441877..6123cabba1fa9cfc3f34cfbe7b2d26dc28a68d66 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 3.4.3)
 project (snort CXX C)
 
 set (VERSION_MAJOR 3)
-set (VERSION_MINOR 6)
-set (VERSION_PATCH 3)
+set (VERSION_MINOR 7)
+set (VERSION_PATCH 0)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index e6f054bae5e7a182e20218ca1444b6c07853cc55..73f14459f0f05b05dd262298c838408d5f7c06c5 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,12 @@
+2025-02-04: 3.7.0.0
+
+* extractor: add default filter
+* extractor: add logging constraints
+* framework: add interface to warn about reaching limit of ips opt re-usage
+* framework: bump base API version
+* framework: bump ips option version
+* ips_options: warn about excessive detection options
+
 2025-02-03: 3.6.3.0
 
 * appid: added check for brute force manager presence

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index a75befc6860338ac4091666dbdf42a1179d37a6a..99aa9b574250a8eca4903fa11ba0ad39c241443c 100644 (file)
--- a/doc/reference/snort_reference.text
+++ b/doc/reference/snort_reference.text
@@ -8,7 +8,7 @@ Snort 3 Reference Manual
 The Snort Team
 
 Revision History
-Revision 3.6.3.0 2025-02-04 00:09:48 EST TST
+Revision 3.7.0.0 2025-02-04 17:21:58 EST TST
 
 ---------------------------------------------------------------------
 
@@ -3591,6 +3591,8 @@ Configuration:
   * enum extractor.formatting = csv: output format for extractor { 
     csv | json }
   * string extractor.connector: output destination for extractor
+  * enum extractor.default_filter = pick: default action for protocol
+    with no filter provided { pick | skip }
   * enum extractor.protocols[].service: service to extract from { 
     http | ftp | conn }
   * int extractor.protocols[].tenant_id = 0: tenant_id of target
@@ -9866,6 +9868,8 @@ libraries see the Getting Started section of the manual.
   * bool event_queue.process_all_events = false: process just first
     action group or all action groups
   * string extractor.connector: output destination for extractor
+  * enum extractor.default_filter = pick: default action for protocol
+    with no filter provided { pick | skip }
   * enum extractor.formatting = csv: output format for extractor { 
     csv | json }
   * string extractor.protocols[].fields: specify fields to log

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index abe1dbe41c023abf5b2ed3b49b3f466c836acdb4..231e62d981f8ca97bf7e6935e04432990b48df68 100644 (file)
--- a/doc/upgrade/snort_upgrade.text
+++ b/doc/upgrade/snort_upgrade.text
@@ -8,7 +8,7 @@ Snort 3 Upgrade Manual
 The Snort Team
 
 Revision History
-Revision 3.6.3.0 2025-02-04 00:10:40 EST TST
+Revision 3.7.0.0 2025-02-04 17:22:43 EST TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 3a8a777b5960ae53dc94cb950493f5a2ebab805a..e78cd36a21aa360d9466750412b15d343116ab44 100644 (file)
--- a/doc/user/snort_user.text
+++ b/doc/user/snort_user.text
@@ -8,7 +8,7 @@ Snort 3 User Manual
 The Snort Team
 
 Revision History
-Revision 3.6.3.0 2025-02-04 00:10:05 EST TST
+Revision 3.7.0.0 2025-02-04 17:22:15 EST TST
 
 ---------------------------------------------------------------------