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 4696fbf15e1bfeec6ccaf8b6755e2d295cafc90b..32a776afe4987a51a38573fbac8dadf17d9c15f9 100644 (file)
--- 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 a3aef167a1ca1242873bad0f731860d36727a09a..d9a27f751a429773050a832a30d54858e73483c1 100755 (executable)
--- 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 fc40756a44c7178f312f7ec6599809fe34c571e0..900c185c56149729973396e3e2cc08f79b8ab706 100644 (file)
--- 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 1d7d3e59d83df133848e62cb0c7be3c924decf08..9b21d7273416fd7d480d514bc2cdf48b8f6259fd 100644 (file)
--- 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",