Add DNS over TLS and dnstap support to pkgs

diff --git a/builder b/builder
index 2071bc8dd58c4433f8b925678451c891c9037268..c218fa2c8b028d46e635fffb6d474e4ddcf375c6 160000 (submodule)
--- 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 ad366a51e8005469c49e3e06a1b8b6c60cb0a204..0c0688fe59e74c367d24564fc7a4c942ffafdb55 100644 (file)
--- 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 ce291770f6299252d9ff335ae02ae8ad1d788372..8645582c05bab8a8762bc6396a01a66a8a72864e 100755 (executable)
--- 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 e948d30ce60e51d0bf04febd7052fe8dad3fdc3a..7b65af41b8035ed5bf50a5de823d138364b6a8a4 100644 (file)
--- 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 a36fe5f5e855c22e8657be3ef9238af9c1de21a3..cda79ef7a833f2078d475aca6c86886555c146ba 100755 (executable)
--- 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 9cc878bbe74f87e08385ee6ae900474a551c575a..195fbff9bb74b5b2cb9d594013ce7ab74c0efaae 100644 (file)
--- 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 \