Prep for rec-4.7.0-rc1

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 7b8f9da33d9b739cdc0d26f3f197da8caf549470..e4d4733e9cd6e86b59c5a63d93560713764dcd01 100644 (file)
--- 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. 2022042501 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2022050601 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -312,7 +312,8 @@ recursor-4.6.0.security-status                          60 IN TXT "3 Upgrade now
 recursor-4.6.1.security-status                          60 IN TXT "1 OK"
 recursor-4.6.2.security-status                          60 IN TXT "1 OK"
 recursor-4.7.0-alpha1.security-status                   60 IN TXT "3 Unsupported pre-release (known vulnerabilities)"
-recursor-4.7.0-beta1.security-status                    60 IN TXT "1 OK"
+recursor-4.7.0-beta1.security-status                    60 IN TXT "2 Unsupported pre-release"
+recursor-4.7.0-rc1.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 862df54ce015ced68c116c61d1cf0bc69371e38e..a0822b3f32c6448cb7e69ad0703c99dc30bc57d7 100644 (file)
--- a/pdns/recursordist/docs/changelog/4.7.rst
+++ b/pdns/recursordist/docs/changelog/4.7.rst
@@ -1,5 +1,29 @@
 Changelogs for 4.7.X
 ====================
+.. changelog::
+  :version: 4.7.0-rc1
+  :released: 6th of May 2022
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 11559
+    :tickets: 11539
+
+    Prometheus #HELP texts: DNSSEC counters track responses sent, not actual validations performed.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 11560
+    :tickets: 11541
+
+    Fix DoT port and protocol used for probed authoritative servers.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 11538
+    :tickets: 11536
+
+    Fix Coverity 1487923 Out-of-bounds read (wrong use of sizeof).
 
 .. changelog::
   :version: 4.7.0-beta1

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 1aa07bc60735d1a7eb4b0a97daa4965ac7a6175a..6465b9e886e5163e399c3c05c18ddf6e6a82e01c 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -8,7 +8,7 @@ When upgrading several versions, please read **all** notes applying to the upgra
 ---------------
 
 :program:`rec_control` changes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The ``dump-throttle`` subcommand no longer produces a table per thread, as the corresponding table now is shared by all threads.
 
 4.6.2 to 4.7.0
@@ -41,9 +41,9 @@ New settings
   This is an experimental function, use with care.
 
 :program:`rec_control` changes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The ``dump-nsspeeds``, ``dump-failedservers`` and ``dump-non-resolving`` subcommands no longer produce a table per thread, as the corresponding tables are now shared by all threads.
-
+They also use a better readable and sortable timestamp format.
 
 4.6.1 to 4.6.2
 --------------