summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek <tomas.krizek@nic.cz>2021-03-31 17:13:36 +0200
committerTomas Krizek <tomas.krizek@nic.cz>2021-03-31 17:13:36 +0200
commit58cdfa410cc04725f76209a524b21a1f00f74ea4 (patch)
tree35138187ebacbbf31bb4c67a0a272eb63d206f74
parentMerge branch 'nsec3-iters-downgrade' into 'master' (diff)
parentrelease 5.3.1 (diff)
downloadknot-resolver-58cdfa410cc04725f76209a524b21a1f00f74ea4.tar.xz
knot-resolver-58cdfa410cc04725f76209a524b21a1f00f74ea4.zip
Merge branch 'release-5-3-1' into 'master'v5.3.1
release 5.3.1 See merge request knot/knot-resolver!1162
-rw-r--r--NEWS3
-rw-r--r--distro/deb/control2
-rw-r--r--doc/build.rst4
-rw-r--r--meson.build2
4 files changed, 6 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 49bd7271..a9e431ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
-Knot Resolver 5.3.1 (2021-03-dd)
+Knot Resolver 5.3.1 (2021-03-31)
================================
Improvements
------------
- policy.STUB: try to avoid TCP (compared to 5.3.0; !1155)
- validator: downgrade NSEC3 records with too many iterations (>150; !1160)
+- additional improvements to nameserver selection algorithm (!1154, !1150)
Bugfixes
--------
diff --git a/distro/deb/control b/distro/deb/control
index 8c443230..1fbc93c1 100644
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -20,7 +20,7 @@ Build-Depends:
libuv1-dev,
luajit,
pkg-config,
- meson (>= 0.46),
+ meson (>= 0.49),
doxygen,
protobuf-c-compiler,
python3-breathe,
diff --git a/doc/build.rst b/doc/build.rst
index 9e854505..ce26d8c5 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -30,7 +30,7 @@ The following dependencies are needed to build and run Knot Resolver:
:header: "Requirement", "Notes"
"ninja", "*build only*"
- "meson >= 0.46", "*build only* [#]_"
+ "meson >= 0.49", "*build only* [#]_"
"C and C++ compiler", "*build only* [#]_"
"`pkg-config`_", "*build only* [#]_"
"libknot_ 2.9+", "Knot DNS libraries"
@@ -64,7 +64,7 @@ Resolver:
"`clang-tidy`_", "``lint-c``", "Syntax and static analysis checker for C."
"luacov_", "``check-config``", "Code coverage analysis for Lua modules."
-.. [#] If ``meson >= 0.46`` isn't available for your distro, check backports
+.. [#] If ``meson >= 0.49`` isn't available for your distro, check backports
repository or use python pip to install it.
.. [#] Requires ``__attribute__((cleanup))`` and ``-MMD -MP`` for
dependency file generation. We test GCC and Clang, and ICC is likely to work as well.
diff --git a/meson.build b/meson.build
index f11a0313..ebbf9237 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
'knot-resolver',
['c', 'cpp'],
license: 'GPLv3+',
- version: '5.3.0',
+ version: '5.3.1',
default_options: ['c_std=gnu11', 'b_ndebug=if-release'],
meson_version: '>=0.49',
)