From 7ac695ba26a95a7c4e3608a7c957ab488e3b1df8 Mon Sep 17 00:00:00 2001
From: Shivani Bhardwaj <shivani@oisf.net>
Date: Thu, 21 Mar 2024 12:02:55 +0530
Subject: [PATCH] release: 6.0.18; update changelog

---
 ChangeLog        | 4 ++++
 configure.ac     | 2 +-
 requirements.txt | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86f245f8dc6f..e35e811e690a 100644
--- 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 fec8faafe5a9..a9260631de07 100644
--- 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 fb8ed81bfdd8..e42c9e07814f 100644
--- 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