Pull request #4434: build: generate and tag 3.3.5.0

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

Squashed commit of the following:

commit 3757dff650b549cfa5dfd001eb027890635d7139
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu Sep 5 09:16:32 2024 -0400

    build: generate and tag 3.3.5.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e4fb400c0ae670f8dcc0a88f97b67b4c31262be..93f55fee1d7e69fbb035cca01d061ff40cf7f01a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 3)
-set (VERSION_PATCH 4)
+set (VERSION_PATCH 5)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index ddc97e5b4e7837a60dc09cd527c439d0b6365256..391b23f2f5804f1e5834803698176c1edeffa460 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,18 @@
+2024-09-05: 3.3.5.0
+
+* appid: added new logs for reload third party
+* extractor: add field name to logging function
+* extractor: add json logger
+* extractor: add unit tests for enum types
+* extractor: fix guard-macro names
+* extractor: fix local variable
+* extractor: mention a field in initialization list
+* extractor: remove unused headers
+* extractor: take a note of FIXIT-P in key points
+* file_api: set file name for file processing
+* http_inspect: when cutting chunks check for MAX_OCTETS too
+* packet_tracer: add tcp window size, options and meta-ack info
+
 2024-08-26: 3.3.4.0
 
 * appid: notify binder on service change

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 4a5fb9470e3f396b68c6bae5ae3096e7007a73f9..cd5020c536dbc3ed00f46e884b73ded6fe2e43bc 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.3.4.0 2024-08-26 22:57:24 EDT TST
+Revision 3.3.5.0 2024-09-05 09:13:34 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -3550,7 +3550,7 @@ Instance Type: global
 Configuration:
 
   * enum extractor.formatting = csv: output format for extractor { 
-    csv }
+    csv | json }
   * enum extractor.output = stdout: output destination for extractor
     { stdout }
   * enum extractor.protocols[].service: service to extract from { 
@@ -9749,7 +9749,7 @@ libraries see the Getting Started section of the manual.
   * bool event_queue.process_all_events = false: process just first
     action group or all action groups
   * enum extractor.formatting = csv: output format for extractor { 
-    csv }
+    csv | json }
   * enum extractor.output = stdout: output destination for extractor
     { stdout }
   * string extractor.protocols[].fields: specify fields to log

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index ec9761038eac976348a02b503f9f12655057b785..636735b3680281bacaa91d71b2a05c0743dbe3e0 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.3.4.0 2024-08-26 22:58:03 EDT TST
+Revision 3.3.5.0 2024-09-05 09:14:09 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 16c93eb60a1ff967813f1e77b1978f84993de063..e747b5a608142aaef0ad6a703ba52a500b1c3d52 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.3.4.0 2024-08-26 22:57:37 EDT TST
+Revision 3.3.5.0 2024-09-05 09:13:45 EDT TST
 
 ---------------------------------------------------------------------