From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 5 Jul 2022 11:58:49 +0000 (+0200)
Subject: Prep for rec-4.7.1
X-Git-Tag: auth-4.8.0-alpha0~19^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11762%2Fhead;p=thirdparty%2Fpdns.git

Prep for rec-4.7.1
---

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 958e0d99b2..27808f9d7e 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1242,9 +1242,9 @@ phishing
 phonedph
 php
 pickclosest
+pickhashed
 pickrandom
 pickrandomsample
-pickhashed
 pickwhashed
 pickwrandom
 pid
@@ -1873,6 +1873,7 @@ Winfried
 wireformat
 wirelength
 Wisiol
+wmem
 Wmissing
 Wojas
 workaround
@@ -1920,7 +1921,7 @@ yubikey
 YYYYMMD
 YYYYMMDD
 YYYYMMDDSS
-wmem
+Zash
 Zealey
 zeha
 Zengers
diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt
index 927645883c..56aad71fd2 100644
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -64,3 +64,5 @@ DoH
 # Contributors with non-ascii characters in their name
 Hoffst[^[:ascii:]]+tte
 Gri[^[:ascii:]]
+Lundstr[^[:ascii:]]+m
+
diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index c1eb8d3631..3f7d553363 100644
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2022061401 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2022070800 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -315,6 +315,7 @@ recursor-4.7.0-alpha1.security-status                   60 IN TXT "3 Unsupported
 recursor-4.7.0-beta1.security-status                    60 IN TXT "2 Unsupported pre-release"
 recursor-4.7.0-rc1.security-status                      60 IN TXT "2 Unsupported pre-release"
 recursor-4.7.0.security-status                          60 IN TXT "1 OK"
+recursor-4.7.1.security-status                          60 IN TXT "1 OK"
 
 ; Recursor Debian
 recursor-3.6.2-2.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
diff --git a/pdns/recursordist/docs/changelog/4.7.rst b/pdns/recursordist/docs/changelog/4.7.rst
index c79ea67de3..c5472fe21b 100644
--- a/pdns/recursordist/docs/changelog/4.7.rst
+++ b/pdns/recursordist/docs/changelog/4.7.rst
@@ -1,5 +1,31 @@
 Changelogs for 4.7.X
 ====================
+.. changelog::
+  :version: 4.7.1
+  :released: 8th of July 2022
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 11750
+    :tickets: 11726, 11724
+
+    Allow generic format while parsing zone files for ZoneToCache.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 11748
+    :tickets: 11692
+
+    Run tasks from housekeeping thread in the proper way, causing
+    queued DoT probes to run more promptly. Thanks to Jerry Lundström!
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 11740
+    :tickets: 11735
+
+    Force gzip compression for debian packages (Zash).
+
 .. changelog::
   :version: 4.7.0
   :released: 30th of May 2022