migrate to Knot DNS 2.8

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 047ed79d05a43774a71cc53f282f68c4fac7d470..7944c61ace6c77cf44acf3fd84b7aa78475f0fbd 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
   RESPDIFF_COUNT: 1
   RESPDIFF_FORCE: 0
   RESPERF_FORCE: 0
-  KNOT_VERSION: '2.7'
+  KNOT_VERSION: '2.8'
   LIBKRES_ABI: 9
   LIBKRES_NAME: libkres
   MESON_TEST: meson test -C build_ci* -t 2 --print-errorlogs
@@ -335,7 +335,7 @@ pytests:
       -p $RESPDIFF_PRIORITY
       -c $RESPDIFF_COUNT
       $(sudo -u respdiff /var/opt/respdiff/contrib/job_manager/create.py
-      "$(git rev-parse --short HEAD)" -l $LABEL -t $RESPDIFF_TEST
+      "$(git rev-parse --short HEAD)" -l $LABEL -t $RESPDIFF_TEST --knot-branch=$KNOT_VERSION
       --respdiff-stats /var/tmp/respdiff-jobs/ref_current/*_${RESPDIFF_TEST}_stats.json)
     - for f in $TESTDIR/*.json; do test -s "$f" || (cat $TESTDIR/*stderr*; exit 1); done
     - sudo -u respdiff /var/opt/respdiff/contrib/job_manager/plot_ref.sh $TESTDIR/.. /var/tmp/respdiff-jobs/ref_current $RESPDIFF_TEST

diff --git a/.travis.yml b/.travis.yml
index 9bf6c3e0f168e9f604f464e7647cd9cdbb02882d..f6617ac9b97cefa048f083e9c1ec6607b869221a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     fast_finish: true
 env:
     global:
-        - KNOT_DNS_VERSION=2.7
+        - KNOT_DNS_VERSION=2.8
         - MALLOC_CHECK_=3
         - MALLOC_PERTURB_=223
 before_script:

diff --git a/Dockerfile b/Dockerfile
index 6cfe08ada9df1abda419c14b20bfde70c0f622d1..7b7663e496dad873f61d84323632ab933c8d8ac9 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.6
+ARG KNOT_DNS_VERSION=v2.8.0
 
 # Build dependencies
 ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \

diff --git a/NEWS b/NEWS
index 8e0da5813a466ba11aba83e43b80d63af1a84361..8f62a696d2f53df0f152b6361c560d155fc7aa8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Incompatible changes
 - default modules dir location has changed
 - DNSSEC is enabled by default
 - upstream packages for Debian now require systemd
+- libknot >= 2.8 is required
 
 Improvements
 ------------

diff --git a/ci/README.md b/ci/README.md
index 5fdbc8e103ca409d1dc8a30e218b0e81613f1b68..6807c3d60e2eceda644c3b9167cfb5e1c22448a8 100644 (file)
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ Docker Build
 * debian-buster
 
 ```
-$ export KNOT_BRANCH=2.7
+$ export KNOT_BRANCH=2.8
 $ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-buster
 
 $ docker login registry.labs.nic.cz

diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile
index cd4745e1010d0a2c827c1a33f96f0082989d91ab..f7deaf56348c674c850b1785d486743947147f3b 100644 (file)
--- a/ci/debian-buster/Dockerfile
+++ b/ci/debian-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM debian:buster-20190204
+FROM debian:buster-20190228
 MAINTAINER Knot Resolver <knot-resolver@labs.nic.cz>
-ARG KNOT_BRANCH=2.7
+ARG KNOT_BRANCH=2.8
 
 WORKDIR /root
 CMD ["/bin/bash"]

diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
index 9a7ec341fc7f261deb5c38719f704550f204fd78..10c9e3dd5f4fc1ca35feed3c2efc5b8dbd87cc61 100644 (file)
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@ -406,6 +406,7 @@ struct zs_scanner {
                _Bool automatic;
                void (*record)(zs_scanner_t *);
                void (*error)(zs_scanner_t *);
+               void (*comment)(zs_scanner_t *);
                void *data;
        } process;
        struct {

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index fdab0d505e3e9a6ed99a947b7738a25dffbb7c30..3668eed4eefb0b73e419251660dcd35c470ef9a2 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -14,7 +14,7 @@ install=install
 depends=(
     'dnssec-anchors'
     'gnutls'
-    'knot>=2.7.6'
+    'knot>=2.8'
     'libedit'
     'libuv'
     'lmdb'

diff --git a/distro/deb/control b/distro/deb/control
index f568552ddf5d6a633c7e16ee3820d67b475e2be6..f0dc9ae8917c91b3ab4279aed8e08782f35985c5 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -9,7 +9,7 @@ Build-Depends:
  libcmocka-dev (>= 1.0.0),
  libedit-dev,
  libgnutls28-dev,
- libknot-dev (>= 2.7.6),
+ libknot-dev (>= 2.8),
  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 92078e813e90d47cab9c1f4b779be62586eedd8c..b9f963002394ce59bd219fec5650eed7566575af 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -40,9 +40,9 @@ BuildRequires:  meson
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libknot) >= 2.7.6
-BuildRequires:  pkgconfig(libzscanner) >= 2.7.6
-BuildRequires:  pkgconfig(libdnssec) >= 2.7.6
+BuildRequires:  pkgconfig(libknot) >= 2.8
+BuildRequires:  pkgconfig(libzscanner) >= 2.8
+BuildRequires:  pkgconfig(libdnssec) >= 2.8
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(luajit) >= 2.0

diff --git a/doc/build.rst b/doc/build.rst
index 286360636630b477f72bb877a07b94db1316a80f..25ccda727b16bee01a41e162facf01eb547e6f12 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -33,7 +33,7 @@ The following is a list of dependencies needed to build and run Knot Resolver.
    "meson >= 0.46", "*all*", "*(build only)* [#]_"
    "C and C++ compiler", "*all*", "*(build only)* [#]_"
    "`pkg-config`_", "*all*", "*(build only)* [#]_"
-   "libknot_ 2.7.6+", "*all*", "Knot DNS libraries"
+   "libknot_ 2.8+", "*all*", "Knot DNS libraries"
    "LuaJIT_ 2.0+", "*all*", "Embedded scripting language."
    "libuv_ 1.7+", "*all*", "Multiplatform I/O and services."
    "lmdb", "*all*", "Memory-mapped database for cache"

diff --git a/meson.build b/meson.build
index 19158a319807f2c5e43bbcfc0a7a3018e0327d32..b565f1790a3f2c90a9d52d258ae1340b3c57400c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ project(
 
 
 message('--- required dependencies ---')
-knot_version = '>=2.7.6'
+knot_version = '>=2.8'
 libknot = dependency('libknot', version: knot_version)
 libdnssec = dependency('libdnssec', version: knot_version)
 libzscanner = dependency('libzscanner', version: knot_version)