commit: e1d0755e9396eb0b015e267c5d450d0d2720e61d Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Wed Dec 3 04:32:02 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 4 14:59:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d0755e
net-dns/knot-resolver: add 6.0.17 add missing protoc in bdeps use the new sec-key messages reworked to avoid displaying it every time remove obsolete optfeatures for 6.X Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44890 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/knot-resolver/Manifest | 2 + net-dns/knot-resolver/knot-resolver-6.0.17.ebuild | 186 ++++++++++++++++++++++ net-dns/knot-resolver/metadata.xml | 2 +- 3 files changed, 189 insertions(+), 1 deletion(-) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index 5ce39d7c80bc..fe5f05d696c2 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.0.16.tar.xz 2152164 BLAKE2B 1d5cba94412f4e87b78e46bb83125dd8f2d148dd1fc9df0926c78e208af80620b6cc306284ec238ec389e4d3543c4dbac0c47643c3fd0f47a95f2c7ad9396ce2 SHA512 285201d7f081e4071fe585ccd5a6ca1b934190cf47cfbe93bab2bc5ed08cc096722bbe0730b60724e37bffe94af3289532ba5b0607caca4fb56e98ae65bd4049 DIST knot-resolver-6.0.16.tar.xz.asc 833 BLAKE2B 6d8c7cda79b33efe1367167f5104d7529b139e3db0004e3ebd0d66e176385e3245af92b5b4e9d047cc974e9cb444d4fc77c62aaca2d883e64bc8793fd296e800 SHA512 669ac4e8ead33d9035100f4c098057a0a0ef936f89a0de625ae44c127fe665b8ce132a59a0997f3950ea57c285fc8ab397adf63be53818559c958cdbf541863c +DIST knot-resolver-6.0.17.tar.xz 2157140 BLAKE2B 52b2e64c157b8b24a3b04ad4e57aaaee7bdb804be8e21d61a9195a81ac9c33d2f80f29fde2728afbf99b3482a761d819df620b64f1c47f2ace3d415eeef35d3b SHA512 b54f450e5ed11469a6109ce1b2a30cf0fc4755aec1b51caf8fa723a31222e7400f7566b3951ce1d72069c10cd463e5f75739d34cdadf8966ea2b8eb193fe1e4a +DIST knot-resolver-6.0.17.tar.xz.asc 833 BLAKE2B 993457b27c01852ca2865d7d72086c137fa507bde6928edf70b647180cd2870727876d943a598eac143ff033ad3c674b45a1e0956a6cce6381a2fbb8b36ff0f8 SHA512 d68cf1d6677cffc6d7e52f189c1a809e29a283118b8ac3656a112c896ab88788f647c65b4068e0d4e078ec92bbe8bf8089dd93fcc447fddb301466ab7f14e320 diff --git a/net-dns/knot-resolver/knot-resolver-6.0.17.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.17.ebuild new file mode 100644 index 000000000000..bafc78a0de31 --- /dev/null +++ b/net-dns/knot-resolver/knot-resolver-6.0.17.ebuild @@ -0,0 +1,186 @@ +# Copyright 2024-2025 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..13} ) + +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 jemalloc +manager nghttp2 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:= + ) + jemalloc? ( dev-libs/jemalloc:= ) + 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:= ) + 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-libsystemd.patch + "${FILESDIR}"/${PN}-6.0.9-config-example.patch + "${FILESDIR}"/${PN}-6.0.12-pytest_tomllib.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 + # https://bugs.gentoo.org/870019 + -Dauto_features=disabled + # post-install tests + -Dconfig_tests=disabled + -Ddoc=disabled + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dinstall_kresd_conf=enabled + -Dopenssl=disabled + -Dmalloc=$(usex jemalloc jemalloc disabled) + -Dsystemd_files=enabled + $(meson_feature caps capng) + $(meson_feature dnstap) + $(meson_feature nghttp2) + $(meson_feature systemd) + $(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 02d7316545d4..cf550969acd2 100644 --- a/net-dns/knot-resolver/metadata.xml +++ b/net-dns/knot-resolver/metadata.xml @@ -17,7 +17,7 @@ Build (experimental) command-line client </flag> <flag name="manager"> - Manager is a user-friendly interface and a component handling rolling restarts, config update logic and more. + Manager is a user-friendly interface and a component handling rolling restarts, config update logic and more </flag> <flag name="nghttp2"> DNS-over-HTTPS support
