builder-support: Build dnsdist with Quiche for DNS over QUIC support

Except on el-7 where the `clang` version needed to build the
`boring-sys`crate for `Quiche` is too old.

diff --git a/builder-support/debian/dnsdist/debian-buster/copyright b/builder-support/debian/dnsdist/debian-buster/copyright
index 761250f2bf675a0b59768614606cd656edb5f2d5..5fbb6020690755164658f2e0517a290d416ebfe4 100644 (file)
--- a/builder-support/debian/dnsdist/debian-buster/copyright
+++ b/builder-support/debian/dnsdist/debian-buster/copyright
@@ -77,6 +77,10 @@ Files: src_js/rickshaw.js
 Copyright: 2011-2014 by Shutterstock Images, LLC
 License: Expat
 
+Files: */libdnsdist-quiche.so
+Copyright: 2018-2019, Cloudflare, Inc.
+License: BSD-2-clause
+
 License: Unlicense
  This is free and unencumbered software released into the public domain.
  .
@@ -144,6 +148,26 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index e9a2a8cf1a36a93b8cafa9ed314a327b0acd3e83..6f96e26978796dc945c2089bcd57b4b033189f11 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -49,16 +49,18 @@ override_dh_auto_configure:
          --libexecdir='$${prefix}/lib' \
          --enable-lto=thin \
          --enable-dns-over-https \
+         --enable-dns-over-quic \
          --enable-dns-over-tls \
          --enable-dnscrypt \
          --enable-dnstap \
+         --with-ebpf \
          --with-gnutls \
          --with-h2o \
          --with-net-snmp \
          --with-libcap \
          --with-libsodium \
+         --with-quiche \
          --with-re2 \
-         --with-ebpf \
          --with-service-user='_dnsdist' \
          --with-service-group='_dnsdist' \
          $(CONFIGURE_ARGS)
@@ -68,6 +70,7 @@ override_dh_auto_build-arch:
 
 override_dh_install:
        dh_auto_install
+       install -Dm644 /usr/lib/libdnsdist-quiche.so debian/dnsdist/usr/lib/libdnsdist-quiche.so
 ifeq ($(DEB_HOST_ARCH_BITS),32)
        echo RestrictAddressFamilies is broken on 32bit, removing it from service file
        perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
index bf86ab18bd36f34e07cface9ccfb8c98a654c721..64a5d401c5cfacd722f71f8b399f794cabcf4a0c 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.debbuild-prepare
+++ b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
@@ -12,6 +12,12 @@ ADD builder-support/helpers/ /pdns/builder-support/helpers/
 RUN /pdns/builder-support/helpers/install_rust.sh
 @ENDIF
 
+@IF [ -n "$M_dnsdist$M_all" ]
+RUN /pdns/builder-support/helpers/install_rust.sh
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends git cmake clang
+RUN /pdns/builder-support/helpers/install_quiche.sh
+@ENDIF
+
 # Used for -p option to only build specific packages
 ARG BUILDER_PACKAGE_MATCH
 

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 82334e51f1d206e7773ac16deae437ae377f6606..9ec0f3c4ed3a041cc455f0bda2c99888faa0392a 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -19,6 +19,16 @@ ADD builder-support/helpers/ /pdns/builder-support/helpers/
 RUN /pdns/builder-support/helpers/install_rust.sh
 @ENDIF
 
+@IF [ -n "$M_dnsdist$M_all" ]
+RUN /pdns/builder-support/helpers/install_rust.sh
+# We do not build Quiche (DNS over QUIC support) on el-7 because the clang
+# version is too old to build the 'boring-sys' crate needed by Quiche
+RUN if ! $(grep -q 'release 7' /etc/redhat-release); then \
+      yum install -y git cmake clang; \
+      /pdns/builder-support/helpers/install_quiche.sh; \
+    fi
+@ENDIF
+
 # Used for -p option to only build specific spec files
 ARG BUILDER_PACKAGE_MATCH
 

