From: Russ Combs (rucombs) Date: Fri, 8 Jul 2022 18:17:15 +0000 (+0000) Subject: Pull request #3507: build: generate and tag 3.1.35.0 X-Git-Tag: 3.1.35.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dc4cff37ccfee30b75e385eb5b36cdcd384b976;p=thirdparty%2Fsnort3.git 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 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 38c19866b..233cd0fc0 100644 --- 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 01e80a748..c38e57096 100644 --- 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 e04dde5b4..ee15c9d47 100644 --- 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 f2ff9da99..f454c7b74 100644 --- 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 9460962e9..bebf21fa0 100644 --- 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 ---------------------------------------------------------------------