release: 6.0.18; update changelog

inashivb · inashivb · commit 7ac695ba26a9 · 2024-03-21T12:02:55.000+05:30
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- AC_INIT([suricata],[6.0.18-dev])`
	`1`	`+ AC_INIT([suricata],[6.0.18])`
`2`	`2`	`m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes])`
`3`	`3`	`AC_CONFIG_HEADERS([src/autoconf.h])`
`4`	`4`	`AC_CONFIG_SRCDIR([src/suricata.c])`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# Format:`
`4`	`4`	`#`
`5`	`5`	`# name {repo} {branch\|tag}`
`6`		`-libhtp https://github.com/OISF/libhtp 0.5.x`
`7`		`-suricata-update https://github.com/OISF/suricata-update master-1.2.x`
	`6`	`+libhtp https://github.com/OISF/libhtp 0.5.47`
	`7`	`+suricata-update https://github.com/OISF/suricata-update 1.2.8`