- 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 59e60b8081bb2fe21cf643779438c9a6d112c2d2..2f0ffd17a12d7c73c95a5ea288e19c8367f89197 100755 (executable)
--- 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 0b23de49eb6972198e22bbfccda66beddbf73562..289190b678b3033dbc99970cff7c20016fcb8a96 100644 (file)
--- 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 59e60b8081bb2fe21cf643779438c9a6d112c2d2..2f0ffd17a12d7c73c95a5ea288e19c8367f89197 100755 (executable)
--- 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 e6d3c12d129eda59707b84fa6816ff550bf020a1..bf22d1dfab8eae28f31446a356e5bcac3a9dbf66 100644 (file)
--- 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" ]