dnsdist: Enable the new YAML configuration in our packages

diff --git a/builder-support/debian/dnsdist/debian-bookworm/control b/builder-support/debian/dnsdist/debian-bookworm/control
index 023b966cfbecbde84615beecb7c3306ad5b462db..2521d8c70d56cb6ed1b590539d6493089c54ed8b 100644 (file)
--- a/builder-support/debian/dnsdist/debian-bookworm/control
+++ b/builder-support/debian/dnsdist/debian-bookworm/control
@@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 10),
                libwslay-dev,
                libxdp-dev [linux-any],
                pkg-config,
+               python3-yaml,
                ragel,
                systemd [linux-any]
 Standards-Version: 4.1.5

diff --git a/builder-support/debian/dnsdist/debian-bookworm/rules b/builder-support/debian/dnsdist/debian-bookworm/rules
index a633dc0f3e198da602d81b65132e1950a05e2ae5..5291c3bcb2500732240ab6b13beb660a00bbaf98 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-bookworm/rules
+++ b/builder-support/debian/dnsdist/debian-bookworm/rules
@@ -59,6 +59,7 @@ override_dh_auto_configure:
          --enable-dns-over-tls \
          --enable-dnscrypt \
          --enable-dnstap \
+         --enable-yaml \
          --with-ebpf \
          --with-gnutls \
          --with-h2o \

diff --git a/builder-support/debian/dnsdist/debian-buster/control b/builder-support/debian/dnsdist/debian-buster/control
index f42fa0ad13e9f651230a768bd50eba291a25616d..4259f478b12b0826c5a70a8ee25fa467ac2ef86a 100644 (file)
--- a/builder-support/debian/dnsdist/debian-buster/control
+++ b/builder-support/debian/dnsdist/debian-buster/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 10),
                libsystemd-dev [linux-any],
                libwslay-dev,
                pkg-config,
+               python3-yaml,
                ragel,
                systemd [linux-any]
 Standards-Version: 4.1.5

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 9202097f01e33a912f31bae280315678431878b5..3b732061a778cd75aa34fd9c269f2ae8b0ea97ba 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -52,6 +52,7 @@ override_dh_auto_configure:
          --enable-dns-over-tls \
          --enable-dnscrypt \
          --enable-dnstap \
+         --enable-yaml \
          --with-ebpf \
          --with-gnutls \
          --with-h2o \

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index 94438c308c86e8e103223b09e942171a8f930111..ffea154e97ddd3e66ff778eceee86aa6c3603c93 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -2,7 +2,7 @@ FROM alpine:3.18 as dnsdist
 ARG BUILDER_CACHE_BUSTER=
 
 RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
-                       libtool file boost-dev ragel python3 git libedit-dev bash
+                       libtool file boost-dev ragel python3 py3-yaml git libedit-dev bash
 
 ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
 ADD COPYING /dnsdist/

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 182b7887a2835917099a28cd665b58a2c55cac10..428e1ddfc3383839858f32225cb4adea1f6736e7 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -9,6 +9,7 @@ Source: %{name}-%{getenv:BUILDER_VERSION}.tar.bz2
 BuildRequires: readline-devel
 BuildRequires: libedit-devel
 BuildRequires: openssl-devel
+BuildRequires: python3-pyyaml
 
 %if 0%{?suse_version}
 BuildRequires: lua-devel
@@ -109,6 +110,7 @@ export RANLIB=gcc-ranlib
   --enable-dns-over-quic \
   --enable-dns-over-http3 \
   --with-quiche \
+  --enable-yaml \
 %endif
   PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/lib64/pkgconfig
 %endif