From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 20 Oct 2025 08:53:50 +0000 (+0200)
Subject: rec: explicit disabling/enabling of tls-gnutls for full and least configs and packages
X-Git-Tag: rec-5.4.0-alpha1~166^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73d4872a53a14b52539f3eb75ba2dc93347fcc8b;p=thirdparty%2Fpdns.git

rec: explicit disabling/enabling of tls-gnutls for full and least configs and packages

Includes more complete --version feature printing

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/builder-support/debian/recursor/debian-buster/control b/builder-support/debian/recursor/debian-buster/control
index 4696fbf15e..32a776afe4 100644
--- a/builder-support/debian/recursor/debian-buster/control
+++ b/builder-support/debian/recursor/debian-buster/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 10),
                libcap-dev,
                libcurl4-openssl-dev,
                libfstrm-dev,
+               libgnutls28-dev,
                libluajit-5.1-dev [amd64 arm64] | liblua5.3-dev,
                libprotobuf-dev,
                libsnmp-dev,
diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index a3aef167a1..d9a27f751a 100755
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -49,6 +49,7 @@ override_dh_auto_configure:
 	-Db_pie=true \
 	-Dhardening-fortify-source=disabled \
 	-Dunit-tests=true \
+	-Dtls-gnutls=enabled \
 	-Ddns-over-tls=enabled \
 	-Ddnstap=enabled \
 	-Dlibcap=enabled \
diff --git a/pdns/version.cc b/pdns/version.cc
index fc40756a44..900c185c56 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -153,6 +153,12 @@ string getBuildConfiguration()
 #ifdef HAVE_LIBSODIUM
       << " sodium"
 #endif
+#ifdef HAVE_LIBSSL
+      << " libssl"
+#endif
+#ifdef HAVE_GNUTLS
+      << " gnutls"
+#endif
 #ifdef HAVE_LIBCURL
       << " curl"
 #endif
@@ -167,6 +173,9 @@ string getBuildConfiguration()
 #endif
 #ifdef VERBOSELOG
       << " verboselog"
+#endif
+#ifdef HAVE_LIBCAP
+      << " libcap"
 #endif
       << endl;
 #ifdef PDNS_MODULES
diff --git a/tasks.py b/tasks.py
index 1d7d3e59d8..9b21d72734 100644
--- a/tasks.py
+++ b/tasks.py
@@ -611,6 +611,7 @@ def ci_rec_configure_meson(c, features, build_dir):
             get_base_configure_cmd_meson(build_dir, src_dir=src_dir),
             "-D prefix=/opt/pdns-recursor",
             "-D dns-over-tls=enabled",
+            "-D tls-gnutls=enabled",
             "-D nod=enabled",
             "-D libcap=enabled",
             "-D lua=luajit",
@@ -624,6 +625,7 @@ def ci_rec_configure_meson(c, features, build_dir):
             "-D prefix=/opt/pdns-recursor",
             "-D dns-over-tls=disabled",
             "-D dnstap=disabled",
+            "-D tls-gnutls=disabled",
             "-D nod=disabled",
             "-D systemd-service=disabled",
             "-D lua=luajit",