From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 26 Mar 2018 17:40:36 +0000 (+0200)
Subject: Add DNS over TLS and dnstap support to pkgs
X-Git-Tag: dnsdist-1.3.3~83^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6976b6a0ecaa0234ffb28e5c7e7f24fcd31b6df3;p=pdns

Add DNS over TLS and dnstap support to pkgs
---

diff --git a/builder b/builder
index 2071bc8dd..c218fa2c8 160000
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit 2071bc8dd58c4433f8b925678451c891c9037268
+Subproject commit c218fa2c8b028d46e635fffb6d474e4ddcf375c6
diff --git a/builder-support/debian/dnsdist/debian-stretch/control b/builder-support/debian/dnsdist/debian-stretch/control
index ad366a51e..0c0688fe5 100644
--- a/builder-support/debian/dnsdist/debian-stretch/control
+++ b/builder-support/debian/dnsdist/debian-stretch/control
@@ -6,10 +6,13 @@ Uploaders: Christian Hofstaedtler <zeha@debian.org>
 Build-Depends: debhelper (>= 10~),
                libboost-dev,
                libedit-dev,
+               libfstrm-dev,
+               libgnutls28-dev,
                libluajit-5.1-dev,
                libprotobuf-dev,
                libre2-dev,
                libsodium-dev,
+               libssl-dev,
                libsystemd-dev [linux-any],
                pkg-config,
                protobuf-compiler,
diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index ce291770f..8645582c0 100755
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -37,7 +37,10 @@ override_dh_auto_configure:
 	  --infodir=\$${prefix}/share/info \
 	  --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 	  --libexecdir='$${prefix}/lib' \
+	  --enable-dns-over-tls \
 	  --enable-dnscrypt \
+	  --enable-fstrm \
+	  --enable-gnutls \
 	  --enable-libsodium \
 	  --enable-re2 \
 	  --with-ebpf \
diff --git a/builder-support/debian/dnsdist/ubuntu-trusty/control b/builder-support/debian/dnsdist/ubuntu-trusty/control
index e948d30ce..7b65af41b 100644
--- a/builder-support/debian/dnsdist/ubuntu-trusty/control
+++ b/builder-support/debian/dnsdist/ubuntu-trusty/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9~),
                libedit-dev,
                libluajit-5.1-dev,
                libprotobuf-dev,
+               libssl-dev,
                pkg-config,
                protobuf-compiler,
                ragel
diff --git a/builder-support/debian/dnsdist/ubuntu-trusty/rules b/builder-support/debian/dnsdist/ubuntu-trusty/rules
index a36fe5f5e..cda79ef7a 100755
--- a/builder-support/debian/dnsdist/ubuntu-trusty/rules
+++ b/builder-support/debian/dnsdist/ubuntu-trusty/rules
@@ -30,8 +30,10 @@ override_dh_auto_configure:
 	  --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 	  --libexecdir='$${prefix}/lib' \
 	  --disable-dnscrypt \
+	  --disable-gnutls \
 	  --disable-libsodium \
 	  --disable-re2 \
+	  --enable-dns-over-tls \
 	  --with-ebpf \
 	  --with-luajit \
 	  --with-protobuf \
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 9cc878bbe..195fbff9b 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -8,6 +8,8 @@ Group: System/DNS
 Source: dnsdist-%{version}.tar.bz2
 BuildRequires: readline-devel
 BuildRequires: libedit-devel
+BuildRequires: openssl-devel
+BuildRequires: gnutls-devel
 
 %if 0%{?el6}
 BuildRequires: boost148-devel
@@ -43,6 +45,7 @@ Requires(pre): shadow
 %endif
 %if 0%{?rhel} >= 7
 Requires(pre): shadow-utils
+BuildRequires: fstrm-devel
 %systemd_requires
 %endif
 
@@ -58,6 +61,8 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
 %build
 %configure \
   --sysconfdir=/etc/dnsdist \
+  --enable-dns-over-tls \
+  --enable-gnutls \
 %if 0%{?el6}
   --disable-dnscrypt \
   --disable-libsodium \
@@ -75,6 +80,7 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   --without-net-snmp
 %endif
 %if 0%{?rhel} >= 7
+  --enable-fstrm \
   --with-protobuf \
   --with-luajit \
   --enable-libsodium \