Merge branch 'release-5-2-0' into 'master'v5.2.0

Release 5.2.0

See merge request knot/knot-resolver!1090

11 files changed, 27 insertions, 4 deletions

diff --git a/.mailmap b/.mailmap
index 10fe3711..205fcd5e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,8 @@ Grigorii Demidov <grigorii.demidov@nic.cz>
 Hasnat <hasnat.ullah@gmail.com>
 Jiří Helebrant <jiri.helebrant@nic.cz> <helb@helb.cz>
 Ivana Krumlová <ivana.krumlova@nic.cz>
+Jakub Ružička <jakub.ruzicka@nic.cz>
+Jan Hák <jan.hak@nic.cz>
 Jan Holuša <jan.holusa@nic.cz>
 Jan Pavlinec <jan.pavlinec@nic.cz>
 Jan Včelák <jan.vcelak@nic.cz> <jv@fcelda.cz>
@@ -35,6 +37,7 @@ Petr Špaček <petr.spacek@nic.cz>
 rickhg12hs <rickhg12hs@users.noreply.github.com>
 Robert Šefr <robert.sefr@outlook.com>
 SH <sh@analogic.cz>
+Simon South <simon@simonsouth.net>
 Štěpán Balážik <stepan.balazik@nic.cz>
 Štěpán Kotek <stepan.kotek@nic.cz> <stepan.kotek@gmail.com>
 Štěpán Kotek <stepan.kotek@nic.cz>
@@ -43,6 +46,7 @@ Tomáš Hozza <thozza@redhat.com>
 Tomáš Křížek <tomas.krizek@nic.cz>
 Ulrich Wisser <ulrich.wisser@iis.se>
 Leo Vandewoestijne <github@unicycle.net>
+Vašek Šraier <vaclav.sraier@nic.cz> <git@vakabus.cz>
 Vicky Shrestha <vicky@cloudflare.com> <vicky@geeks.net.np>
 Vítězslav Kříž <vitezslav.kriz@nic.cz>
 Vladimír Čunát <vladimir.cunat@nic.cz> <vcunat@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 9a80ea57..cb38df57 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,8 @@ David Beitey <david@davidjb.com>
 Grigorii Demidov <grigorii.demidov@nic.cz>
 Hasnat <hasnat.ullah@gmail.com>
 Ivana Krumlová <ivana.krumlova@nic.cz>
+Jakub Ružička <jakub.ruzicka@nic.cz>
+Jan Hák <jan.hak@nic.cz>
 Jan Holuša <jan.holusa@nic.cz>
 Jan Pavlinec <jan.pavlinec@nic.cz>
 Jan Včelák <jan.vcelak@nic.cz>
@@ -44,12 +46,14 @@ realPy <t3sla@v-ip.fr>
 rickhg12hs <rickhg12hs@users.noreply.github.com>
 Robert Šefr <robert.sefr@outlook.com>
 SH <sh@analogic.cz>
+Simon South <simon@simonsouth.net>
 Štěpán Balážik <stepan.balazik@nic.cz>
 Štěpán Kotek <stepan.kotek@nic.cz>
 The Gitter Badger <badger@gitter.im>
 Tomáš Hozza <thozza@redhat.com>
 Tomáš Křížek <tomas.krizek@nic.cz>
 Ulrich Wisser <ulrich.wisser@iis.se>
+Vašek Šraier <vaclav.sraier@nic.cz>
 Vicky Shrestha <vicky@cloudflare.com>
 Vítězslav Kříž <vitezslav.kriz@nic.cz>
 Vladimír Čunát <vladimir.cunat@nic.cz>
diff --git a/NEWS b/NEWS
index b6d2e4b1..25d32958 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Knot Resolver 5.2.0 (2020-1m-dd)
 
 Improvements
 ------------
