release: 6.0.12; update changelog

diff --git a/ChangeLog b/ChangeLog
index 0d583361d300316de27d61c9ab6d90ab2e75854f..21107c6fb68a8e08b2b353849b5b1d9947acca29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+6.0.12 -- 2023-05-08
+
+Bug #6040: tcp: failed assertion ASSERT: !(ssn->state != TCP_SYN_SENT) (6.0.x backport)
+Bug #6039: TCP resets have incorrect len, nh in IPv6 (6.0.x backport)
+Bug #6034: time: integer comparison with different signs (6.0.x backport)
+Bug #6031: af-packet: reload not occurring until packets are seen (6.0.x backport)
+Bug #6020: smtp: fuzz debug assertion trigger (6.0.x backport)
+Bug #6018: scan-build warning for mime decoder (6.0.x backport)
+Bug #6017: scan-build warnings for ac implementations (6.0.x backport)
+Bug #6016: scan-build warnings in radix implementation (6.0.x backport)
+Bug #6015: scan-build warning for detect sigordering (6.0.x backport)
+Bug #6014: scan-build warnings for detect address handling (6.0.x backport)
+Bug #6013: scan-build warning for detect port handling (6.0.x backport)
+Bug #6007: Unexpected behavior of `endswith` in combination with negated content matches (6.0.x backport)
+Bug #5999: exception/policy: make work with simulated flow memcap (6.0.x backport)
+Bug #5997: perf shows excessive time in IPOnlyMatchPacket (6.0.x backport)
+Bug #5980: rust: warning for future compile errors
+Bug #5961: smb: wrong endian conversion when parse NTLM Negotiate Flags (6.0.x backport)
+Bug #5958: bpf: postpone IPS check after IPS runmode is determined from the configuration file (6.0.x backport)
+Bug #5934: app-layer-htp: Condition depending on enabled IPS mode never true (6.0.x backport)
+Optimization #6033: detect using uninitialized engine mode (6.0.x backport)
+Feature #5996: Add support for 'inner' PF_RING clustering modes (6.0.x backport)
+Task #6052: github-ci: add windows + windivert build (6.0.x backport)
+
 6.0.11 -- 2023-04-13
 
 Security #5947: byte_math: Division by zero possible. (6.0.x backport)

diff --git a/configure.ac b/configure.ac
index a4b8eefe30e6609d7832bdb73aaea373b92b816d..6be7d47382f00cd75869d4b9823217ad144da130 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[6.0.12-dev])
+    AC_INIT([suricata],[6.0.12])
     m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes])
     AC_CONFIG_HEADERS([src/autoconf.h])
     AC_CONFIG_SRCDIR([src/suricata.c])

diff --git a/requirements.txt b/requirements.txt
index 42768a08d54a63c0e5246e7b8456ea366f83430c..0b20561ea76346c93710cfe73ae8c713c2546232 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,5 @@
 # Format:
 #
 #   name {repo} {branch|tag}
-libhtp https://github.com/OISF/libhtp 0.5.x
+libhtp https://github.com/OISF/libhtp 0.5.43
 suricata-update https://github.com/OISF/suricata-update 1.2.7