commit: 1df75c5fd9487a37ab35483ebe1d19bda9907bdc
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jan 23 13:39:29 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:34:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df75c5f
net-dns/knot-resolver: add 6.0.10 optfeature
add optional features.
remove rdep prometheus-client as it's an optfeature too.
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/knot-resolver/Manifest | 2 +
net-dns/knot-resolver/knot-resolver-6.0.10.ebuild | 184 ++++++++++++++++++++++
2 files changed, 186 insertions(+)
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 42913251853c..c38fb5295503 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -2,5 +2,7 @@ DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B
c4f17a050752a5d1ed141bae646f53f3
DIST knot-resolver-5.7.2.tar.xz.asc 833 BLAKE2B
f73f52d7b2326a58a37b821cd8495d20c93017bd1f7bad2cc828f807f1886fc376dc95405b3b36047719f8566e27d7c1052b7ab11fae3d1d67c5563a293d965e
SHA512
cf05ceca455400004cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2
DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B
670bd0bac1417fde0f7b6a02797e49e22af081e55b63c23e1fcd8dee369f21b7a2a8997fe641f69e7f0de5cbc7960307f32c939eb85c260fb2de015542dfce1e
SHA512
5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B
6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb
SHA512
d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f
+DIST knot-resolver-6.0.10.tar.xz 2138660 BLAKE2B
9a80e76272b4cb7a30b75b832627529dfbdec7114ef25a576c9a590221e21ef17efef23ec328783f2b687e8f2e0d0cee5b54048a37a0d08a35004ba3e510e14c
SHA512
63d5c7a45ca52f02616ac6374625ccddd631cd71a5b6ebc99498e0c28f581eefef1dd5bbb0d8676f1ec53c2023f2b28cebc432e981c51b6166b4b3b1d8443704
+DIST knot-resolver-6.0.10.tar.xz.asc 833 BLAKE2B
5bd7baba40d6577764b3f0d985a2ee7edaff99ce7fc1cd89f42488504c657f1be2a5bf7267eaed225281be6f8154fb21c92ab7ee1d34b844b3001b7ad391d5b6
SHA512
26b8faffe10529559ec9081a567d6c740a9c61f81edf766ea1c32b01129edf9a4049a2844df0c27cb0fd5008e299d6431b099b0a09ac5624f24155d8b1a3b53f
DIST knot-resolver-6.0.9.tar.xz 2127432 BLAKE2B
185a78737f6830b4ff036a537f2ceb032388e50ef050c239f0ce21d84a1fa2d1632aa95802a73d4ff80bcb18cef23f444a10b594121cd449cee3c12182dcab2e
SHA512
98b3074927d9cb484738592a6cad84b818130aafd91473ee6e17458884c3ff5cb528e22d020d8b8b92b429feb2e3432e9cb77574f505bdf2e5f6f286009ecd59
DIST knot-resolver-6.0.9.tar.xz.asc 833 BLAKE2B
10c9c895bd3a728b8a9d3769cb72ccc5dbf5c17164df388d1519c5e4734e21ee568c079191ada6ff76f1a150be911d79c5d1ebb02597c32d1aa5003a5ceaf02d
SHA512
b46a9346deda328fbe6638657e2d87903052ac36b11ff5d4f68bd145487687c1c2f43a7b62e40585f5853816b7ed66b1af3b98642e882f72e36cf521f5eb1bce
diff --git a/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild
b/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild
new file mode 100644
index 000000000000..892e6d5ddc95
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild
@@ -0,0 +1,184 @@
+# 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
+# waiting app-admin/supervisor for py3_13
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 lua-single meson optfeature tmpfiles verify-sig
+
+DESCRIPTION="A 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"
+
+IUSE="caps dnstap jemalloc +manager nghttp2 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:= )
+ 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}]
+ dev-python/tomli[${PYTHON_USEDEP}]
+ ')
+ )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ manager? (
+ ${DISTUTILS_DEPS}
+ ${PYTHON_DEPS}
+ )
+ verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
+
+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.9-pytest_tomli.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_postinst() {
+ tmpfiles_process knot-resolver.conf
+ if use manager; 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 ""
+ elog "The older way, without the manager, is still available:"
+ else
+ elog "You choose the older way, without the manager, to start
Knot Resolver:"
+ fi
+ 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"
+ elog ""
+ use !manager && elog "The new way is available with the useflag
manager."
+ elog ""
+
+ optfeature_header "This package is recommended with Knot Resolver:"
+ optfeature "asynchronous execution, especially with policy module"
dev-lua/cqueues
+ elog ""
+ 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 (need
manager)" dev-python/watchdog
+ optfeature "legacy doh and webmgmt (metrics, tracking)" dev-lua/lua-http
+ optfeature "server map with geoIP database (webmgmt)" dev-lua/lua-mmdb
+}
