From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 22 Oct 2025 07:50:51 +0000 (+0200)
Subject: libdnssec -->> libknot
X-Git-Tag: v6.1.0~11^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=80cf9eb1;p=thirdparty%2Fknot-resolver.git

libdnssec -->> libknot
---

diff --git a/NEWS b/NEWS
index ead8620a9..a78a7f51d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ Bugfixes
 - reload did not apply changes to /fallback (!1763)
 - fix config.cache.clear test on apple silicon (!1766)
 
+Improvements
+------------
+- support libdnssec merged into libknot, as planned for knot >= 3.6 (!1769)
+
 
 Knot Resolver 6.0.17 (2025-12-02)
 =================================
diff --git a/lib/dnssec.h b/lib/dnssec.h
index 8bafaa9ce..06efa8846 100644
--- a/lib/dnssec.h
+++ b/lib/dnssec.h
@@ -9,8 +9,22 @@
 #include <libknot/packet/pkt.h>
 
 // This is the central place in Knot Resolver which includes the (former) libdnssec.
+#if KNOT_VERSION_HEX < 0x030600
 #include <libdnssec/dnssec.h>
 #include <libdnssec/digest.h>
+#else
+#include <libknot/libknot.h>
+// Now some compatibility
+enum {
+	// These should be OK to replace everywhere.
+	DNSSEC_EOK = KNOT_EOK,
+
+	// These might not be OK to simply replace everywhere.
+	DNSSEC_INVALID_KEY_ALGORITHM = KNOT_INVALID_KEY_ALGORITHM,
+	DNSSEC_INVALID_DIGEST_ALGORITHM = KNOT_EALGORITHM,
+	DNSSEC_NOT_FOUND = KNOT_ENOENT, // or -ENOENT now
+};
+#endif
 
 /**
  * Initialise cryptographic back-end.
diff --git a/meson.build b/meson.build
index 1f5b1fd08..9610589de 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,11 @@ endif
 message('--- required dependencies ---')
 knot_version = '>=3.3'
 libknot = dependency('libknot', version: knot_version)
-libdnssec = dependency('libdnssec', version: knot_version)
+if libknot.version() < '3.6'
+  libdnssec = dependency('libdnssec', version: knot_version)
+else
+  libdnssec = libknot # the libraries merged
+endif
 libzscanner = dependency('libzscanner', version: knot_version)
 libuv = dependency('libuv', version: '>=1.27')  # need uv_udp_connect()
 lmdb = dependency('lmdb', required: false)