Pull request #4559: build: generate and tag 3.6.1.0

Merge in SNORT/snort3 from ~PRBG/snort3:build_3.6.1.0 to master

Squashed commit of the following:

commit 56bf8a27d2efecab8c123e0a775bc6f2b1348f51
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Sun Dec 22 20:12:57 2024 -0500

    build: generate and tag 3.6.1.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1d6371dfde2a925cd7040a272a568013cf9e4f9..8963e97c1e51b2a3a5a0ad76f02417b144dc1e1c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 6)
-set (VERSION_PATCH 0)
+set (VERSION_PATCH 1)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index 7e79e5082b9998de289f169d9aef6948eab8a1a8..27cd7b735fbd15d596ba37d6afd807aaf2d77543 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,16 @@
+2024-12-22: 3.6.1.0
+
+* appid: enhanced control error message with additional info
+* build: include/exclude snort_ml module conditionally
+* dns: adding fallback functionality
+* file_api: add re_eval flag to fileinfo
+* inspector_manager: refactored instrumentation code of connection profiling
+* log: print all warnings before command line is parsed
+* main: improve logging reload_config arguments
+* pop: adding wrong bytes threshold to determine if pop splitter should fallback
+* smtp: smtp inspector fallback functionality for invalid commands and responses
+* stream_tcp: refactor tcp reasseabler class structure and init to avoid thread data race scenarios
+
 2024-12-03: 3.6.0.0
 
 * analyzer: add logging for resource tuning progress

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index fb200ad4268ac05874f0d9d7ad7cbd46c9f58b38..0322cf12225df93dbead0e1723f8e3dd5a420ba2 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.0.0 2024-12-03 21:38:11 EST TST
+Revision 3.6.1.0 2024-12-22 20:09:48 EST TST
 
 ---------------------------------------------------------------------
 
@@ -3514,6 +3514,7 @@ Peg counts:
   * dns.concurrent_sessions: total concurrent dns sessions (now)
   * dns.max_concurrent_sessions: maximum concurrent dns sessions
     (max)
+  * dns.aborted_sessions: total dns sessions aborted (sum)
 
 
 5.16. domain_filter
@@ -12004,6 +12005,7 @@ libraries see the Getting Started section of the manual.
   * dnp3.tcp_pdus: total tcp pdus (sum)
   * dnp3.total_packets: total packets (sum)
   * dnp3.udp_packets: total udp packets (sum)
+  * dns.aborted_sessions: total dns sessions aborted (sum)
   * dns.concurrent_sessions: total concurrent dns sessions (now)
   * dns.max_concurrent_sessions: maximum concurrent dns sessions
     (max)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 49c2cafb8eedd359e30355d1f555c88be9f71a80..3440a3cbe9729802abceef1df507eb9cad687124 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.0.0 2024-12-03 21:38:50 EST TST
+Revision 3.6.1.0 2024-12-22 20:10:28 EST TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index fe09b97843fd8812716055194519bcea3ae2c430..4c985ed68d366f39e334c9078fe5dd770f2eff1c 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.0.0 2024-12-03 21:38:24 EST TST
+Revision 3.6.1.0 2024-12-22 20:10:01 EST TST
 
 ---------------------------------------------------------------------