Pull request #3517: build: generate and tag 3.1.36.0

Merge in SNORT/snort3 from ~STECHEW/snort3:build_3.1.36.0 to master

Squashed commit of the following:

commit 62aaa4fecbcb95dfcaa548907ab43cc0bb48f3df
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Jul 14 13:56:24 2022 -0400

    build: generate and tag 3.1.36.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233cd0fc093260d0e03c507bd760a52d0bd8a721..72b5b18a15a2ffa792d1337a815808d8c0a26af2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 1)
-set (VERSION_PATCH 35)
+set (VERSION_PATCH 36)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index c38e570962f043287b28ba872442263df5e87313..5dbfe11a94087b4f541d7a56f9b84170e876d78e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022/07/14 - 3.1.36.0
+
+appid: fix stats cleanup
+dce_smb: fix stats cleanup
+file_api: fix stats cleanup
+http_inspect: do not abort midstream pickups
+normalizer: make normalizer and tcp_normalizer peg counts shared
+stream: fix stats cleanup
+utils: fix arrow functions parsing
+utils: fix parsing of decimal number literals
+
 2022/07/08 - 3.1.35.0
 
 sandbox: must propagate file_id for includer logic

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index ee15c9d478c5dd1b1cd0d7730c2abf764c9f1ba8..3182b7f3338dcb393b428a6d8599cc7159ce3930 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.1.35.0 2022-07-08 13:59:50 EDT TST
+Revision 3.1.36.0 2022-07-14 13:46:25 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -2900,8 +2900,8 @@ Peg counts:
     reassembled (sum)
   * dce_smb.smb_server_segs_reassembled: total smb server segments
     reassembled (sum)
-  * dce_smb.max_outstanding_requests: total smb maximum outstanding
-    requests (sum)
+  * dce_smb.max_outstanding_requests: maximum outstanding requests
+    (max)
   * dce_smb.files_processed: total smb files processed (sum)
   * dce_smb.v2_setup: total number of SMBv2 setup packets seen (sum)
   * dce_smb.v2_setup_err_resp: total number of SMBv2 setup error
@@ -10987,8 +10987,8 @@ libraries see the Getting Started section of the manual.
   * dce_smb.ignored_bytes: total ignored bytes (sum)
   * dce_smb.max_concurrent_sessions: maximum concurrent sessions
     (max)
-  * dce_smb.max_outstanding_requests: total smb maximum outstanding
-    requests (sum)
+  * dce_smb.max_outstanding_requests: maximum outstanding requests
+    (max)
   * dce_smb.ms_rpc_http_pdus: total connection-oriented MS requests
     to send RPC over HTTP (sum)
   * dce_smb.orphaned: total connection-oriented orphaned (sum)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index f454c7b740cad7772d41e733d9938a48d88ffe5f..0c6146db945bc4cdfdbcfe0ddf44ba819f04e390 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.1.35.0 2022-07-08 14:00:38 EDT TST
+Revision 3.1.36.0 2022-07-14 13:46:11 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index bebf21fa0f18ce622a01485c00e2db7a3364d608..78b03d7561ba43657e7869bcf1d3375c7930ad23 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.1.35.0 2022-07-08 13:59:36 EDT TST
+Revision 3.1.36.0 2022-07-14 13:46:11 EDT TST
 
 ---------------------------------------------------------------------