Prep rec-4.5.0

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 6edbd6c83f85d4c70a50626e24199d09611382ee..3163adc480629c2d43b7f4cbfb7258c924f404c8 100644 (file)
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -257,7 +257,8 @@ recursor-4.5.0-alpha2.security-status                   60 IN TXT "3 Unsupported
 recursor-4.5.0-alpha3.security-status                   60 IN TXT "3 Unsupported pre-release"
 recursor-4.5.0-beta1.security-status                    60 IN TXT "3 Unsupported pre-release"
 recursor-4.5.0-beta2.security-status                    60 IN TXT "3 Unsupported pre-release"
-recursor-4.5.0-rc1.security-status                      60 IN TXT "1 OK"
+recursor-4.5.0-rc1.security-status                      60 IN TXT "3 Unsupported pre-release"
+recursor-4.5.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 e846b9bef3282893412bf33e6ebf0e3acad9efe2..6b1de829329f9a8c7b49d504431eda27d8e32a33 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.4.
+The currently supported release train of the PowerDNS Recursor is 4.5.
+
+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.2 will only receive critical updates. It
-wil be end of life after PowerDNS Recursor 4.5 is released.
-
-PowerDNS Recursor 4.1, 4.0, 3.x, and 2.x are End of Life.
+PowerDNS Recursor 4.2, 4.1, 4.0, 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,18 +34,22 @@ for details.
      - Release date
      - Critical-Only updates
      - End of Life
+   * - 4.5
+     - May 10 2021
+     - ~ November 2021
+     - EOL ~ November 2022
    * - 4.4
      - October 19 2020
-     - ~ April 2021
-     - EOL ~ April 2022
+     - May 10 2021
+     - EOL ~ May 2022
    * - 4.3
      - March 3 2020
      - October 19 2020
-     - EOL ~ October 2021
+     - EOL ~ November 2021
    * - 4.2
      - July 16 2019
      - October 19 2020
-     - EOL ~ April 2021
+     - EOL May 10 2021
    * - 4.1
      - December 4 2017
      - March 3 2020
@@ -57,4 +61,4 @@ for details.
 
 Note we did not have a very regular release schedule in the past,
 so the dates for older releases do not follow the pattern described above.
- 
+

diff --git a/pdns/recursordist/docs/changelog/4.5.rst b/pdns/recursordist/docs/changelog/4.5.rst
index 8d80bcf4c20757cfa1c9a7ab4df6a111b524d776..802b0ca6e59815c8a0b502bf0c38e5d71287b304 100644 (file)
--- a/pdns/recursordist/docs/changelog/4.5.rst
+++ b/pdns/recursordist/docs/changelog/4.5.rst
@@ -1,6 +1,16 @@
 Changelogs for 4.5.X
 ====================
 
+.. changelog::
+  :version: 4.5.0
+  :released: 10th of May 2021
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10353
+
+    Apply dns64 on RPZ hits generated after a gettag_ffi hit.
+
 .. changelog::
   :version: 4.5.0-rc1
   :released: 28th of April 2021