From: Priyanka Bangalore Gurudev (prbg) <prbg@cisco.com>
Date: Thu, 23 Mar 2023 01:51:45 +0000 (+0000)
Subject: Pull request #3786: build: generate and tag 3.1.58.0
X-Git-Tag: 3.1.58.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc35a68d840cfe71325dd154374ef6494108b88c;p=thirdparty%2Fsnort3.git

Pull request #3786: build: generate and tag 3.1.58.0

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

Squashed commit of the following:

commit b84026ea28ab20d03aaff276ced50b9e9fecbc0a
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Wed Mar 22 11:50:40 2023 -0400

    build: generate and tag 3.1.58.0
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b64be20f0..37805470d 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 57)
+set (VERSION_PATCH 58)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 
diff --git a/ChangeLog.md b/ChangeLog.md
index 4b92ba051..cc16cc25d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,13 @@
+2023-03-22: 3.1.58.0
+
+* actions: restore rtn check in Actions::alert and add to Actions::log
+* appid: give precedence to eve detected client over appid when eve_http_client_mapping config is set
+* detection: fix queue_limit pegcounter evaluation
+* host cache: removed some log to prevent log flooding
+* js_norm: initialize normalization context only when script is detected
+* loggers: fix pcap flushing
+* memory: add shell command to dump heap stats
+
 2023-03-09: 3.1.57.0
 
 * ftp_telnet: updated flushing around subnegotiation parameters
diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index bf20111be..6014aa2e7 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.57.0 2023-03-09 14:10:29 EST TST
+Revision 3.1.58.0 2023-03-22 11:45:40 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -1698,6 +1698,7 @@ Commands:
   * snort.delete_inspector(inspector): delete an inspector from the
     default policy
   * snort.dump_stats(): show summary statistics
+  * snort.dump_heap_stats(): show heap statistics
   * snort.reset_stats(): clear summary statistics
   * snort.rotate_stats(): roll perfmonitor log files
   * snort.reload_config(filename): load new configuration
@@ -1705,6 +1706,8 @@ Commands:
     policy
   * snort.reload_daq(): reload daq module
   * snort.reload_hosts(filename): load a new hosts table
+  * snort.log_command(command, logging): enabled or disable logging
+    of a command
   * snort.pause(): suspend packet processing
   * snort.resume(pkt_num): continue packet processing. If number of
     packets is specified, will resume for n packets and pause
@@ -15547,6 +15550,7 @@ alert is raised by the enhanced JavaScript normalizer.
   * snort.delete_inspector(inspector): delete an inspector from the
     default policy
   * snort.dump_stats(): show summary statistics
+  * snort.dump_heap_stats(): show heap statistics
   * snort.reset_stats(): clear summary statistics
   * snort.rotate_stats(): roll perfmonitor log files
   * snort.reload_config(filename): load new configuration
@@ -15554,6 +15558,8 @@ alert is raised by the enhanced JavaScript normalizer.
     policy
   * snort.reload_daq(): reload daq module
   * snort.reload_hosts(filename): load a new hosts table
+  * snort.log_command(command, logging): enabled or disable logging
+    of a command
   * snort.pause(): suspend packet processing
   * snort.resume(pkt_num): continue packet processing. If number of
     packets is specified, will resume for n packets and pause
diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 8dd9242b9..0fa2613da 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.57.0 2023-03-09 14:11:34 EST TST
+Revision 3.1.58.0 2023-03-22 11:46:44 EDT TST
 
 ---------------------------------------------------------------------
 
diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 2be9fc666..c07cd0e9a 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.57.0 2023-03-09 14:10:50 EST TST
+Revision 3.1.58.0 2023-03-22 11:46:02 EDT TST
 
 ---------------------------------------------------------------------