+- doh2: add native C module for DNS-over-HTTPS (#600, !997)
+- xdp: add server-side XDP support for higher UDP performance (#533, !1083)
 - lower default EDNS buffer size to 1232 bytes (#538, #300, !920);
   see https://dnsflagday.net/2020/
 - net: split the EDNS buffer size into upstream and downstream (!1026)
@@ -12,6 +14,7 @@ Improvements
   keys and upstream (#251, !1051)
 - human readable output in interactive mode was improved
 - doc: generate info page (!1079)
+- packaging: improve sysusers and tmpfiles support (!1080)
 
 Bugfixes
 --------
diff --git a/doc/upgrading.rst b/doc/upgrading.rst
index 4f238e08..db5b011d 100644
--- a/doc/upgrading.rst
+++ b/doc/upgrading.rst
@@ -21,9 +21,6 @@ newer versions when they are released.
 * Going forward DNS-over-HTTP (DoH) will be supported only over HTTP/2 with TLS.
   This limitation allows us to provide a new :ref:`more reliable and scalable implementation
   of DoH <dns-over-https>` (``kind='doh2'``).
-* DoH over HTTP/1 and unencrypted transports is still available in
-  :ref:`legacy http module <mod-http-doh>` (``kind='doh'``).
-  This module will not receive receive any more bugfixes and will be eventually removed.
 * Command line option ``--forks`` (``-f``) `is deprecated and will be eventually removed
   <https://gitlab.nic.cz/knot/knot-resolver/-/issues/631>`_.
   Preferred way to manage :ref:`systemd-multiple-instances` is to use a process manager,
@@ -39,6 +36,9 @@ newer versions when they are released.
 Users
 -----
 
+* DoH over HTTP/1 and unencrypted transports is still available in
+  :ref:`legacy http module <mod-http-doh>` (``kind='doh'``).
+  This module will not receive receive any more bugfixes and will be eventually removed.
 * Users of :ref:`control-sockets` API need to terminate each command sent to resolver with newline
   character (ASCII ``\n``). Correct usage: ``cache.stats()\n``.
   Newline terminated commands are accepted by all resolver versions >= 1.0.0.
diff --git a/etc/config/config.cluster b/etc/config/config.cluster
index 58227bdf..dd10a747 100644
--- a/etc/config/config.cluster
+++ b/etc/config/config.cluster
@@ -11,6 +11,8 @@ net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('::1', 53, { kind = 'dns'})
 net.listen('127.0.0.1', 853, { kind = 'tls' })
 net.listen('::1', 853, { kind = 'tls' })
+net.listen('127.0.0.1', 443, { kind = 'doh2' })
+net.listen('::1', 443, { kind = 'doh2'})
 
 -- Refer to manual for optimal cache size
 cache.size = 16 * GB
diff --git a/etc/config/config.internal b/etc/config/config.internal
index 53661e01..46bbf173 100644
--- a/etc/config/config.internal
+++ b/etc/config/config.internal
@@ -8,6 +8,8 @@ net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('::1', 53, { kind = 'dns'})
 net.listen('127.0.0.1', 853, { kind = 'tls' })
 net.listen('::1', 853, { kind = 'tls' })
+net.listen('127.0.0.1', 443, { kind = 'doh2' })
+net.listen('::1', 443, { kind = 'doh2' })
 
 -- define list of internal-only domains
 internalDomains = policy.todnames({'company.example', 'internal.example'})
diff --git a/etc/config/config.isp b/etc/config/config.isp
index 445754ed..3dc3e7f0 100644
--- a/etc/config/config.isp
+++ b/etc/config/config.isp
@@ -8,6 +8,8 @@ net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('::1', 53, { kind = 'dns'})
 net.listen('127.0.0.1', 853, { kind = 'tls' })
 net.listen('::1', 853, { kind = 'tls' })
+net.listen('127.0.0.1', 443, { kind = 'doh2' })
+net.listen('::1', 443, { kind = 'doh2' })
 
 -- Refer to manual for optimal cache size
 cache.size = 4 * GB
diff --git a/etc/config/config.personal b/etc/config/config.personal
index 6b56f11a..e6803a1c 100644
--- a/etc/config/config.personal
+++ b/etc/config/config.personal
@@ -5,8 +5,10 @@
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('127.0.0.1', 853, { kind = 'tls' })
+--net.listen('127.0.0.1', 443, { kind = 'doh2' })
 net.listen('::1', 53, { kind = 'dns', freebind = true })
 net.listen('::1', 853, { kind = 'tls', freebind = true })
+--net.listen('::1', 443, { kind = 'doh2' })
 
 -- Load useful modules
 modules = {
diff --git a/etc/config/config.privacy b/etc/config/config.privacy
index 3fd9a425..d36f3a2d 100644
--- a/etc/config/config.privacy
+++ b/etc/config/config.privacy
@@ -8,6 +8,8 @@ net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('::1', 53, { kind = 'dns'})
 net.listen('127.0.0.1', 853, { kind = 'tls' })
 net.listen('::1', 853, { kind = 'tls' })
+net.listen('127.0.0.1', 443, { kind = 'doh2' })
+net.listen('::1', 443, { kind = 'doh2' })
 
 -- TLS server configuration
 -- use this to configure your TLS certificates
diff --git a/etc/config/config.splitview b/etc/config/config.splitview
index 1b1d1983..1054af5a 100644
--- a/etc/config/config.splitview
+++ b/etc/config/config.splitview
@@ -8,6 +8,8 @@ net.listen('127.0.0.1', 53, { kind = 'dns' })
 net.listen('::1', 53, { kind = 'dns'})
 net.listen('127.0.0.1', 853, { kind = 'tls' })
 net.listen('::1', 853, { kind = 'tls' })
+net.listen('127.0.0.1', 443, { kind = 'doh2' })
+net.listen('::1', 443, { kind = 'doh2' })
 
 -- Load Useful modules
 modules = {
diff --git a/meson.build b/meson.build
index df16fe03..af2760ef 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
   'knot-resolver',
   ['c', 'cpp'],
   license: 'GPLv3+',
-  version: '5.1.3',
+  version: '5.2.0',
   default_options: ['c_std=gnu11', 'b_ndebug=if-release'],
   meson_version: '>=0.49',
 )