From b46125a64bcd6d3ad96d24b91a20e00531222bf3 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Mon, 1 Mar 2021 14:30:41 +0100
Subject: [PATCH] release: 5.0.6; update changelog; require htp 0.5.37

---
 ChangeLog    | 23 +++++++++++++++++++++++
 configure.ac |  6 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b1bf0e7a474..1b88ca8b321f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+5.0.6 -- 2021-03-02
+
+Bug #4230: tcp/async: incorrect flagging of ACK values as invalid
+Bug #4256: tcp/fastopen: false positive on "invalid option"
+Bug #4287: Mismatch between capture and outputs in rules leads to seg fault
+Bug #4289: datasets: reference counter issue in string lookup
+Bug #4291: Suricata crashes at exit in NFQ mode
+Bug #4293: ftp-data: support for file.name keyword is incomplete
+Bug #4295: detect: NOOPT flag not enforced correctly
+Bug #4297: ssl : Integer underflow in ssl parsing SSLV3_HANDSHAKE_PROTOCOL
+Bug #4299: modbus: Request flood leads to CPU exhaustion
+Bug #4301: 5.0.5 in socket mode crashes when using file-store due to uninitialized stats_ctx
+Bug #4303: Not all manpages are built by docs Makefile
+Bug #4305: dns: output flags not set correctly on 32 bit systems
+Bug #4307: eve: Memory leak from jsonbuilder in @MetadataJson@
+Bug #4309: Wrong stream side after direction change
+Bug #4322: Heap use after free in parsing signatures with ip_proto and prefilter
+Bug #4328: Suricata is not fully reading or loading the iprep files
+Bug #4337: Stack-buffer-overflow READ 4 in SetupU8Hash
+Bug #4341: Assertion failed in AdjustToAcked delta > 10000000ULL && delta > stream->window
+Feature #4339: Makes libhtp decompression time limit configurable from Suricata
+Optimization #4367: decoder: limit number of decoding layers
+
 5.0.5 -- 2020-12-04
 
 Bug #4077: smb: post-GAP file handling
diff --git a/configure.ac b/configure.ac
index dbbfc86397e7..b777a44ebf90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[5.0.6-dev])
+    AC_INIT([suricata],[5.0.6])
     m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes])
     AC_CONFIG_HEADERS([config.h])
     AC_CONFIG_SRCDIR([src/suricata.c])
@@ -1596,12 +1596,12 @@
             echo
             exit 1
         fi
-        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.36],[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
+        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.37],[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
         if test "$libhtp_minver_found" = "no"; then
             PKG_CHECK_MODULES(LIBHTPDEVVERSION, [htp = 0.5.X],[libhtp_devver_found="yes"],[libhtp_devver_found="no"])
             if test "$libhtp_devver_found" = "no"; then
                 echo
-                echo "   ERROR! libhtp was found but it is neither >= 0.5.36, nor the dev 0.5.X"
+                echo "   ERROR! libhtp was found but it is neither >= 0.5.37, nor the dev 0.5.X"
                 echo
                 exit 1
             fi