Pull request #3507: build: generate and tag 3.1.35.0

Merge in SNORT/snort3 from ~RUCOMBS/snort3:build_3.1.35.0 to master

Squashed commit of the following:

commit 5274ec47130aff36ec8edea62cb0a6c0c6ebb2b3
Author: russ <rucombs@cisco.com>
Date:   Fri Jul 8 14:08:49 2022 -0400

    build: generate and tag 3.1.35.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38c19866be4c06bcccd2a34cbb51e5dfb5ccd041..233cd0fc093260d0e03c507bd760a52d0bd8a721 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 34)
+set (VERSION_PATCH 35)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index 01e80a74827317de2894ff838f120676e9f719b4..c38e570962f043287b28ba872442263df5e87313 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022/07/08 - 3.1.35.0
+
+sandbox: must propagate file_id for includer logic
+
 2022/07/07 - 3.1.34.0
 
 build: remove unnecessary type casts

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index e04dde5b407ce43bbb94a727cdd4e97be24252e2..ee15c9d478c5dd1b1cd0d7730c2abf764c9f1ba8 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.34.0 2022-07-07 11:57:12 EDT TST
+Revision 3.1.35.0 2022-07-08 13:59:50 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index f2ff9da99c9e81631a06299e837ec148e014c0b4..f454c7b740cad7772d41e733d9938a48d88ffe5f 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.34.0 2022-07-07 11:58:00 EDT TST
+Revision 3.1.35.0 2022-07-08 14:00:38 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 9460962e9934e7743c973479d12c6af55227200e..bebf21fa0f18ce622a01485c00e2db7a3364d608 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.34.0 2022-07-07 11:56:57 EDT TST
+Revision 3.1.35.0 2022-07-08 13:59:36 EDT TST
 
 ---------------------------------------------------------------------