diff --git a/builder-support/helpers/install_quiche.sh b/builder-support/helpers/install_quiche.sh
new file mode 100755 (executable)
index 0000000..1c0b559
--- /dev/null
+++ b/builder-support/helpers/install_quiche.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -v
+set -e
+
+readonly QUICHE_VERSION='0.18.0'
+readonly QUICHE_TARBALL="${QUICHE_VERSION}.tar.gz"
+readonly QUICHE_TARBALL_URL="https://github.com/cloudflare/quiche/archive/${QUICHE_TARBALL}"
+readonly QUICHE_TARBALL_HASH='eb242a14c4d801a90b57b6021dd29f7a62099f3a4d7a7ba889e105f8328e6c1f'
+
+cd /tmp
+echo $0: Downloading $QUICHE_TARBALL
+curl -L -o "${QUICHE_TARBALL}" "${QUICHE_TARBALL_URL}"
+# Line below should echo two spaces between digest and name
+echo "${QUICHE_TARBALL_HASH}"  "${QUICHE_TARBALL}" | sha256sum -c -
+tar xf "${QUICHE_TARBALL}"
+cd "quiche-${QUICHE_VERSION}"
+RUST_BACKTRACE=1 cargo build --release --no-default-features --features ffi,boringssl-boring-crate --package quiche
+install -Dm644 quiche/include/quiche.h /usr/include
+install -Dm644 target/release/libquiche.so /usr/lib/libdnsdist-quiche.so
+install -Dm644 /dev/stdin /usr/lib/pkgconfig/quiche.pc <<PC
+# quiche
+Name: quiche
+Description: quiche library
+URL: https://github.com/cloudflare/quiche
+Version: ${QUICHE_VERSION}
+Libs: -ldnsdist-quiche
+PC
+
+cd ..
+rm -rf "${QUICHE_TARBALL}" "quiche-${QUICHE_VERSION}"

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 6d64d3fee7a245d0ace9f89190385dd06e179507..920cb4aebb78278fd31d50166316a265458186ba 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -89,17 +89,21 @@ export RANLIB=gcc-ranlib
   --without-net-snmp
 %endif
 %if 0%{?rhel} >= 7
-  --with-gnutls \
-  --enable-dnstap \
-  --with-lua=%{lua_implementation} \
-  --with-libcap \
-  --with-libsodium \
   --enable-dnscrypt \
+  --enable-dnstap \
   --enable-dns-over-https \
   --enable-systemd --with-systemd=%{_unitdir} \
-  --with-re2 \
+  --with-gnutls \
+  --with-libcap \
+  --with-libsodium \
+  --with-lua=%{lua_implementation} \
   --with-net-snmp \
-  PKG_CONFIG_PATH=/opt/lib64/pkgconfig
+  --with-re2 \
+%if 0%{?rhel} >= 8
+  --enable-dns-over-quic \
+  --with-quiche \
+%endif
+  PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/lib64/pkgconfig
 %endif
 
 make %{?_smp_mflags}
@@ -110,6 +114,9 @@ make %{?_smp_mflags} check || (cat test-suite.log && false)
 %install
 %make_install
 install -d %{buildroot}/%{_sysconfdir}/dnsdist
+%if 0%{?rhel} >= 8
+install -Dm644 /usr/lib/libdnsdist-quiche.so %{buildroot}/%{_libdir}/libdnsdist-quiche.so
+%endif
 %{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf
 chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf
 
@@ -149,6 +156,9 @@ systemctl daemon-reload ||:
 %{!?_licensedir:%global license %%doc}
 %doc README.md
 %{_bindir}/*
+%if 0%{?rhel} >= 8
+%{_libdir}/libdnsdist-quiche.so
+%endif
 %{_mandir}/man1/*
 %dir %{_sysconfdir}/dnsdist
 %attr(-, root, dnsdist) %config(noreplace) %{_sysconfdir}/%{name}/dnsdist.conf