From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 12 Aug 2021 18:48:23 +0000 (+0100)
Subject: Merge version 1:6.0.1-2+rpi1 and 1:6.0.1-3 to produce 1:6.0.1-3+rpi1
X-Git-Tag: archive/raspbian/1%6.0.1-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f9715d7136cb4b65543c0c4658e2c0b140d17f27;p=suricata.git

Merge version 1:6.0.1-2+rpi1 and 1:6.0.1-3 to produce 1:6.0.1-3+rpi1
---

f9715d7136cb4b65543c0c4658e2c0b140d17f27
diff --cc debian/changelog
index ba4258a7,6c05a472..8e0803eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,16 @@@
- suricata (1:6.0.1-2+rpi1) bullseye-staging; urgency=medium
++suricata (1:6.0.1-3+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1:6.0.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:21:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 08 May 2021 12:21:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Aug 2021 18:48:23 +0000
++
+ suricata (1:6.0.1-3) unstable; urgency=medium
+ 
+   * Address CVE-2021-35063 by backporting upstream fix.
+     Closes: #990835
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Mon, 19 Jul 2021 13:26:22 +0200
  
  suricata (1:6.0.1-2) unstable; urgency=medium