]> granicus.if.org Git - pdns/commitdiff
dnsdist: Add DoH to buster, bionic and cosmic
authorPieter Lexis <pieter.lexis@powerdns.com>
Wed, 24 Apr 2019 10:32:09 +0000 (12:32 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Wed, 24 Apr 2019 10:32:09 +0000 (12:32 +0200)
builder-support/debian/dnsdist/debian-buster/control
builder-support/debian/dnsdist/debian-buster/rules
builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic

index e2c4d983144d235c5e409f1ec1cffce1c5c4b970..c43c7de31e6336b95822a940ae42a61441338d4c 100644 (file)
@@ -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,
index af46da1b419814d0cca77ab8f75d7c0146ab4ef9..b248ff7a3c1543e187e8c93094556efb4b59aba4 100755 (executable)
@@ -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 \
index 2b78f08e4453cfd3c453897be5ef9eb3466b81e6..e6d3c12d129eda59707b84fa6816ff550bf020a1 100644 (file)
@@ -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
index 590d73b4f764f803d7fe072da1bff1f526081645..158f47fd4b2a71c99ea607ddd72ec7c9c3a342a9 100644 (file)
@@ -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