From b08abedabd5ec37e97b70f97c0b6209116ed260a Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 24 Apr 2019 12:32:09 +0200 Subject: [PATCH] dnsdist: Add DoH to buster, bionic and cosmic --- builder-support/debian/dnsdist/debian-buster/control | 2 ++ builder-support/debian/dnsdist/debian-buster/rules | 3 +++ builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic | 2 +- builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/builder-support/debian/dnsdist/debian-buster/control b/builder-support/debian/dnsdist/debian-buster/control index e2c4d98314..c43c7de31e 100644 --- a/builder-support/debian/dnsdist/debian-buster/control +++ b/builder-support/debian/dnsdist/debian-buster/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 10~), libedit-dev, libfstrm-dev, libgnutls28-dev, + libh2o-evloop-dev, libluajit-5.1-dev, libprotobuf-dev, libre2-dev, @@ -16,6 +17,7 @@ Build-Depends: debhelper (>= 10~), libsodium-dev, libssl-dev, libsystemd-dev [linux-any], + libwslay-dev, pkg-config, protobuf-compiler, ragel, diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules index af46da1b41..b248ff7a3c 100755 --- a/builder-support/debian/dnsdist/debian-buster/rules +++ b/builder-support/debian/dnsdist/debian-buster/rules @@ -28,6 +28,8 @@ override_dh_auto_clean: dh_auto_clean override_dh_auto_configure: + # LIBS has been added because Ubuntu Bionic and Cosmic don't have the fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908124 pulled in + LIBS='-lwslay' \ ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -37,6 +39,7 @@ override_dh_auto_configure: --infodir=\$${prefix}/share/info \ --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \ --libexecdir='$${prefix}/lib' \ + --enable-dns-over-https \ --enable-dns-over-tls \ --enable-dnscrypt \ --enable-dnstap \ diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic index 2b78f08e44..e6d3c12d12 100644 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic @@ -17,7 +17,7 @@ ADD builder-support/debian/recursor/debian-stretch/ pdns-recursor-${BUILDER_VERS @ENDIF @IF [ ! -z "$M_dnsdist" ] -ADD builder-support/debian/dnsdist/debian-stretch/ dnsdist-${BUILDER_VERSION}/debian/ +ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/ @ENDIF @INCLUDE Dockerfile.debbuild diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic index 590d73b4f7..158f47fd4b 100644 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic @@ -17,7 +17,7 @@ ADD builder-support/debian/recursor/debian-stretch/ pdns-recursor-${BUILDER_VERS @ENDIF @IF [ ! -z "$M_dnsdist" ] -ADD builder-support/debian/dnsdist/debian-stretch/ dnsdist-${BUILDER_VERSION}/debian/ +ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/ @ENDIF @INCLUDE Dockerfile.debbuild -- 2.47.2