From: Shivani Bhardwaj <shivani@oisf.net>
Date: Wed, 26 Jun 2024 07:10:02 +0000 (+0530)
Subject: release: 6.0.20; update changelog
X-Git-Tag: suricata-6.0.20^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab01c5889819d74912af451263ea85a5789a84a9;p=thirdparty%2Fsuricata.git

release: 6.0.20; update changelog
---

diff --git a/ChangeLog b/ChangeLog
index c0b5199f6c..078167c12d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+6.0.20 -- 2024-06-26
+
+Security #7041: defrag: id reuse can lead to invalid reassembly (6.0.x backport)(CVE 2024-37151)
+Security #7112: http2: oom from duplicate headers (6.0.x backport)
+Bug #7014: rust: build with rust 1.78 with slice::from_raw_parts now requiring the pointer to be non-null (6.0.x backport)
+Bug #7007: rust: fails to build for msrv
+Bug #5578: rules: stateful drop on dsize sig with app proto set
+
 6.0.19 -- 2024-04-23
 
 Security #6978: http2: timeout logging headers (6.0.x backport)(CVE 2024-32663)
diff --git a/configure.ac b/configure.ac
index e2b366db78..8050775258 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-    AC_INIT([suricata],[6.0.20-dev])
+    AC_INIT([suricata],[6.0.20])
     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 fb8ed81bfd..05d0b85499 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.48
+suricata-update https://github.com/OISF/suricata-update 1.2.8