From 2e92c5f2fab0f46fcef5ef2d31bfb23341bd046f Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 22 Nov 2017 12:17:45 +0100
Subject: [PATCH] Update auth 4.0.5 and rec 4.0.7 changelogs with recent
 backports

---
 docs/changelog/4.0.rst                   | 2 ++
 pdns/recursordist/docs/changelog/4.0.rst | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/changelog/4.0.rst b/docs/changelog/4.0.rst
index b1316def91..d086485912 100644
--- a/docs/changelog/4.0.rst
+++ b/docs/changelog/4.0.rst
@@ -20,10 +20,12 @@ Bug fixes
 - `#5599 <https://github.com/PowerDNS/pdns/pull/5599>`__: Fix libatomic detection on ppc64
 - `#5641 <https://github.com/PowerDNS/pdns/pull/5641>`__: Catch DNSName exception in the Zoneparser
 - `#5722 <https://github.com/PowerDNS/pdns/pull/5722>`__: Publish inactive KSK/CSK as CDNSKEY/CDS
+- `#5730 <https://github.com/PowerDNS/pdns/pull/5730>`__: Handle AFSDB record separately due to record structure. Fixes #4703 (Johan Jatko)
 - `#5678 <https://github.com/PowerDNS/pdns/pull/5678>`__: Treat requestor's payload size lower than 512 as equal to 512
 - `#5766 <https://github.com/PowerDNS/pdns/pull/5766>`__: Correctly purge entries from the caches after a transfer
 - `#5777 <https://github.com/PowerDNS/pdns/pull/5777>`__: Handle a signing pipe worker dying with work still pending
 - `#5815 <https://github.com/PowerDNS/pdns/pull/5815>`__: Ignore SOA-EDIT for PRESIGNED zones. Fixes #5814
+- `#5933 <https://github.com/PowerDNS/pdns/pull/5933>`__: Check return value for all getTSIGKey calls. Fixes #5931
 
 Improvements
 ~~~~~~~~~~~~
diff --git a/pdns/recursordist/docs/changelog/4.0.rst b/pdns/recursordist/docs/changelog/4.0.rst
index 1e363f8a83..d7694095b3 100644
--- a/pdns/recursordist/docs/changelog/4.0.rst
+++ b/pdns/recursordist/docs/changelog/4.0.rst
@@ -17,6 +17,7 @@ Bug fixes
 - `#5525 <https://github.com/PowerDNS/pdns/pull/5525>`__: Fix validation at the exact RRSIG inception or expiration time
 - `#5740 <https://github.com/PowerDNS/pdns/pull/5740>`__: Lowercase all outgoing qnames when lowercase-outgoing is set
 - `#5599 <https://github.com/PowerDNS/pdns/pull/5599>`__: Fix libatomic detection on ppc64
+- `#5961 <https://github.com/PowerDNS/pdns/pull/5961>`__: Edit configname definition to include the 'config-name' argument (Jake Reynolds)
 
 Improvements
 ^^^^^^^^^^^^
@@ -27,6 +28,7 @@ Improvements
 - `#5261 <https://github.com/PowerDNS/pdns/pull/5261>`__: get-remote-ring's "other" report should only have two items. (Patrick Cloke)
 - `#5320 <https://github.com/PowerDNS/pdns/pull/5320>`__: PowerDNS sdig does not truncate trailing bits of EDNS Client Subnet mask
 - `#5488 <https://github.com/PowerDNS/pdns/pull/5488>`__: Only increase `no-packet-error` on the first read
+- `#5498 <https://github.com/PowerDNS/pdns/pull/5498>`__: Add support for Botan 2.x
 - `#5511 <https://github.com/PowerDNS/pdns/pull/5511>`__: Add more information to recursor cache dumps
 - `#5523 <https://github.com/PowerDNS/pdns/pull/5523>`__: Fix typo in two log messages (Ruben Kerkhof)
 - `#5598 <https://github.com/PowerDNS/pdns/pull/5598>`__: Add help text on autodetecting systemd support
-- 
2.47.2