release: 6.0.17; update changelog

diff --git a/ChangeLog b/ChangeLog
index 83282e3da18b861368cc4d352cb82e3ef12b2125..86f245f8dc6fff5673fc4ab825795b620578fa04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+6.0.17 -- 2024-03-19
+
+Security #6867: eve: excessive ssh long banner logging (6.0.x backport)(CVE 2024-28870)
+Security #6800: ssh: quadratic complexity in overlong banner (6.0.x backport)(CVE 2024-28870)
+Security #6758: libhtp: quadratic complexity checking after request line mission protocol (6.0.x backport)(CVE 2024-28871)
+Bug #6783: util/mime: Memory leak at util-decode-mime.c:MimeDecInitParser (6.0.x backport)
+Bug #6767: multi-tenancy: dead lock during tenant loading (6.0.x backport)
+Bug #6530: drop: assertion failed !(PKT_IS_PSEUDOPKT(p)) && !PacketCheckAction(p, ACTION_DROP) (6.0.x backport)
+Task #6869: libhtp 0.5.47 (6.0.x backport)
+
 6.0.16 -- 2024-02-08
 
 Security #6751: http2: evasion by splitting header fields over frames (6.0.x backport)

diff --git a/configure.ac b/configure.ac
index e40529dd63534a30d56e22bf4bce9d42298602e4..62112fbeb9ff25abfef5425ed5140befa66d3a8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[6.0.17-dev])
+    AC_INIT([suricata],[6.0.17])
     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])
@@ -1671,12 +1671,12 @@
             echo
             exit 1
         fi
-        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.46],[libhtp_minver_found="yes"],[libhtp_minver_found="no"])
+        PKG_CHECK_MODULES(LIBHTPMINVERSION, [htp >= 0.5.47],[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.46, nor the dev 0.5.X"
+                echo "   ERROR! libhtp was found but it is neither >= 0.5.47, nor the dev 0.5.X"
                 echo
                 exit 1
             fi

diff --git a/requirements.txt b/requirements.txt
index fb8ed81bfdd81cc3c88705a320acd3cf8f9324fa..e42c9e07814fbda0081ba9830e65557b227a0209 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
-suricata-update https://github.com/OISF/suricata-update master-1.2.x
+libhtp https://github.com/OISF/libhtp 0.5.47
+suricata-update https://github.com/OISF/suricata-update 1.2.8