Prep for 5.1.7 and 5.2.5

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index c45cb5311091e3941a36740144f0f20e3e9c1fd4..aa2135cb97eb1f540feb55de488885aef7e728b4 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. 2025072403 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2025072901 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -413,6 +413,7 @@ recursor-5.1.3.security-status                          60 IN TXT "3 Upgrade now
 recursor-5.1.4.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-04.html"
 recursor-5.1.5.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-04.html"
 recursor-5.1.6.security-status                          60 IN TXT "1 OK"
+recursor-5.1.7.security-status                          60 IN TXT "1 OK"
 recursor-5.2.0-alpha1.security-status                   60 IN TXT "3 Superseded pre-release (known vulnerabilities)"
 recursor-5.2.0-beta1.security-status                    60 IN TXT "3 Superseded pre-release (known vulnerabilities)"
 recursor-5.2.0-rc1.security-status                      60 IN TXT "3 Superseded pre-release (known vulnerabilities)"
@@ -421,6 +422,7 @@ recursor-5.2.1.security-status                          60 IN TXT "3 Upgrade now
 recursor-5.2.2.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-04.html"
 recursor-5.2.3.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-04.html"
 recursor-5.2.4.security-status                          60 IN TXT "1 OK"
+recursor-5.2.5.security-status                          60 IN TXT "1 OK"
 recursor-5.3.0-alpha1.security-status                   60 IN TXT "3 Superseded pre-release (known vulnerabilities)"
 recursor-5.3.0-alpha2.security-status                   60 IN TXT "3 Superseded pre-release (known vulnerabilities)"
 recursor-5.3.0-beta1.security-status                    60 IN TXT "1 Unsupported pre-release"

diff --git a/pdns/recursordist/docs/changelog/5.1.rst b/pdns/recursordist/docs/changelog/5.1.rst
index bb6447e5740e66edd8edecfa483912cd53a9fd74..e98ed07d232713b0aecd4715ff48955f2daaa5e5 100644 (file)
--- a/pdns/recursordist/docs/changelog/5.1.rst
+++ b/pdns/recursordist/docs/changelog/5.1.rst
@@ -3,6 +3,31 @@ Changelogs for 5.1.X
 
 Before upgrading, it is advised to read the :doc:`../upgrade`.
 
+.. changelog::
+  :version: 5.1.7
+  :released: 29th of July 2025
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15911
+    :tickets: 15651, 15652
+
+    When using ZTC, do not store non-auth data if the name is subject to recursive forwarding.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15911
+    :tickets: 15893
+
+    If a RPZ hit has a custom CNAME record, we should try harder to follow it.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15909
+    :tickets: 15010
+
+    Fix protobufServer(.. {taggedOnly=true}) logic for cache-returned responses.
+
 .. changelog::
   :version: 5.1.6
   :released: 21st of July 2025

diff --git a/pdns/recursordist/docs/changelog/5.2.rst b/pdns/recursordist/docs/changelog/5.2.rst
index ad2faf9cae8bfeed10b4aed6ef718527ac43aeed..962af1ec38cdc4e53bf64fc4712a6d3ff63742f6 100644 (file)
--- a/pdns/recursordist/docs/changelog/5.2.rst
+++ b/pdns/recursordist/docs/changelog/5.2.rst
@@ -3,6 +3,38 @@ Changelogs for 5.2.X
 
 Before upgrading, it is advised to read the :doc:`../upgrade`.
 
+.. changelog::
+  :version: 5.2.5
+  :released: 29th of July 2025
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15908
+    :tickets: 15893
+
+    If a RPZ hit has a custom CNAME record, we should try harder to follow it.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15907
+    :tickets: 15651, 15652
+
+    When using ZTC, do not store non-auth data if the name is subject to recursive forwarding.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 15906
+    :tickets: 15435
+
+    Add a Lua function to get the config dir and name.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 15905
+    :tickets: 15367, 15368
+
+    Fix generation of recursor config if PDNS_RECURSOR_API_KEY is set.
+
 .. changelog::
   :version: 5.2.4
   :released: 21st of July 2025

diff --git a/pdns/recursordist/docs/lua-scripting/functions.rst b/pdns/recursordist/docs/lua-scripting/functions.rst
index 3786b871e9bf43baafa4ef7fb33890365dd5dd1c..73811478619f20745d52ffd931c7856fcee86456 100644 (file)
--- a/pdns/recursordist/docs/lua-scripting/functions.rst
+++ b/pdns/recursordist/docs/lua-scripting/functions.rst
@@ -67,6 +67,7 @@ These are some functions that don't really have a place in one of the other cate
 
 .. function:: getConfigDirAndName() -> str, str
 
+   .. versionadded:: 5.2.5
    .. versionadded:: 5.3.0
 
    Get the configuration directory and the instance name.