From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 19 Dec 2023 09:42:34 +0000 (+0100)
Subject: Prep for rec-5.0.0-rc2
X-Git-Tag: auth-4.9.0-alpha1~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13656%2Fhead;p=thirdparty%2Fpdns.git

Prep for rec-5.0.0-rc2
---

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 504ff2fec6..c3a12bdcef 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. 2023121500 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2023122000 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -363,7 +363,8 @@ recursor-4.9.2.security-status                          60 IN TXT "1 OK"
 recursor-5.0.0-alpha1.security-status                   60 IN TXT "2 Unsupported pre-release"
 recursor-5.0.0-alpha2.security-status                   60 IN TXT "2 Unsupported pre-release"
 recursor-5.0.0-beta1.security-status                    60 IN TXT "2 Unsupported pre-release"
-recursor-5.0.0-rc1.security-status                      60 IN TXT "1 Unsupported pre-release"
+recursor-5.0.0-rc1.security-status                      60 IN TXT "2 Unsupported pre-release"
+recursor-5.0.0-rc2.security-status                      60 IN TXT "1 Unsupported pre-release"
 
 ; 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/5.0.rst b/pdns/recursordist/docs/changelog/5.0.rst
index 389fde44df..a48dca41dd 100644
--- a/pdns/recursordist/docs/changelog/5.0.rst
+++ b/pdns/recursordist/docs/changelog/5.0.rst
@@ -3,6 +3,24 @@ Changelogs for 5.0.X
 
 Before upgrading, it is advised to read the :doc:`../upgrade`.
 
+.. changelog::
+  :version: 5.0.0-rc2
+  :released: 20th of December 2023
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 13646
+    :tickets: 13588, 13612
+
+    Fix handling of RUNTIME_DIRECTORY and NOD dirs.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 13645
+    :tickets: 13567
+
+    Warn that disabling structured logging is now deprecated.
+
 .. changelog::
   :version: 5.0.0-rc1
   :released: 6th of December 2023
diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 5718bff7cd..cb49847418 100644
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -39,6 +39,7 @@ Changed settings
 - The :ref:`setting-loglevel` can now be set to a level below 3 (error).
 - The :ref:`setting-extended-resolution-errors` now defaults to enabled.
 - The :ref:`setting-nsec3-max-iterations` now defaults to 50.
+- Disabling :ref:`setting-structured-logging` has been deprecated and will be removed in a future release.
 
 4.8.0 to 4.9.0
 --------------