Merge pull request #9617 from omoerbeek/prep-rec-4.4.0

Prep rec-4.4.0
PowerDNS · Oct 19, 2020 · 8ab2e30 · 8ab2e30
2 parents 9d26353 + e742191
commit 8ab2e30
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/docs/secpoll.zone b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2020101300 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2020101901 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -238,7 +238,8 @@ recursor-4.4.0-alpha1.security-status                   60 IN TXT "3 Unsupported
 recursor-4.4.0-alpha2.security-status                   60 IN TXT "3 Unsupported pre-release"
 recursor-4.4.0-beta1.security-status                    60 IN TXT "3 Unsupported pre-release"
 recursor-4.4.0-rc1.security-status                      60 IN TXT "3 Unsupported pre-release"
-recursor-4.4.0-rc2.security-status                      60 IN TXT "1 OK"
+recursor-4.4.0-rc2.security-status                      60 IN TXT "3 Unsupported pre-release"
+recursor-4.4.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
@@ -7,17 +7,17 @@ The release before that gets critical security 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.3.
+The currently supported release train of the PowerDNS Recursor is 4.4.
 
-PowerDNS Recursor 4.2 will only receive correctness, stability and
+PowerDNS Recursor 4.3 will only receive correctness, stability and
 security updates and will be receiving critical security updates only
-after PowerDNS Recursor 4.4 is released. It wil be end of life after
-PowerDNS Recursor 4.5 is released.
+after PowerDNS Recursor 4.5 is released. It wil be end of life after
+PowerDNS Recursor 4.6 is released.
 
-PowerDNS Recursor 4.1 will only receive critical security updates. It
-wil be end of life after PowerDNS Recursor 4.4 is released.
+PowerDNS Recursor 4.2 will only receive critical security updates. It
+wil be end of life after PowerDNS Recursor 4.5 is released.
 
-PowerDNS Recursor 4.0, 3.x, and 2.x are end of life.
+PowerDNS Recursor 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
@@ -30,18 +30,22 @@ such a user, these EOL statements do not apply to you.
      - Release date
      - Security-Only updates
      - End of Life
+   * - 4.4
+     - October 19 2020
+     - ~ October 2021
+     - EOL ~ April 2022
    * - 4.3
      - March 3 2020
-     - ~ March 2021
-     - ~ September 2021
+     - ~ April 2021
+     - EOL ~ October 2021
    * - 4.2
      - July 16 2019
-     - ~ September 2020
-     - ~ March 2021
+     - October 19 2020
+     - EOL ~ April 2021
    * - 4.1
      - December 4 2017
      - March 3 2020
-     - ~ September 2020
+     - EOL October 19 2020
    * - 4.0 and older
      - EOL
      - EOL

diff --git a/pdns/recursordist/docs/changelog/4.0.rst b/pdns/recursordist/docs/changelog/4.0.rst
@@ -3,6 +3,9 @@ Changelogs for 4.0.x
 
 This page has all the changelogs for the PowerDNS Recursor 4.0 release train.
 
+**Note**: 4.0.x and earlier releases are End of Life and no longer supported.
+See :doc:`EOL Statements <../appendices/EOL>`.
+
 PowerDNS Recursor 4.0.9
 -----------------------
 

diff --git a/pdns/recursordist/docs/changelog/4.1.rst b/pdns/recursordist/docs/changelog/4.1.rst
@@ -1,5 +1,7 @@
 Changelogs for 4.1.x
 ====================
+**Note**: 4.1.x and earlier releases are End of Life and no longer supported.
+See :doc:`EOL Statements <../appendices/EOL>`.
 
 .. changelog::
   :version: 4.1.18

diff --git a/pdns/recursordist/docs/changelog/4.4.rst b/pdns/recursordist/docs/changelog/4.4.rst
@@ -1,5 +1,15 @@
 Changelogs for 4.4.x
 ====================
+.. changelog::
+  :version: 4.4.0
+  :released: 19th of October 2020
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 9605
+
+    Backport of CVE-2020-25829: Cache pollution.
+
 .. changelog::
   :version: 4.4.0-rc2
   :released: 6th of October 2020

diff --git a/pdns/recursordist/docs/changelog/pre-4.0.rst b/pdns/recursordist/docs/changelog/pre-4.0.rst
@@ -4,6 +4,9 @@ Changelogs for all pre 4.0 releases
 **Note**: Beyond PowerDNS 2.9.20, the Authoritative Server and Recursor are released separately.
 Hence, this changelog starts at version 3.0.
 
+**Note**: pre-4.0 releases are End of Life and no longer supported.
+See :doc:`EOL Statements <../appendices/EOL>`.
+
 PowerDNS Recursor 3.6.4
 -----------------------