Pull request #3819: build: generate and tag 3.1.60.0

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

Squashed commit of the following:

commit 67777edd17ca59c103144cc572ab9b5165d3ec65
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu Apr 20 15:40:28 2023 -0400

    build: generate and tag 3.1.60.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bddd80987903a6c5c0b383891413202c0a6b2830..bba681a397a65345749e8cf82ee9a3944f9af6e6 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 59)
+set (VERSION_PATCH 60)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index 95e25e700b7a55a9d9a58071f460aaab5931cbb9..5fe04dfcaa895c40c0ecd7ac428909bcfbc0c355 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,12 @@
+2023-04-20: 3.1.60.0
+
+* appid: fixed TSAN warnings
+* appid: log max rss difference and pattern count during appid initialization and reload detectors
+* appid: make ssl app group id lookup set payload and client
+* appid: making free_servicematch_list thread local
+* src: change a few operator bool functions to named functions
+* src: fix broken unit test/tweak define related to previous operator bool fixes
+
 2023-04-06: 3.1.59.0
 
 * file_api: handling file cache context

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 04964c3e88b8c85293f7e58e0a805ba325108d53..9b11efb5e322e3faf7c566e5c3f2ec2e7ddaf7f3 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.59.0 2023-04-06 17:15:48 EDT TST
+Revision 3.1.60.0 2023-04-20 15:35:36 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index f6288ccc6fc60684adf0ae26056acff8a28fedc1..3ee9fd69a7dd66b72f38f7f4df577ee4c165e137 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.59.0 2023-04-06 17:16:52 EDT TST
+Revision 3.1.60.0 2023-04-20 15:36:43 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index b970489cfc981bfb0cd54fd7e2b49cc124eafd3f..eeb14ebd41ed5b9ec306b997ad5f0843abf8446f 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.59.0 2023-04-06 17:16:09 EDT TST
+Revision 3.1.60.0 2023-04-20 15:35:58 EDT TST
 
 ---------------------------------------------------------------------