From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 28 Sep 2020 09:10:17 +0000 (+0100)
Subject: Merge version 4.3.0-5+rpi1 and 4.3.1-1 to produce 4.3.1-1+rpi1
X-Git-Tag: archive/raspbian/4.3.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08c6bd979bb64873777879895a2dd5da6cdcb8a9;p=pdns.git

Merge version 4.3.0-5+rpi1 and 4.3.1-1 to produce 4.3.1-1+rpi1
---

08c6bd979bb64873777879895a2dd5da6cdcb8a9
diff --cc debian/changelog
index fa2a5be,91e5eb2..ce0b0de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- pdns (4.3.0-5+rpi1) bullseye-staging; urgency=medium
++pdns (4.3.1-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 31 Dec 2017 14:27:56 +0000]
 +  * Add -latomic to ldflags.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 08 Sep 2020 16:07:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 09:10:17 +0000
++
+ pdns (4.3.1-1) unstable; urgency=medium
+ 
+   * New upstream version 4.3.1
+     Fixes CVE-2020-17482 (Closes: #970737)
+   * Remove upstream-applied patch for MySQL stored procedures.
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Tue, 22 Sep 2020 20:25:52 +0000
  
  pdns (4.3.0-5) unstable; urgency=medium