From: Petr Špaček <petr.spacek@nic.cz>
Date: Tue, 22 Oct 2019 12:57:03 +0000 (+0200)
Subject: doh debug: package debug_opensslkeylog.so
X-Git-Tag: v4.3.0~8^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb9a207f75a58a412ed9cb391eac62188d2f49d;p=thirdparty%2Fknot-resolver.git

doh debug: package debug_opensslkeylog.so
---

diff --git a/Dockerfile b/Dockerfile
index 46af77831..7ce2d461c 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
+	libfstrm-dev luajit lua-sec lua-socket 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 && \
diff --git a/distro/deb/control b/distro/deb/control
index dc45172dc..05c98eea4 100644
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -21,6 +21,7 @@ Build-Depends:
  python3-breathe,
  python3-sphinx,
  python3-sphinx-rtd-theme,
+ libssl-dev,
 Homepage: https://www.knot-resolver.cz/
 
 Package: knot-resolver
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 81d4ca485..0b52a3559 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -71,6 +71,12 @@ Requires:       lua-socket-compat
 Requires:       lua-sec-compat
 Requires(pre):  shadow-utils
 %endif
+
+# we do not build HTTP module on SuSE so the build requires is not needed
+%if "x%{?suse_version}" == "x"
+BuildRequires:  openssl-devel
+%endif
+
 %if 0%{?suse_version}
 %define NINJA ninja
 BuildRequires:  lmdb-devel
@@ -189,6 +195,7 @@ rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/etcd.lua
 %if 0%{?suse_version}
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/experimental_dot_auth.lua
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http
+rm -r %{buildroot}%{_libdir}/knot-resolver/debug_opensslkeylog.so
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http*.lua
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
 rm %{buildroot}%{_unitdir}/kresd@.service.d/module-http.conf
@@ -309,6 +316,7 @@ systemctl daemon-reload
 %{_unitdir}/kresd-doh.socket
 %{_unitdir}/kresd-webmgmt.socket
 %endif
+%{_libdir}/knot-resolver/debug_opensslkeylog.so
 %{_libdir}/knot-resolver/kres_modules/http
 %{_libdir}/knot-resolver/kres_modules/http*.lua
 %{_libdir}/knot-resolver/kres_modules/prometheus.lua