Prep for rec-4.6.0 release

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 061405e1b8b5a66225f7dd354341e1b7a4da2897..1bb995b8eca3689b53f7366d75b014fa8140be6c 100644 (file)
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021120901 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021121701 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -296,7 +296,8 @@ recursor-4.6.0-alpha1.security-status                   60 IN TXT "2 Unsupported
 recursor-4.6.0-alpha2.security-status                   60 IN TXT "2 Unsupported pre-release"
 recursor-4.6.0-beta1.security-status                    60 IN TXT "2 Unsupported pre-release"
 recursor-4.6.0-beta2.security-status                    60 IN TXT "2 Unsupported pre-release"
-recursor-4.6.0-rc1.security-status                      60 IN TXT "1 Unsupported pre-release"
+recursor-4.6.0-rc1.security-status                      60 IN TXT "2 Unsupported pre-release"
+recursor-4.6.0.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/appendices/EOL.rst b/pdns/recursordist/docs/appendices/EOL.rst
index 01d5e5497328fe5373b472d77a2a5ce09dcb93d4..826f4a426abbe51380e96d39312f1b996fb11b12 100644 (file)
--- a/pdns/recursordist/docs/appendices/EOL.rst
+++ b/pdns/recursordist/docs/appendices/EOL.rst
@@ -10,15 +10,15 @@ The two releases before that get critical updates only.
 Older releases are marked end of life and receive no updates at all.
 Pre-releases do not receive immediate security updates.
 
-The currently supported release train of the PowerDNS Recursor is 4.5.
+The currently supported release train of the PowerDNS Recursor is 4.6.
+
+PowerDNS Recursor 4.5 will only receive critical updates and will be
+end of life after PowerDNS Recursor 4.8 is released.
 
 PowerDNS Recursor 4.4 will only receive critical updates and will be
 end of life after PowerDNS Recursor 4.7 is released.
 
-PowerDNS Recursor 4.3 will only receive critical updates and will be
-end of life after PowerDNS Recursor 4.6 is released.
-
-PowerDNS Recursor 4.0 through 4.2, 3.x, and 2.x are End of Life.
+PowerDNS Recursor 4.0 through 4.3, 3.x, and 2.x are End of Life.
 
 Note: Users with a commercial agreement with PowerDNS.COM BV or Open-Xchange
 can receive extended support for releases which are End Of Life. If you are
@@ -34,10 +34,14 @@ for details.
      - Release date
      - Critical-Only updates
      - End of Life
+   * - 4.6
+     - December 17 2021
+     - ~ May 2022
+     - EOL ~ May 2023
    * - 4.5
      - May 11 2021
-     - ~ November 2021
-     - EOL ~ November 2022
+     - December 17 2021
+     - EOL ~ December 2022
    * - 4.4
      - October 19 2020
      - May 11 2021
@@ -45,7 +49,7 @@ for details.
    * - 4.3
      - March 3 2020
      - October 19 2020
-     - EOL ~ November 2021
+     - EOL December 17 2021
    * - 4.2
      - July 16 2019
      - October 19 2020

diff --git a/pdns/recursordist/docs/changelog/4.6.rst b/pdns/recursordist/docs/changelog/4.6.rst
index 4822e52e42bb1450bcd47fcc4d593df94431606c..b8caa6c7fa3451e875f6be8742e59482f445373b 100644 (file)
--- a/pdns/recursordist/docs/changelog/4.6.rst
+++ b/pdns/recursordist/docs/changelog/4.6.rst
@@ -1,6 +1,22 @@
 Changelogs for 4.6.X
 ====================
 
+.. changelog::
+  :version: 4.6.0
+  :released: 17th of December 2021
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 11091
+
+    Do not generate event trace records for Lua hooks if no Lua hook is defined.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 11092
+
+    Remove capability requirements from Docker images.
+
 .. changelog::
   :version: 4.6.0-rc1
   :released: 3rd of December 2021