From: Tomas Krizek Date: Wed, 27 Feb 2019 12:07:35 +0000 (+0100) Subject: migrate to Knot DNS 2.8 X-Git-Tag: v4.0.0~24^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d70a9c84b8bf34be79f4cc2a4e411f9c2730b2;p=thirdparty%2Fknot-resolver.git migrate to Knot DNS 2.8 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 047ed79d0..7944c61ac 100644 --- 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 9bf6c3e0f..f6617ac9b 100644 --- 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 6cfe08ada..7b7663e49 100644 --- 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 8e0da5813..8f62a696d 100644 --- 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 5fdbc8e10..6807c3d60 100644 --- 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 cd4745e10..f7deaf563 100644 --- 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 -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 9a7ec341f..10c9e3dd5 100644 --- 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 fdab0d505..3668eed4e 100644 --- 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 f568552dd..f0dc9ae89 100644 --- 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 92078e813..b9f963002 100644 --- 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 286360636..25ccda727 100644 --- 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 19158a319..b565f1790 100644 --- 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)