Pull request #3253: build: Generate and tag 3.1.22.0

Merge in SNORT/snort3 from ~MSTEPANE/snort3:build_3.1.22.0 to master

Squashed commit of the following:

commit 8e72732ceead2e94549fe4636bfd3e7361555876
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Mon Jan 31 06:05:52 2022 -0500

    build: Generate and tag 3.1.22.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74b20505a15182c505107de0a88667566e7ed485..9c8607ab04d320c8b8a9e1bd19c76836811bca5c 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 21)
+set (VERSION_PATCH 22)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index 0cf3ec2ea74c90c972606f25f6b138d0ffd6cffe..5f517b94c6a31de95b83a3e5ef7325e2d05cb4d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022/01/31 - 3.1.22.0
+
+appid: give priority to custom process to app mappings over ODP mappings
+appid: rename efp (encrypted fingerprint) to eve (encrypted visibility engine)
+detection: change output format of dump-rule-state
+pub_sub: export assistant_gadget_event.h header file
+stream: set the max number of flows pruned while idle to 400
+
 2022/01/25 - 3.1.21.0
 
 appid: do not delay detection of SMB service for the sake of version detection

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 6e772bee96ad1f825c53e1b2da5f6f4598ca8d28..39d91a86c817f945fa616faf383b9a93a5639f2a 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.21.0 2022-01-25 11:23:50 EST TST
+Revision 3.1.22.0 2022-01-31 06:12:49 EST TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index d3c8d71dc2e350169f2b96b1576ed48c6734ad2b..39d016cda76a3a66730d37129547f442ed03ffe8 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.21.0 2022-01-25 11:23:37 EST TST
+Revision 3.1.22.0 2022-01-31 06:12:35 EST TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 3eec9107aabb7161567773e4726566b34f1cef69..4c5f2d828388b08ef25a6bbb92995310392a0aca 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.21.0 2022-01-25 11:23:37 EST TST
+Revision 3.1.22.0 2022-01-31 06:12:35 EST TST
 
 ---------------------------------------------------------------------