From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 11 Jul 2024 14:54:15 +0000 (+0200)
Subject: dnsdist: Prepare ChangeLog and secpoll for 1.9.6
X-Git-Tag: rec-5.2.0-alpha1~175^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=663d7e30d0fbc25188b3ffe55341760efddd6620;p=thirdparty%2Fpdns.git

dnsdist: Prepare ChangeLog and secpoll for 1.9.6
---

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 11caea5e81..6968b44e1f 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. 2024071000 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. peter\.van\.dijk.powerdns.com. 2024071501 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -562,3 +562,4 @@ dnsdist-1.9.2.security-status                              60 IN TXT "3 Upgrade
 dnsdist-1.9.3.security-status                              60 IN TXT "3 Upgrade now, see https://dnsdist.org/security-advisories/powerdns-advisory-for-dnsdist-2024-03.html"
 dnsdist-1.9.4.security-status                              60 IN TXT "1 OK"
 dnsdist-1.9.5.security-status                              60 IN TXT "1 OK"
+dnsdist-1.9.6.security-status                              60 IN TXT "1 OK"
diff --git a/pdns/dnsdistdist/docs/changelog.rst b/pdns/dnsdistdist/docs/changelog.rst
index 8850beb525..4e8b7ee279 100644
--- a/pdns/dnsdistdist/docs/changelog.rst
+++ b/pdns/dnsdistdist/docs/changelog.rst
@@ -1,6 +1,53 @@
 Changelog
 =========
 
+.. changelog::
+  :version: 1.9.6
+  :released: TBD
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 14436
+
+    Fix a race in the XSK/AF_XDP backend handling code
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 14437
+
+    dns.cc: use pdns::views::UnsignedCharView
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 14438
+
+    Make the logging functions available to all Lua environments
+
+  .. change::
+    :tags: Bug Fixes, Metrics
+    :pullreq: 14439
+    :tickets: 14395
+
+    Dedup Prometheus help and type lines for custom metrics with labels
+
+  .. change::
+    :tags: New Features
+    :pullreq: 14449
+
+    Add support for a callback when a new tickets key is added
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 14450
+
+    Handle Quiche >= 0.22.0
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 14452
+
+    Don't include openssl/engine.h if it's not going to be used (Sander Hoentjen)
+
 .. changelog::
   :version: 1.9.5
   :released: 20th of June 2024