packages: remove lua-sec and add lua-http

diff --git a/Dockerfile b/Dockerfile
index 7ce2d461c8d1d53dede92ea8d420ee3d622e00a7..8a7d3bc8e09cae7949a592ec39bd7a4157530aff 100644 (file)
--- 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 6056b09661d33cab0fd1796882646e55e404365a..e805172ddda12a907f5801e68dfade3d86a3c565 100644 (file)
--- 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 7f49556e47594e755ad181f02016287786ca602d..c83e1e17ee1d5ada78cb60451157d95cfc400234 100644 (file)
--- 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 df3df44b96d455369875b5ef694a0690c5763e26..c5b81266e372f89f6fbdd379a9bb41980d281900 100644 (file)
--- 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 a943703609a0ca61ac548b040e28c04cd88d8af1..c1609daa1f0917e4d2c4cdeacf9757aca9358b78 100644 (file)
--- 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 9f519962ed502e648e702b938d0649bc44cf7d52..dfeb5568ffb8ca497808f7447d6569ecb28937f1 100644 (file)
--- 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 c22b1f672306da6f68cabaa138b3cc31649828c8..ad5252702ebba0d1165c131e38797fb6ae090da3 100644 (file)
--- 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 57f08ed6bef3c9d56f78ec2c33f1042e0955e6bb..fb7f500ee84d1af10b9aca410f852599d75ca760 100644 (file)
--- 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 024dc06d0b8d42dfb9777c860ed9f23afc294502..111378949462bb7924d4cef291c95ac8586a9848 100644 (file)
--- 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 (file)
index 0000000..c557cb2
--- /dev/null
+++ b/modules/prefill/packaging/rundeps
@@ -0,0 +1 @@
+lua-http