Pull request #4326: build: generate and tag 3.2.1.0

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

Squashed commit of the following:

commit 2ac0a91f635d06bfbc6f29e50a4a7fed1ec63feb
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu May 16 22:54:07 2024 -0400

    build: generate and tag 3.2.1.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63d3ca0c01a9f8228cf2002acb4b043cddf0589d..0197a9481b17726779b75f8c8f69c3c64ff861dd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 2)
-set (VERSION_PATCH 0)
+set (VERSION_PATCH 1)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index 2ee585df6fce47253f0184eb40ede073fd00c8e7..16b482d4099afcee5985316f9589022b3c186a2b 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+2024-05-16: 3.2.1.0
+
+* framework: supply directories to system headers to plug_gen.sh
+* main: updates for types used by Alpine.
+* memory: fix unit test
+
 2024-05-08: 3.2.0.0
 
 * actions: add action counters and aggregate them under ips_actions

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index d2d5402da410f7730c141b30ec08affeef45791d..1f5cfd64eebaf45c9bf8a590ecf035b4b9e29205 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.2.0.0 2024-05-08 20:53:04 EDT TST
+Revision 3.2.1.0 2024-05-16 22:50:33 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 5813e7526ba2a1534f5ea2f4688a0aace6fa01e7..b2775dfcef042b88ef9be007dc2eae6e65b4e8a2 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.2.0.0 2024-05-08 20:54:14 EDT TST
+Revision 3.2.1.0 2024-05-16 22:51:40 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 10c419c6be541aca8b5e83451ac9fd2fbde61c83..72f751f9fb1db25469362f38bf0a50c410aef7ad 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.2.0.0 2024-05-08 20:53:28 EDT TST
+Revision 3.2.1.0 2024-05-16 22:50:55 EDT TST
 
 ---------------------------------------------------------------------