From: aerique <aerique@xs4all.nl>
Date: Fri, 1 Feb 2019 13:10:39 +0000 (+0100)
Subject: Merge pull request #7440 from aerique/feature/rec-4.1.11-changelog-and-secpoll
X-Git-Tag: auth-4.2.0-beta1~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f537e4a5520de35648a882d57688c2c51e0f7717;p=thirdparty%2Fpdns.git

Merge pull request #7440 from aerique/feature/rec-4.1.11-changelog-and-secpoll

Update changelog and secpol for rec-4.1.11 and rec-4.2.0-alpha1.
---

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index ab38a45652..90940cb9c3 100644
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2019013101 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2019020101 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 ; Auth
@@ -174,6 +174,8 @@ recursor-4.1.7.security-status                          60 IN TXT "3 Upgrade now
 recursor-4.1.8.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2019-01.html https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2019-02.html"
 recursor-4.1.9.security-status                          60 IN TXT "1 OK"
 recursor-4.1.10.security-status                         60 IN TXT "1 OK"
+recursor-4.1.11.security-status                         60 IN TXT "1 OK"
+recursor-4.2.0-alpha1.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/changelog/4.1.rst b/pdns/recursordist/docs/changelog/4.1.rst
index 5b64061e96..a7843705a3 100644
--- a/pdns/recursordist/docs/changelog/4.1.rst
+++ b/pdns/recursordist/docs/changelog/4.1.rst
@@ -1,6 +1,25 @@
 Changelogs for 4.1.x
 ====================
 
+.. changelog::
+  :version: 4.1.11
+  :released: 1st of February 2019
+
+  Since Spectre/Meltdown, system calls have become more expensive.  This made exporting a very high number of protobuf messages costly, which is addressed in this release by reducing the number of sycalls per message.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 7434
+
+    Add an option to export only responses over protobuf to the Lua :func:`protobufServer` directive.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 7430
+    :tickets: 7428
+
+    Reduce systemcall usage in protobuf logging.  (See #7428.)
+
 .. changelog::
   :version: 4.1.10
   :released: 24th of January 2019
diff --git a/pdns/recursordist/docs/changelog/4.2.rst b/pdns/recursordist/docs/changelog/4.2.rst
new file mode 100644
index 0000000000..4196eca117
--- /dev/null
+++ b/pdns/recursordist/docs/changelog/4.2.rst
@@ -0,0 +1,10 @@
+Changelogs for 4.2.x
+====================
+
+.. changelog::
+  :version: 4.2.0-alpha1
+  :released: 1st of February 2019
+
+  Initial 4.2.x release, please see the blog post: https://blog.powerdns.com/2019/02/01/changes-in-the-powerdns-recursor-4-2-0/
+
+  .
diff --git a/pdns/recursordist/docs/changelog/index.rst b/pdns/recursordist/docs/changelog/index.rst
index 27fd24e1e3..545daa7442 100644
--- a/pdns/recursordist/docs/changelog/index.rst
+++ b/pdns/recursordist/docs/changelog/index.rst
@@ -6,6 +6,7 @@ The changelogs for the recursor are split between release trains.
 .. toctree::
     :maxdepth: 2
 
+    4.2
     4.1
     4.0
     pre-4.0