From 7405cd13731a0108fa3dfa34ee1e8caf30566bb9 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 4 Dec 2020 07:57:51 +0100
Subject: [PATCH] release: 4.1.10; update changelog; require htp 0.5.36

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

diff --git a/ChangeLog b/ChangeLog
index fb1790c6b4..86018d2586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+4.1.10 -- 2020-12-04
+
+Bug #4064: Builds fail for rustc 1.24.1 (d3ae9a9e0 2018-02-27)
+Bug #4078: smb: post-GAP file handling
+Bug #4130: icmpv4: header handling issue(s)
+Bug #4134: Segmentation fault on rule reload when using libmagic
+Bug #4167: DNP3 memory leak when parsing objects with bytearrays
+Bug #4181: DNP3 signed integer overflow
+Bug #4188: Rustc nightly warning getting the inner pointer of a temporary `CString`
+Bug #4190: dnp3: SV tests fail on big endian
+Bug #4192: PacketCopyData sets packet length even on failure
+Bug #4196: Alert metadata not present in EVE output when using Socket Control Pcap Processing Mode
+
 4.1.9 -- 2020-10-08
 
 Feature #3796: validate strip_whitespace content before loading a rule
diff --git a/configure.ac b/configure.ac
index b231b79f53..c942da66ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT(suricata, 4.1.9)
+    AC_INIT(suricata, 4.1.10)
     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])
@@ -1529,12 +1529,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