From b7140a48f47a3a0a915648b03057085a99c18504 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 4 Dec 2020 08:00:40 +0100
Subject: [PATCH] release: 5.0.5; update changelog; require htp 0.5.36

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

diff --git a/ChangeLog b/ChangeLog
index 02198b97ec41..4b1bf0e7a474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+5.0.5 -- 2020-12-04
+
+Bug #4077: smb: post-GAP file handling
+Bug #4127: DOS in DNP3 with long loop of zero sized objects
+Bug #4128: Quadratic complexity in FTPGetOldestTx may lead to DOS
+Bug #4129: icmpv4: header handling issue(s)
+Bug #4131: Integer underflow in SSL parser
+Bug #4132: Null dereference in ipv4hdr GetData
+Bug #4133: Segmentation fault on rule reload when using libmagic
+Bug #4164: DNP3 signed integer overflow
+Bug #4166: DNP3 memory leak when parsing objects with bytearrays
+Bug #4168: Napatech: Double release of packet possible in certain error cases.
+Bug #4189: Rustc nightly warning getting the inner pointer of a temporary `CString`
+Bug #4191: dnp3: SV tests fail on big endian
+Bug #4193: PacketCopyData sets packet length even on failure
+Bug #4197: Alert metadata not present in EVE output when using Socket Control Pcap Processing Mode
+
 5.0.4 -- 2020-10-08
 
 Feature #3795: validate strip_whitespace content before loading a rule
diff --git a/configure.ac b/configure.ac
index bf18f6c02d11..012568e98f40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[5.0.4])
+    AC_INIT([suricata],[5.0.5])
     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.35],[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
+        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.36],[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.35, nor the dev 0.5.X"
+                echo "   ERROR! libhtp was found but it is neither >= 0.5.36, nor the dev 0.5.X"
                 echo
                 exit 1
             fi