From ad4fdb5dbbdb51f8908d163f68d9007c401a266b Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 14 Aug 2018 14:24:54 +0200 Subject: [PATCH] update minimal libknot version to 2.7.1 --- .gitlab-ci.yml | 20 ++++++++++---------- ci/README.md | 2 +- distro/arch/PKGBUILD | 2 +- distro/deb/control | 2 +- distro/rpm/knot-resolver.spec | 2 +- doc/build.rst | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 639a87f72..91306776f 100644 --- 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 7b495ae15..802a7f088 100644 --- 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 3279abb0c..af867e9a4 100644 --- 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 cc9c4637a..3acb76f74 100644 --- 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 5a95921fa..2d2d549bf 100644 --- 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 6675b932d..446e67581 100644 --- 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." -- 2.47.2