From 5fd429441e8538d1d2a116476b25126a5cedbe00 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 31 Jan 2025 09:01:40 +0100
Subject: [PATCH] Replace dnsutils with bind9-dnsutils

bind9-dnsutils exists starting in Debian bullseye, and dnsutils stopped existing in trixie.
---
 .../docker/repo-test/templates/Dockerfile-debian.jinja2     | 2 +-
 builder-support/debian/authoritative/debian-buster/control  | 4 ++--
 builder-support/debian/recursor/debian-buster/tests/control | 2 +-
 tasks.py                                                    | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
index 031db4e51b..caca160291 100644
--- a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
+++ b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
@@ -1,6 +1,6 @@
 FROM {{ os_image }}:{{ os_version }}
 
-RUN apt-get update && apt-get install -y curl gnupg dnsutils apt-transport-https
+RUN apt-get update && apt-get install -y curl gnupg bind9-dnsutils apt-transport-https
 
 {% if release.startswith('dnsdist-') %}
 COPY pkg-pin /etc/apt/preferences.d/dnsdist
diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control
index 9f1458a9f4..b4a32b4ad5 100644
--- a/builder-support/debian/authoritative/debian-buster/control
+++ b/builder-support/debian/authoritative/debian-buster/control
@@ -3,11 +3,11 @@ Section: net
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Priority: optional
 Standards-Version: 4.5.1
-Build-Depends: bison,
+Build-Depends: bind9-dnsutils | dnsutils,
+               bison,
                curl,
                debhelper-compat (= 10),
                default-libmysqlclient-dev,
-               dnsutils,
                flex,
                libboost-all-dev,
                libcdb-dev,
diff --git a/builder-support/debian/recursor/debian-buster/tests/control b/builder-support/debian/recursor/debian-buster/tests/control
index bf44d57917..2b224a123f 100644
--- a/builder-support/debian/recursor/debian-buster/tests/control
+++ b/builder-support/debian/recursor/debian-buster/tests/control
@@ -1,4 +1,4 @@
 Tests: smoke
-Depends: dnsutils,
+Depends: bind9-dnsutils,
          @
 Restrictions: needs-root
diff --git a/tasks.py b/tasks.py
index f40080069c..925e4e0ca3 100644
--- a/tasks.py
+++ b/tasks.py
@@ -60,7 +60,7 @@ rec_build_deps = [
 ]
 rec_bulk_deps = [
     'curl',
-    'dnsutils',
+    'bind9-dnsutils',
     'libboost-all-dev',
     'libcap2',
     'libfstrm0',
@@ -74,7 +74,7 @@ rec_bulk_deps = [
 ]
 rec_bulk_ubicloud_deps = [
     'curl',
-    'dnsutils',
+    'bind9-dnsutils',
     'libboost-context1.74.0',
     'libboost-system1.74.0',
     'libboost-filesystem1.74.0',
@@ -110,7 +110,7 @@ auth_test_deps = [   # FIXME: we should be generating some of these from shlibde
     'bind9utils',
     'curl',
     'default-jre-headless',
-    'dnsutils',
+    'bind9-dnsutils',
     'faketime',
     'gawk',
     'krb5-user',
-- 
2.47.2