From: Lukáš Ježek Date: Fri, 6 Dec 2019 13:19:44 +0000 (+0100) Subject: packages: remove lua-sec and add lua-http X-Git-Tag: v5.0.0~17^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6004ef8c881f895f199da0a35f6af43a28cd216f;p=thirdparty%2Fknot-resolver.git packages: remove lua-sec and add lua-http --- diff --git a/Dockerfile b/Dockerfile index 7ce2d461c..8a7d3bc8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \ libgnutls28-dev libprotobuf-dev libprotobuf-c-dev libfstrm-dev ENV KNOT_RESOLVER_BUILD_DEPS build-essential pkg-config bsdmainutils liblmdb-dev \ libluajit-5.1-dev libuv1-dev libprotobuf-dev libprotobuf-c-dev \ - libfstrm-dev luajit lua-sec lua-socket libssl-dev + libfstrm-dev luajit lua-socket lua-http libssl-dev ENV BUILDENV_DEPS ${KNOT_DNS_BUILD_DEPS} ${KNOT_RESOLVER_BUILD_DEPS} RUN echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list RUN apt-get update -qq && \ @@ -35,7 +35,7 @@ FROM debian:stable-slim AS runtime # Install runtime dependencies ENV KNOT_DNS_RUNTIME_DEPS libgnutls30 -ENV KNOT_RESOLVER_RUNTIME_DEPS liblmdb0 luajit libluajit-5.1-2 libuv1 lua-sec lua-socket +ENV KNOT_RESOLVER_RUNTIME_DEPS liblmdb0 luajit libluajit-5.1-2 libuv1 lua-socket lua-http ENV KNOT_RESOLVER_RUNTIME_DEPS_HTTP lua-http lua-mmdb ENV KNOT_RESOLVER_RUNTIME_DEPS_EXTRA libfstrm0 lua-cqueues ENV KNOT_RESOLVER_RUNTIME_DEPS_SSL ca-certificates diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile index 6056b0966..e805172dd 100644 --- a/ci/debian-buster/Dockerfile +++ b/ci/debian-buster/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -qq # RUN apt-get upgrade -y -qqq # Knot and Knot Resolver dependecies -RUN apt-get install -y -qqq git make cmake pkg-config build-essential bsdmainutils libtool autoconf liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev libuv1-dev libcmocka-dev libluajit-5.1-dev lua-sec lua-socket meson libssl-dev +RUN apt-get install -y -qqq git make cmake pkg-config build-essential bsdmainutils libtool autoconf liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev libuv1-dev libcmocka-dev libluajit-5.1-dev lua-socket lua-http meson libssl-dev # documentation dependecies RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme diff --git a/daemon/README.rst b/daemon/README.rst index 7f49556e4..c83e1e17e 100644 --- a/daemon/README.rst +++ b/daemon/README.rst @@ -415,6 +415,7 @@ distribution will take care of it for you. The format is standard zone file, though additional information may be persisted in comments. Either DS or DNSKEY records can be used for TAs. If the file does not exist, bootstrapping of *root* TA will be attempted. + If you want to use bootstrapping, install `lua-http`_ library. Each file can only contain records for a single domain. The TAs will be updated according to :rfc:`5011` and persisted in the file (if allowed). @@ -684,3 +685,4 @@ Code reference .. _`real process managers`: http://blog.crocodoc.com/post/48703468992/process-managers-the-good-the-bad-and-the-ugly .. _`socket activation`: http://0pointer.de/blog/projects/socket-activation.html .. _`dnsproxy module`: https://www.knot-dns.cz/docs/2.7/html/modules.html#dnsproxy-tiny-dns-proxy +.. _`lua-http`: https://luarocks.org/modules/daurnimator/http diff --git a/daemon/packaging/debian/10/rundeps b/daemon/packaging/debian/10/rundeps index df3df44b9..c5b81266e 100644 --- a/daemon/packaging/debian/10/rundeps +++ b/daemon/packaging/debian/10/rundeps @@ -1,6 +1,5 @@ adduser dns-root-data -lua-sec lua-socket systemd libc6 diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD index a94370360..c1609daa1 100644 --- a/distro/arch/PKGBUILD +++ b/distro/arch/PKGBUILD @@ -18,8 +18,6 @@ depends=( 'libedit' 'libuv' 'lmdb' - 'lua51-sec' - 'lua51-socket' 'luajit' 'systemd' 'libcap-ng' @@ -27,7 +25,7 @@ depends=( optdepends=( 'lua51-basexx: experimental_dot_auth module', 'lua51-cqueues: http and dns64 module, policy.rpz() function', - 'lua51-http: http module', + 'lua51-http: http and prefill modules, trust_anchors bootstrap', 'lua51-psl: policy.slice_randomize_psl() function', ) makedepends=( diff --git a/distro/deb/control b/distro/deb/control index 9f519962e..dfeb5568f 100644 --- a/distro/deb/control +++ b/distro/deb/control @@ -30,7 +30,6 @@ Architecture: any Depends: adduser, dns-root-data, - lua-sec, lua-socket, systemd, ${misc:Depends}, @@ -42,6 +41,7 @@ Breaks: Recommends: lua-basexx, lua-cqueues, + lua-http, lua-psl, Suggests: knot-resolver-module-http, diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec index c22b1f672..ad5252702 100644 --- a/distro/rpm/knot-resolver.spec +++ b/distro/rpm/knot-resolver.spec @@ -57,7 +57,6 @@ BuildRequires: lmdb-devel Requires: lua-basexx Requires: lua-psl Requires: lua-socket -Requires: lua-sec Requires(pre): shadow-utils %endif %if 0%{?fedora} @@ -65,9 +64,9 @@ BuildRequires: pkgconfig(lmdb) BuildRequires: python3-sphinx Requires: lua5.1-basexx Requires: lua5.1-cqueues +Requires: lua5.1-http Recommends: lua5.1-psl Requires: lua-socket-compat -Requires: lua-sec-compat Requires(pre): shadow-utils %endif @@ -81,7 +80,6 @@ BuildRequires: openssl-devel BuildRequires: lmdb-devel BuildRequires: python3-Sphinx Requires: lua51-luasocket -Requires: lua51-luasec Requires(pre): shadow %endif diff --git a/distro/turris/Makefile b/distro/turris/Makefile index 57f08ed6b..fb7f500ee 100644 --- a/distro/turris/Makefile +++ b/distro/turris/Makefile @@ -30,7 +30,7 @@ define Package/knot-resolver SUBMENU:=IP Addresses and Names TITLE:=Knot DNS Resolver URL:=https://gitlab.labs.nic.cz/knot/resolver - DEPENDS=+knot-libs +knot-libzscanner +libuv +luajit +dnssec-rootkey +resolver-conf +luasec +luasocket +libstdcpp + DEPENDS=+knot-libs +knot-libzscanner +libuv +luajit +dnssec-rootkey +resolver-conf +luasocket +libstdcpp PROVIDES:=dns-resolver endef diff --git a/modules/prefill/README.rst b/modules/prefill/README.rst index 024dc06d0..111378949 100644 --- a/modules/prefill/README.rst +++ b/modules/prefill/README.rst @@ -36,6 +36,7 @@ Only root zone import is supported at the moment. Dependencies ^^^^^^^^^^^^ -Depends on the luasec_ library. +Depends on the prefill-lua-http_ and luafilesystem_ libraries. -.. _luasec: https://luarocks.org/modules/brunoos/luasec +.. _prefill-lua-http: https://luarocks.org/modules/daurnimator/http +.. _luafilesystem: https://keplerproject.github.io/luafilesystem/ diff --git a/modules/prefill/packaging/rundeps b/modules/prefill/packaging/rundeps new file mode 100644 index 000000000..c557cb28e --- /dev/null +++ b/modules/prefill/packaging/rundeps @@ -0,0 +1 @@ +lua-http