From: Lukáš Ježek <lukas.jezek@nic.cz>
Date: Tue, 17 Dec 2019 07:59:06 +0000 (+0100)
Subject: packages: fix dependencies
X-Git-Tag: v5.0.0~17^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bea81d957fec2ae6f41245494f4ec54a0dbbce3;p=thirdparty%2Fknot-resolver.git

packages: fix dependencies
---

diff --git a/Dockerfile b/Dockerfile
index 8a7d3bc8e..0179b77d6 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-socket lua-http libssl-dev
+	libfstrm-dev luajit 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-socket lua-http
+ENV KNOT_RESOLVER_RUNTIME_DEPS liblmdb0 luajit libluajit-5.1-2 libuv1 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 e805172dd..da6511442 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-socket lua-http 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-http meson libssl-dev
 # documentation dependecies
 RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme
 
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 9f1d0fab3..32fa6ed59 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -56,6 +56,7 @@ BuildRequires:  lmdb-devel
 # Lua 5.1 version of the libraries have different package names
 Requires:       lua-basexx
 Requires:       lua-psl
+Requires:       lua-http
 Requires(pre):  shadow-utils
 %endif
 %if 0%{?fedora}