Add dnstap and DNS-over-TLS to jessie (and fix pkgs)

diff --git a/builder-support/debian/dnsdist/debian-jessie/control b/builder-support/debian/dnsdist/debian-jessie/control
index 7dd5165b64a21cc7b30b2a90d813b79f5b239126..38ce9360456132a7b43e0d276028b548d407b505 100644 (file)
--- a/builder-support/debian/dnsdist/debian-jessie/control
+++ b/builder-support/debian/dnsdist/debian-jessie/control
@@ -4,12 +4,14 @@ Priority: optional
 Maintainer: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
 Uploaders: Christian Hofstaedtler <zeha@debian.org>
 Build-Depends: debhelper (>= 9~),
+               dh-systemd,
                libboost-dev,
                libedit-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-jessie/dnsdist.install b/builder-support/debian/dnsdist/debian-jessie/dnsdist.install
new file mode 100644 (file)
index 0000000..dacedef
--- /dev/null
+++ b/builder-support/debian/dnsdist/debian-jessie/dnsdist.install
@@ -0,0 +1,2 @@
+usr/bin/dnsdist
+lib/systemd/system/dnsdist*

diff --git a/builder-support/debian/dnsdist/debian-jessie/rules b/builder-support/debian/dnsdist/debian-jessie/rules
index 6ca38145ef12cde3d9d405f1cf350dcd47355294..6fdf1522109c590aef165f0cdb95f503a74bd104 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-jessie/rules
+++ b/builder-support/debian/dnsdist/debian-jessie/rules
@@ -21,7 +21,7 @@ endif
 
 
 %:
-       dh $@
+       dh $@ --with systemd
 
 override_dh_auto_clean:
        rm -f dnslabeltext.cc
@@ -37,6 +37,8 @@ override_dh_auto_configure:
          --infodir=\$${prefix}/share/info \
          --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
          --libexecdir='$${prefix}/lib' \
+         --disable-gnutls \
+         --enable-dns-over-tls \
          --enable-dnscrypt \
          --enable-libsodium \
          --enable-re2 \
@@ -49,7 +51,7 @@ override_dh_auto_build-arch:
        dh_auto_build -- V=1
 
 override_dh_install:
-       dh_auto_install
+       dh_install
        echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
        perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
@@ -64,8 +66,9 @@ override_dh_installexamples:
        dh_installexamples
        rm -f dnsdist.conf
 
-override_dh_installinit:
-       # do nothing here. avoids referencing a non-existant init script.
-
 override_dh_strip:
        dh_strip --dbg-package=dnsdist-dbg
+
+override_dh_installinit:
+       dh_installinit
+       dh_systemd_start -pdnsdist --restart-after-upgrade dnsdist.service