From: Vladimír Čunát Date: Mon, 3 Sep 2018 12:44:28 +0000 (+0200) Subject: Makefile: KNOT_MINVER 2.7.1 -> 2.7.2 X-Git-Tag: v3.1.0~20^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c8f701ac9294aee170650b65230e3701573cff4;p=thirdparty%2Fknot-resolver.git Makefile: KNOT_MINVER 2.7.1 -> 2.7.2 --- diff --git a/Makefile b/Makefile index 401945f0c..82221e991 100644 --- 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.1 +KNOT_MINVER := 2.7.2 $(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/ci/debian-unstable/Dockerfile b/ci/debian-unstable/Dockerfile index 3c473e89a..0f0658bdc 100644 --- a/ci/debian-unstable/Dockerfile +++ b/ci/debian-unstable/Dockerfile @@ -1,6 +1,6 @@ FROM debian:unstable MAINTAINER Knot Resolver -ARG KNOT_BRANCH=master +ARG KNOT_BRANCH=2.7 WORKDIR /root CMD ["/bin/bash"] diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD index af867e9a4..fd2ba6f9b 100644 --- a/distro/arch/PKGBUILD +++ b/distro/arch/PKGBUILD @@ -13,7 +13,7 @@ options=(debug strip) install=install depends=('cmocka' 'gnutls' - 'knot>=2.7.1' + 'knot>=2.7.2' 'libedit' 'libsystemd' 'libuv' diff --git a/distro/deb/control b/distro/deb/control index e3e612a6b..516712288 100644 --- a/distro/deb/control +++ b/distro/deb/control @@ -16,7 +16,7 @@ Build-Depends: libedit-dev, libgeoip-dev, libgnutls28-dev, - libknot-dev (>= 2.7.1), + libknot-dev (>= 2.7.2), 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 2d2d549bf..6c1a2519a 100644 --- a/distro/rpm/knot-resolver.spec +++ b/distro/rpm/knot-resolver.spec @@ -37,9 +37,9 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig(cmocka) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libedit) -BuildRequires: pkgconfig(libknot) >= 2.7.1 -BuildRequires: pkgconfig(libzscanner) >= 2.4.2 -BuildRequires: pkgconfig(libdnssec) >= 2.3.1 +BuildRequires: pkgconfig(libknot) >= 2.7.2 +BuildRequires: pkgconfig(libzscanner) >= 2.7.2 +BuildRequires: pkgconfig(libdnssec) >= 2.7.2 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(luajit) >= 2.0 diff --git a/doc/build.rst b/doc/build.rst index 446e67581..d638b68e8 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.7.1+", "*all*", "Knot DNS libraries - requires autotools, GnuTLS, ..." + "libknot_ 2.7.2+", "*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." diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh index 50a157714..f15306795 100755 --- a/scripts/bootstrap-depends.sh +++ b/scripts/bootstrap-depends.sh @@ -7,7 +7,7 @@ CMOCKA_TAG="cmocka-1.1.1" CMOCKA_URL="git://git.cryptomilk.org/projects/cmocka.git" LIBUV_TAG="v1.18.0" LIBUV_URL="https://github.com/libuv/libuv.git" -KNOT_TAG="v2.7.1" +KNOT_TAG="v2.7.2" KNOT_URL="https://github.com/CZ-NIC/knot.git" GMP_TAG="6.1.1" # GMP 6.1.2 is broken on Travis-CI GMP_URL="https://gmplib.org/download/gmp/gmp-${GMP_TAG}.tar.xz"