summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek <tomas.krizek@nic.cz>2021-05-05 11:23:24 +0200
committerTomas Krizek <tomas.krizek@nic.cz>2021-05-05 11:23:24 +0200
commitae3c81600a6ce5909bd3abc9dbc4d31e89ef3179 (patch)
tree7c37af7d06d2b12f6af86458086b91a1efd984d0
parentMerge !1163: policy.STUB docs: recommend NO_EDNS and mention NO_0X20 (diff)
parentrelease 5.3.2 (diff)
downloadknot-resolver-ae3c81600a6ce5909bd3abc9dbc4d31e89ef3179.tar.xz
knot-resolver-ae3c81600a6ce5909bd3abc9dbc4d31e89ef3179.zip
Merge branch 'release-5-3-2' into 'master'v5.3.2
release 5.3.2 See merge request knot/knot-resolver!1175
-rw-r--r--Dockerfile2
-rw-r--r--NEWS4
-rw-r--r--meson.build2
3 files changed, 5 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index ec46b7e4..75dad2e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
# Intermediate container for Knot DNS build (not persistent)
# SPDX-License-Identifier: GPL-3.0-or-later
FROM debian:stable AS knot-dns-build
-ARG KNOT_DNS_VERSION=v3.0.0
+ARG KNOT_DNS_VERSION=v3.0.5
# Build dependencies
ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \
diff --git a/NEWS b/NEWS
index b296d9a7..26fab1e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Knot Resolver 5.3.2 (2021-0m-dd)
+Knot Resolver 5.3.2 (2021-05-05)
================================
Security
@@ -9,6 +9,7 @@ Security
Improvements
------------
- cache: improve handling write errors from LMDB (!1159)
+- doh2: improve handling of stream errors (!1164)
Bugfixes
--------
@@ -16,6 +17,7 @@ Bugfixes
- validator: fix SERVFAIL for some rare dynamic proofs (!1166)
- fix SIGBUS on uncommon ARM machines (unaligned access; !1167, #426)
- cache: better resilience on abnormal termination/restarts (!1172)
+- doh2: fix memleak on stream write failures (!1161)
Knot Resolver 5.3.1 (2021-03-31)
diff --git a/meson.build b/meson.build
index ebbf9237..b3487574 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
'knot-resolver',
['c', 'cpp'],
license: 'GPLv3+',
- version: '5.3.1',
+ version: '5.3.2',
default_options: ['c_std=gnu11', 'b_ndebug=if-release'],
meson_version: '>=0.49',
)