update minimal libknot version to 2.7.1

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 639a87f7267e34f5b1b36a176b65c5417ea3693a..91306776f3b416d71191929fff5bcd614242fd51 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,7 +249,7 @@ test:linux:amd64:valgrind:
       -p $PRIORITY
       $(sudo -u respdiff /var/opt/respdiff/contrib/job_manager/create.py
       "$(git rev-parse --short HEAD)" -l gitlab --clean -t $RESPDIFF_TEST
-      --knot-branch 2.6)
+      --knot-branch 2.7)
     - cp -v $TESTDIR/j* ./
     - cat $TESTDIR/*_report.diffrepro.txt
     - grep -q "^target disagrees.*$TARGET_DISAGREES %" $TESTDIR/*_report.diffrepro.txt
@@ -410,11 +410,11 @@ distro:fedora-27:
   dependencies:
     - srpm
   script:
-    # TODO remove once Knot DNS 2.7 packages are available from official distro repos
-    - curl -Lo knot-devel-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/367e753a5c72421667e46a7dd7aa1434/knot-devel-2.7.0-1.1.x86_64.rpm
-    - curl -Lo knot-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/cefbd41fdbe94223f4efbe23a96cb422/knot-2.7.0-1.1.x86_64.rpm
-    - curl -Lo knot-libs-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/4236bcb094c0e87687c2e2d5578a4073/knot-libs-2.7.0-1.1.x86_64.rpm
-    - mock --init --old-chroot -i knot-2.7.0-1.1.x86_64.rpm -i knot-libs-2.7.0-1.1.x86_64.rpm -i knot-devel-2.7.0-1.1.x86_64.rpm -r fedora-27-x86_64
+    # TODO remove once Knot DNS 2.7.1 packages are available from official distro repos
+    - curl -Lo knot-devel-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/a22685bd0c737be97af11351c099fc2d/knot-devel-2.7.1-1.1.x86_64.rpm
+    - curl -Lo knot-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/ed349a36e8b6aca6fc5fc8fd6eef699a/knot-2.7.1-1.1.x86_64.rpm
+    - curl -Lo knot-libs-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/4960c36e94053a8aaf0f237bb5310b53/knot-libs-2.7.1-1.1.x86_64.rpm
+    - mock --init --old-chroot -i knot-devel-2.7.1-1.1.x86_64.rpm -i knot-2.7.1-1.1.x86_64.rpm -i knot-libs-2.7.1-1.1.x86_64.rpm -r fedora-27-x86_64
     - mock --no-clean --old-chroot -r fedora-27-x86_64 --rebuild *.src.rpm
   after_script:
     - mv /var/lib/mock/fedora-27-x86_64/result fedora-27-x86_64
@@ -437,10 +437,10 @@ distro:epel-7:
     - srpm
   script:
     # TODO remove once Knot DNS 2.7 packages are available from official distro repos
-    - curl -Lo knot-devel-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/3db20cd3dd0fdc8242f62d629d1abb63/knot-devel-2.7.0-1.1.x86_64.rpm
-    - curl -Lo knot-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/0a3ca9f3cc1be9e72b4de73ae0e29bef/knot-2.7.0-1.1.x86_64.rpm
-    - curl -Lo knot-libs-2.7.0-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/11ecf4602a10c46eb9a6e2c50d7c48e1/knot-libs-2.7.0-1.1.x86_64.rpm
-    - mock --init --dnf --old-chroot -i knot-2.7.0-1.1.x86_64.rpm -i knot-libs-2.7.0-1.1.x86_64.rpm -i knot-devel-2.7.0-1.1.x86_64.rpm -r epel-7-x86_64
+    - curl -Lo knot-devel-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/780d01725c2d95f63251d32b5c81d571/knot-devel-2.7.1-1.1.x86_64.rpm
+    - curl -Lo knot-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/6abdad1de5e76b413f3089bce45efbed/knot-2.7.1-1.1.x86_64.rpm
+    - curl -Lo knot-libs-2.7.1-1.1.x86_64.rpm https://gitlab.labs.nic.cz/knot/knot-resolver/uploads/e80b25f25e379472530ea5b2ea00fac1/knot-libs-2.7.1-1.1.x86_64.rpm
+    - mock --init --dnf --old-chroot -i knot-devel-2.7.1-1.1.x86_64.rpm -i  knot-2.7.1-1.1.x86_64.rpm -i knot-libs-2.7.1-1.1.x86_64.rpm -r epel-7-x86_64
     - mock --no-clean --dnf --old-chroot -r epel-7-x86_64 --rebuild *.src.rpm || (cat /var/lib/mock/epel-7-x86_64/result/build.log; false)
   after_script:
     - mv /var/lib/mock/epel-7-x86_64/result epel-7-x86_64

diff --git a/ci/README.md b/ci/README.md
index 7b495ae15899a7ddf295be037c39a02fdc2d7f5d..802a7f0885be40f4ff285c3c3c93c88b8529ff00 100644 (file)
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ Docker Build
 * debian-stable / debian-unstable
 
 ```
-$ export KNOT_BRANCH=2.6
+$ export KNOT_BRANCH=2.7
 $ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-stable:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-stable
 $ docker build -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-unstable
 

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 3279abb0c0f11e9cf42c9c59f200dd83b9c49eb9..af867e9a41d37ab03c4dedd0aeee3fac45889849 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -13,7 +13,7 @@ options=(debug strip)
 install=install
 depends=('cmocka'
          'gnutls'
-         'knot>=2.6.7'
+         'knot>=2.7.1'
          'libedit'
          'libsystemd'
          'libuv'

diff --git a/distro/deb/control b/distro/deb/control
index cc9c4637a8585b2eb2b8c86ced36416e1603ca97..3acb76f7481820f9ff48536b9cf544f3b3c22d9b 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.6.7),
+ libknot-dev (>= 2.7.1),
  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 5a95921faf225ec9d49b695a5908526f5fba8c4a..2d2d549bfae3b2885b23c0c50b12b94a6883a4d8 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -37,7 +37,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libknot) >= 2.6.7
+BuildRequires:  pkgconfig(libknot) >= 2.7.1
 BuildRequires:  pkgconfig(libzscanner) >= 2.4.2
 BuildRequires:  pkgconfig(libdnssec) >= 2.3.1
 BuildRequires:  pkgconfig(libsystemd)

diff --git a/doc/build.rst b/doc/build.rst
index 6675b932d2db5f7dc52ae15786bd3368321acb70..446e6758137e907aa67526cdef6b70e78a64ef55 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -36,7 +36,7 @@ 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.6.7+", "*all*", "Knot DNS libraries - requires autotools, GnuTLS, ..."
+   "libknot_ 2.7.1+", "*all*", "Knot DNS libraries - requires autotools, GnuTLS, ..."
    "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."