From a903101ff1eae136b4e4d1924c93459dfa5d2ac5 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 20 Jan 2025 10:50:17 +0100 Subject: [PATCH] dnsdist: Enable the new YAML configuration in our packages --- builder-support/debian/dnsdist/debian-bookworm/control | 1 + builder-support/debian/dnsdist/debian-bookworm/rules | 1 + builder-support/debian/dnsdist/debian-buster/control | 1 + builder-support/debian/dnsdist/debian-buster/rules | 1 + builder-support/dockerfiles/Dockerfile.dnsdist | 2 +- builder-support/specs/dnsdist.spec | 2 ++ 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/builder-support/debian/dnsdist/debian-bookworm/control b/builder-support/debian/dnsdist/debian-bookworm/control index 023b966cfb..2521d8c70d 100644 --- 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 a633dc0f3e..5291c3bcb2 100755 --- 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 f42fa0ad13..4259f478b1 100644 --- 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 9202097f01..3b732061a7 100755 --- 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 94438c308c..ffea154e97 100644 --- 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 182b7887a2..428e1ddfc3 100644 --- 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 -- 2.47.2