libknot: bump dependency version to 3.0.2

Version 2.9 isn't supported anymore anyway, but 3.0.2 is needed for
extended error constants.

diff --git a/NEWS b/NEWS
index e00d7d2e9efddf5a34b940a4ef7abd380ef682fd..2999b1d21fb5e96f3b9a382b328eb1de0d9dea83 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Knot Resolver 5.5.0 (2022-mm-dd)
+================================
+
+Improvements
+------------
+- extended_errors: module for extended DNS error support, RFC8914 (!1234)
+
+Incompatible changes
+--------------------
+- libknot >= 3.0.2 is required
+
+
 Knot Resolver 5.4.3 (2021-12-01)
 ================================
 

diff --git a/daemon/lua/kres-gen-29.lua b/daemon/lua/kres-gen-30.lua
similarity index 100%
rename from daemon/lua/kres-gen-29.lua
rename to daemon/lua/kres-gen-30.lua

diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build
index e8fc3be468c4e8e94c38a4eaac89db082f35e31d..410cb0233f86eab1e775e573b71c2b8c02964dba 100644 (file)
--- a/daemon/lua/meson.build
+++ b/daemon/lua/meson.build
@@ -40,7 +40,7 @@ distro_preconfig = configure_file(
 
 # Unfortunately the different ABI implies different contents of 'kres-gen.lua'.
 kres_gen_fname = (libknot.version().version_compare('>= 3.1')
-                 ? 'kres-gen-31.lua' : 'kres-gen-29.lua')
+                 ? 'kres-gen-31.lua' : 'kres-gen-30.lua')
 
 kres_gen_lua = configure_file(
   input: kres_gen_fname,

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 1fbc93c12f6fde87062757b7342323fff612493e..85a998a3e1a40491d70eddcfe071c1f64e9b599b 100644 (file)
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -10,7 +10,7 @@ Build-Depends:
  libedit-dev,
  libfstrm-dev,
  libgnutls28-dev,
- libknot-dev (>= 2.9),
+ libknot-dev (>= 3.0.2),
  liblmdb-dev,
  libluajit-5.1-dev,
  libnghttp2-dev,

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index eb36056b439d7749d2b84e60e65b7b916fe99eff..89f6ab1a255fd5efec8b72e5f950d274a6eb3405 100644 (file)
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -41,9 +41,9 @@ BuildRequires:  meson
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libknot) >= 2.9
-BuildRequires:  pkgconfig(libzscanner) >= 2.9
-BuildRequires:  pkgconfig(libdnssec) >= 2.9
+BuildRequires:  pkgconfig(libknot) >= 3.0.2
+BuildRequires:  pkgconfig(libzscanner) >= 3.0.2
+BuildRequires:  pkgconfig(libdnssec) >= 3.0.2
 BuildRequires:  pkgconfig(libnghttp2)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libcap-ng)

diff --git a/doc/build.rst b/doc/build.rst
index de6e2513a858e47d81b9b56496f50dc687537a76..75dfa882d97d4135d001b549d415e08cb9b1a8b2 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -33,7 +33,7 @@ The following dependencies are needed to build and run Knot Resolver:
    "meson >= 0.49", "*build only* [#]_"
    "C and C++ compiler", "*build only* [#]_"
    "`pkg-config`_", "*build only* [#]_"
-   "libknot_ 2.9+", "Knot DNS libraries"
+   "libknot_ 3.0.2+", "Knot DNS libraries"
    "LuaJIT_ 2.0+", "Embedded scripting language"
    "libuv_ 1.7+", "Multiplatform I/O and services"
    "lmdb", "Memory-mapped database for cache"

diff --git a/doc/upgrading.rst b/doc/upgrading.rst
index ae260a1707ebbab897d31501f73a613aadcce01a..75116565ceea76a36400bf75bd8769286c4c280d 100644 (file)
--- a/doc/upgrading.rst
+++ b/doc/upgrading.rst
@@ -28,6 +28,16 @@ newer versions when they are released.
 .. _`systemd`: https://systemd.io/
 .. _`supervisord`: http://supervisord.org/
 
+
+5.4 to 5.5
+==========
+
+Packagers & Developers
+----------------------
+
+* Knot DNS >= 3.0.2 is required.
+
+
 5.3 to 5.4
 ==========
 

diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c
index 5eba8177528d870694dd019932a9b80c926d759d..6fcf3a42d0acbfc9181603aac3fab13e7db9b6e0 100644 (file)
--- a/lib/dnssec/signature.c
+++ b/lib/dnssec/signature.c
@@ -274,11 +274,7 @@ int kr_check_signature(const knot_rdata_t *rrsig,
                goto fail;
        }
 
-       ret = dnssec_sign_verify(sign_ctx,
-               #if KNOT_VERSION_MAJOR >= 3
-                       false,
-               #endif
-                       &signature);
+       ret = dnssec_sign_verify(sign_ctx, false, &signature);
        if (ret != 0) {
                ret = kr_error(EBADMSG);
                goto fail;

diff --git a/meson.build b/meson.build
index 86e77fc0144f75bb2a6d504b706839ef5c7be82e..21a77d1d7cc08eb98e5eeebf238c810b9936c554 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@ endif
 
 
 message('--- required dependencies ---')
-knot_version = '>=2.9'
+knot_version = '>=3.0.2'
 libknot = dependency('libknot', version: knot_version)
 libdnssec = dependency('libdnssec', version: knot_version)
 libzscanner = dependency('libzscanner', version: knot_version)
@@ -110,8 +110,7 @@ else
 endif
 
 ### XDP: not configurable - we just check if libknot supports it
-xdp = meson.get_compiler('c').has_header('libknot/xdp/xdp.h'
-    ) and libknot.version().version_compare('>= 3.0.2')
+xdp = meson.get_compiler('c').has_header('libknot/xdp/xdp.h')
 
 ### Systemd
 systemd_files = get_option('systemd_files')