release: 6.0.18; update changelog

diff --git a/ChangeLog b/ChangeLog
index 86f245f8dc6fff5673fc4ab825795b620578fa04..e35e811e690a313a759531dcedeacd7cfac34c7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6.0.18 -- 2024-03-21
+
+Bug #6876: rust: MSRV unintentionally bumped
+
 6.0.17 -- 2024-03-19
 
 Security #6867: eve: excessive ssh long banner logging (6.0.x backport)(CVE 2024-28870)

diff --git a/configure.ac b/configure.ac
index fec8faafe5a9e1b3c60fa27508f0f0e8724da7c8..a9260631de07e557a6394ec5ee9087f05fe9a78f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[6.0.18-dev])
+    AC_INIT([suricata],[6.0.18])
     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 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