]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
doh debug: package debug_opensslkeylog.so
authorPetr Špaček <petr.spacek@nic.cz>
Tue, 22 Oct 2019 12:57:03 +0000 (14:57 +0200)
committerTomas Krizek <tomas.krizek@nic.cz>
Wed, 20 Nov 2019 12:17:38 +0000 (13:17 +0100)
Dockerfile
distro/deb/control
distro/rpm/knot-resolver.spec

index 46af77831834a626cb000a4665a4f3536860be61..7ce2d461c8d1d53dede92ea8d420ee3d622e00a7 100644 (file)
@@ -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 && \
index dc45172dcd434834543311ca620659d4cf5d0f12..05c98eea446763a35829b3520e6099c9794db89a 100644 (file)
@@ -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
index 81d4ca485ab9d6c2b29e34903d48ad59ec69f230..0b52a35597dff18315278b50861ec17cdaf13e25 100644 (file)
@@ -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