commit: def352794bdb33307e71eadd740b24d3ff0bc69e Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Feb 3 22:06:47 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 25 16:11:08 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def35279
net-dns/knot-resolver: add 6.2.0 add dns-over-quic support with net-libs/ngtcp2 disable jemalloc doc(html) no longer needs dev-python/json-schema-for-humans::guru but is still disabled to avoid relying on sphinx for PYTHON_COMPAT due to using DISTUTILS_SINGLE_IMPL that doesn't allow python_gen_any_dep. Closes: https://bugs.gentoo.org/970152 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45638 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/knot-resolver/Manifest | 2 + net-dns/knot-resolver/knot-resolver-6.2.0.ebuild | 194 +++++++++++++++++++++++ net-dns/knot-resolver/metadata.xml | 3 + 3 files changed, 199 insertions(+) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index 05a0fb906729..1f4dd314f3d3 100644 --- a/net-dns/knot-resolver/Manifest +++ b/net-dns/knot-resolver/Manifest @@ -2,3 +2,5 @@ DIST knot-resolver-5.7.6.tar.xz 1924840 BLAKE2B aca1a3f70921c63005b23f3a9ebb6b60 DIST knot-resolver-5.7.6.tar.xz.asc 833 BLAKE2B 93579242e6deee33477610c91d72c1152bdbd05355a57893a9519955ce022034315669a91c311081a6e2b4683bf641305fe79ae360b2b61e51a02e0b5c4d8361 SHA512 478449d96dddaff9aff134a2a3bc991d8e50423f38a00e7256b54be9ab89d85d66eaa8e83815f4b31700b16fd94f8017493db6347e57d0583feec38bb35655f6 DIST knot-resolver-6.1.0.tar.xz 2158788 BLAKE2B fc3e40c04e688bf3f12a3ccfe077864f3a6d1f97c590c9dfea3d5ccb3ffa7ee76d8392fb5ae9acc6a10a26762bcf4ae87a19f2891855ebd997ce4aeeb2f24404 SHA512 ae84087f1c0470d7ead743d3dd4c01ac7a4d7b73ef4fd2bebc2878ad2f20cc594fe5173619f275acbb790b38402662ea1e6cdfb0326de6e9569a266b66743f97 DIST knot-resolver-6.1.0.tar.xz.asc 833 BLAKE2B cb958e582c5eeca25aeeaaf42f025970c6f7d11e7c31387263f30b7eb6dd524486705d48070bd159f219bda2cf769164138485c5330948fbc5b0baaaa5e1516a SHA512 9e6858acb5e6fe27aac56c3bd2c04ec6d187bf691213f6fed64ea5ae8dfb3d79530b77c7c80ffdaa61ad378aad850c09233aa6901817aeb06a6d58cdbfbba5a2 +DIST knot-resolver-6.2.0.tar.xz 2366172 BLAKE2B dbf07f782d40e50a35fbadc787b26093f3ecac19c0c8d004b718f7c7263c7b6859a4b4c2eb0ade9c34ca5310508e017e436cc68b544891c142a8d9dbab0fee44 SHA512 d1fc1e092b12750114699a0c63ffabacd710eed5bed36412661d006a12287e126558ae1edcdb106f46d1c17c570aefa3b665863469f9a86d910b134a02383278 +DIST knot-resolver-6.2.0.tar.xz.asc 833 BLAKE2B 5426c9d2dc5d1eb47066eeceaae4c5625bdb3d7c196a776c64a97b8ef9f112bd8ff77009e2816e7b5140a62f96a9e08a20f28ee3ffe135556dada7add1dc2018 SHA512 e139ae79ec3740eb007a53066a040c44bc359961e957c6290aaa4848b52264d9895b3d6806d492f69ca625e314a1476d8646c9786d9db50fd9fad504f8dd5ca3 diff --git a/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild b/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild new file mode 100644 index 000000000000..99ef9c380270 --- /dev/null +++ b/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild @@ -0,0 +1,194 @@ +# Copyright 2024-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{11..14} ) + +inherit distutils-r1 eapi9-ver lua-single meson optfeature tmpfiles verify-sig + +DESCRIPTION="Scaleable caching DNS resolver" +HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"; +SRC_URI=" + https://knot-resolver.nic.cz/release/${P}.tar.xz + verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc ) +" + +LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +IUSE="caps dnstap +manager nghttp2 quic selinux systemd test xdp" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + manager? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + ${LUA_DEPS} + acct-group/knot-resolver + acct-user/knot-resolver + dev-db/lmdb:= + dev-libs/libuv:= + >=net-dns/knot-3.3:=[xdp?] + net-libs/gnutls:= + caps? ( sys-libs/libcap-ng ) + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c:= + ) + manager? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + app-admin/supervisor[${PYTHON_USEDEP}] + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') + ) + nghttp2? ( net-libs/nghttp2:= ) + quic? ( >=net-libs/ngtcp2-1.11.0[gnutls] ) + selinux? ( sec-policy/selinux-knot ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-util/cmocka + manager? ( + $(python_gen_cond_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + ') + ) + ) +" +BDEPEND=" + virtual/pkgconfig + dnstap? ( dev-libs/protobuf[protoc(+)] ) + manager? ( + ${DISTUTILS_DEPS} + ${PYTHON_DEPS} + ) + verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20251203 ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.asc + +PATCHES=( + "${FILESDIR}"/${PN}-5.5.3-docdir.patch + "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch + "${FILESDIR}"/${PN}-6.0.9-config-example.patch + "${FILESDIR}"/${PN}-6.0.12-pytest_tomllib.patch + "${FILESDIR}"/${PN}-6.1.0-libsystemd.patch +) + +pkg_setup() { + lua-single_pkg_setup + use manager && python-single-r1_pkg_setup +} + +src_prepare() { + default + use manager && distutils-r1_src_prepare +} + +src_configure() { + local emesonargs=( + --localstatedir="${EPREFIX}"/var # double lib + # avoid automagic, see #870019 + -Dauto_features=disabled + # post-install tests + -Dconfig_tests=disabled + # DISTUTILS_SINGLE_IMPL can't use python_gen_any_dep + # disable doc (html) to avoid relying on sphinx for PYTHON_COMPAT + -Ddoc=disabled + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + # legacy sample config w/o manager + -Dinstall_kresd_conf=enabled + # disable jemalloc, see #969223 + -Dmalloc=disabled + # disable debug for the deprecated module 'http' + -Dopenssl=disabled + # always install tmpfiles + -Dsystemd_files=enabled + $(meson_feature caps capng) + $(meson_feature dnstap) + $(meson_feature nghttp2) + -Dquic=$(usex quic external disabled) + $(meson_feature systemd) + # legacy service w/o manager + $(meson_feature systemd systemd_legacy_units) + $(meson_feature test unit_tests) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + use manager && distutils-r1_src_compile +} + +src_test() { + meson_src_test + use manager && distutils-r1_src_test +} + +python_test() { + epytest tests/manager +} + +src_install() { + meson_src_install + if use manager; then + distutils-r1_src_install + newinitd "${FILESDIR}"/knot-resolver.initd knot-resolver + newconfd "${FILESDIR}"/knot-resolver.confd knot-resolver + else + rm "${ED}"/usr/lib/systemd/system/knot-resolver.service || die + fi + fowners -R ${PN}: /etc/${PN} + newinitd "${FILESDIR}"/kresd.initd-r2 kresd + newconfd "${FILESDIR}"/kresd.confd-r1 kresd + newinitd "${FILESDIR}"/kres-cache-gc.initd kres-cache-gc +} + +pkg_preinst() { + if use manager && has_version "net-dns/knot-resolver[-manager(-)]"; then + show_manager_info=1 + fi +} + +pkg_postinst() { + tmpfiles_process knot-resolver.conf + + if ver_replacing -lt 6.0.0; then + ewarn "Knot-Resolver-6.X brings major changes, please read the guide for upgrading:" + ewarn "https://www.knot-resolver.cz/documentation/v${PV}/upgrading-to-6.html"; + fi + + if [[ -n ${show_manager_info} ]]; then + elog "You choose the new way, called the manager, to start Knot Resolver:" + use systemd && elog " systemctl start knot-resolver.service" + use !systemd && elog " /etc/init.d/knot-resolver start" + elog "Configuration file: /etc/knot-resolver/config.yaml" + elog "The older way, without the manager, is still available:" + use systemd && elog " systemctl start [email protected]" + use !systemd && elog " /etc/init.d/kresd start" + elog "Configuration file: /etc/knot-resolver/kresd.conf" + elog "Optional garbage collector: /etc/init.d/kres-cache-gc" + fi + + optfeature_header "This package is recommended with Knot Resolver:" + optfeature "asynchronous execution, especially with policy module" dev-lua/cqueues + optfeature_header "Other packages may also be useful:" + use manager && optfeature "Prometheus metrics (need manager)" dev-python/prometheus-client + use manager && optfeature "auto-reload TLS certificate files and RPZ files (need manager)" dev-python/watchdog +} diff --git a/net-dns/knot-resolver/metadata.xml b/net-dns/knot-resolver/metadata.xml index cf550969acd2..fc100c304ea6 100644 --- a/net-dns/knot-resolver/metadata.xml +++ b/net-dns/knot-resolver/metadata.xml @@ -22,6 +22,9 @@ <flag name="nghttp2"> DNS-over-HTTPS support </flag> + <flag name="quic"> + DNS-over-QUIC support + </flag> <flag name="xdp"> Enable eXpress Data Path </flag>
