meson: update dependencies

diff --git a/.travis.yml b/.travis.yml
index 7ca10c1e0a4e7f9e6dc202e94329ad001e3c8935..ff6155089504d72259cc9e185f180f2d1393fc0c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
     fast_finish: true
 env:
     global:
-        - KNOT_DNS_VERSION=v2.7.2
+        - KNOT_DNS_VERSION=v2.7.6
         - DYLD_LIBRARY_PATH="${HOME}/.local/lib"
         - MALLOC_CHECK_=3
         - MALLOC_PERTURB_=223

diff --git a/Dockerfile b/Dockerfile
index 3c3c12570c582e7f23a839d736781ca5025c60d3..99cfd47a68e9a8a088bbe7b881883b63c2face2e 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Intermediate container for Knot DNS build (not persistent)
 FROM debian:stable AS knot-dns-build
-ARG KNOT_DNS_VERSION=v2.7.2
+ARG KNOT_DNS_VERSION=v2.7.6
 
 # Build dependencies
 ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \

diff --git a/Makefile b/Makefile
index 82221e99156d6042e22d2ecbae6558c41c1253c7..cf350aa80f01bf9f18dfb21bdf7ee9e4d7625f43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ lint-lua: $(patsubst %.lua.in,%.lua,$(wildcard */*/*.lua.in))
 .PHONY: all install check clean doc info lint
 
 # Dependencies
-KNOT_MINVER := 2.7.2
+KNOT_MINVER := 2.7.6
 $(eval $(call find_lib,libknot,$(KNOT_MINVER),yes))
 $(eval $(call find_lib,libdnssec,$(KNOT_MINVER),yes))
 $(eval $(call find_lib,libzscanner,$(KNOT_MINVER),yes))

diff --git a/NEWS b/NEWS
index 83b12164ba84dc191f08f227b5051622d283f021..1f8147f9f1a66327ab2d1ddb09866029961d9a8c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Knot Resolver 3.x.y (2019-0m-dd)
 ================================
 
+Incompatible changes
+--------------------
+- libknot >= 2.7.6 is required
+
 Improvements
 ------------
 - policy.TLS_FORWARD: if hostname is configured, send it on wire (!759)

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 87f8aa73c5c6fbd301fe2815b08a39604beebac2..cd11a965908b1ce7c29484cebeac0c072ebc5321 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -14,7 +14,7 @@ install=install
 depends=('cmocka'
          'dnssec-anchors'
          'gnutls'
-         'knot>=2.7.2'
+         'knot>=2.7.6'
          'libedit'
          'libsystemd'
          'libuv'

diff --git a/distro/deb/control b/distro/deb/control
index 84b2f90e817a2add7e72558178161a2fe00a1689..c61cfc3d951503c6fa335070be2255852aabb56a 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -16,7 +16,7 @@ Build-Depends:
  libedit-dev,
  libgeoip-dev,
  libgnutls28-dev,
- libknot-dev (>= 2.7.2),
+ libknot-dev (>= 2.7.6),
  liblmdb-dev,
  libluajit-5.1-dev,
  libsystemd-dev (>= 227) [linux-any],

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 57eb1e82f4cb173aa538019eeb7628f8f1954282..8bf11464fe358d2be0822261ce2cdcca13c962d5 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -38,9 +38,9 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libknot) >= 2.7.2
-BuildRequires:  pkgconfig(libzscanner) >= 2.7.2
-BuildRequires:  pkgconfig(libdnssec) >= 2.7.2
+BuildRequires:  pkgconfig(libknot) >= 2.7.6
+BuildRequires:  pkgconfig(libzscanner) >= 2.7.6
+BuildRequires:  pkgconfig(libdnssec) >= 2.7.6
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(luajit) >= 2.0

diff --git a/doc/build.rst b/doc/build.rst
index 55667a4e919c657cbb6e5870c2b844d3fb054a24..99f2c92501f2064bbbaa6bd5081732c245ccca02 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -36,10 +36,11 @@ The following is a list of software required to build Knot Resolver from sources
    "C and C++ compiler", "*all*", "*(build only)* [#]_"
    "`pkg-config`_", "*all*", "*(build only)* [#]_"
    "hexdump or xxd", "``daemon``", "*(build only)*"
-   "libknot_ 2.7.2+", "*all*", "Knot DNS libraries - requires autotools, GnuTLS, ..."
+   "libknot_ 2.7.6+", "*all*", "Knot DNS libraries"
    "LuaJIT_ 2.0+", "``daemon``", "Embedded scripting language."
-   "libuv_ 1.7+", "``daemon``", "Multiplatform I/O and services (libuv_ 1.0 with limitations [#]_)."
-   "lmdb", "``daemon``", "If missing, a static version is embedded."
+   "libuv_ 1.7+", "*all*", "Multiplatform I/O and services."
+   "lmdb", "*all*", ""
+   "GnuTLS", "*all*", ""
 
 There are also *optional* packages that enable specific functionality in Knot Resolver, they are useful mainly for developers to build documentation and tests.
 

diff --git a/lib/meson.build b/lib/meson.build
index d3fd8c81edb145ecb665c2535c9289d390a06558..bb75befd549b9d481e33b0f6824195000cb34642 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -64,7 +64,6 @@ libkres_lib = library('kres',
   dependencies: [
     contrib_dep,
     libuv,
-    luajit,
     lmdb,
     libknot,
     libdnssec,

diff --git a/meson.build b/meson.build
index d7fa8068ec21489a4198eaf8caed9ce8d4e605a1..23213d3b1a3ca321d0db36b08c5db874dc643530 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ libkres_soversion = 9
 modules_dir = join_paths(get_option('libdir'), 'kdns_modules')
 
 
-# Dependencies
+# Project-wide dependencies
 
 knot_version = '>=2.7.6'
 libknot = dependency('libknot', version: knot_version)