From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 21 Jan 2020 09:13:03 +0000 (+0100)
Subject: - Explcitly enable dnstap for debian-stretch and buster
X-Git-Tag: auth-4.3.0-beta1~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ad9bdf22e58e95e892b46ebc72904d00592560;p=thirdparty%2Fpdns.git

- Explcitly enable dnstap for debian-stretch and buster
- Fix inconsistent ref to stretch vs buster in ubuntu-bionic
---

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 59e60b8081..2f0ffd17a1 100755
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -31,6 +31,7 @@ override_dh_auto_configure:
 		--with-libcap \
 		--with-libsodium \
 		--with-protobuf=yes \
+		--enable-dnstap \
 		--without-net-snmp \
 		--disable-silent-rules \
 		--with-service-user=pdns \
diff --git a/builder-support/debian/recursor/debian-stretch/control b/builder-support/debian/recursor/debian-stretch/control
index 0b23de49eb..289190b678 100644
--- a/builder-support/debian/recursor/debian-stretch/control
+++ b/builder-support/debian/recursor/debian-stretch/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 10~),
                libcap-dev,
                libluajit-5.1-dev,
                libprotobuf-dev,
+               libfstrm-dev,
                libsodium-dev,
                libssl-dev,
                libsystemd-dev [linux-any],
diff --git a/builder-support/debian/recursor/debian-stretch/rules b/builder-support/debian/recursor/debian-stretch/rules
index 59e60b8081..2f0ffd17a1 100755
--- a/builder-support/debian/recursor/debian-stretch/rules
+++ b/builder-support/debian/recursor/debian-stretch/rules
@@ -31,6 +31,7 @@ override_dh_auto_configure:
 		--with-libcap \
 		--with-libsodium \
 		--with-protobuf=yes \
+		--enable-dnstap \
 		--without-net-snmp \
 		--disable-silent-rules \
 		--with-service-user=pdns \
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
index e6d3c12d12..bf22d1dfab 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
@@ -9,11 +9,11 @@ RUN apt-get update && apt-get -y dist-upgrade
 @INCLUDE Dockerfile.debbuild-prepare
 
 @IF [ ! -z "$M_authoritative" ]
-ADD builder-support/debian/authoritative/debian-stretch/ pdns-${BUILDER_VERSION}/debian/
+ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
 @ENDIF
 
 @IF [ ! -z "$M_recursor" ]
-ADD builder-support/debian/recursor/debian-stretch/ pdns-recursor-${BUILDER_VERSION}/debian/
+ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
 @ENDIF
 
 @IF [ ! -z "$M_dnsdist" ]