From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 18 Nov 2018 14:45:02 +0000 (+0000)
Subject: Merge version 4.1.4-1+rpi1 and 4.1.5-1 to produce 4.1.5-1+rpi1
X-Git-Tag: archive/raspbian/4.1.5-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=581111305ae750d472071790a7dcddd2d1ed5bc5;p=pdns.git

Merge version 4.1.4-1+rpi1 and 4.1.5-1 to produce 4.1.5-1+rpi1
---

581111305ae750d472071790a7dcddd2d1ed5bc5
diff --cc debian/changelog
index 35a45a3,5d6a28e..c6f269d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- pdns (4.1.4-1+rpi1) buster-staging; urgency=medium
++pdns (4.1.5-1+rpi1) buster-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, 04 Sep 2018 09:05:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Nov 2018 14:45:01 +0000
++
+ pdns (4.1.5-1) unstable; urgency=medium
+ 
+   * Cleanup insserv.d and resolvconf hooks that we used to install
+   * New upstream version 4.1.5 including fixes for CVE-2018-10851,
+     CVE-2018-14626 (Closes: #913163).
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Fri, 09 Nov 2018 18:42:11 +0000
  
  pdns (4.1.4-1) unstable; urgency=medium