Replace dnsutils with bind9-dnsutils

bind9-dnsutils exists starting in Debian bullseye, and dnsutils stopped existing in trixie.

diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
index 031db4e51b81c9404b3726b4a8b0e67ae0e7151d..caca16029125d3095ca398a9bf962db0126733d2 100644 (file)
--- 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 9f1458a9f46e65b4a78b81a6c6fc1e94ba05c129..b4a32b4ad505816ae6612ccfa7ea8b184c7a6a45 100644 (file)
--- 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 bf44d57917264cb38729f55e05571137de3ab19c..2b224a123f1f7b6e7f26ccbd3b6a5a5c95430530 100644 (file)
--- 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 f40080069c4c598b36d9b8a14b2ed52013f02e9a..925e4e0ca34313aafff5edf3e3aa7c40e4b2f197 100644 (file)
--- 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',