commit: f78aeb0585493016d00b2ce30f5b94659bc149c2 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Nov 3 05:30:19 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 4 11:05:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78aeb05
net-dns/knot-resolver: drop 5.7.5, 6.0.15 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44439 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/knot-resolver/Manifest | 4 - net-dns/knot-resolver/knot-resolver-5.7.5.ebuild | 99 ------------ net-dns/knot-resolver/knot-resolver-6.0.15.ebuild | 182 ---------------------- 3 files changed, 285 deletions(-) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index 93c5f7d8a73d..5ce39d7c80bc 100644 --- a/net-dns/knot-resolver/Manifest +++ b/net-dns/knot-resolver/Manifest @@ -1,8 +1,4 @@ -DIST knot-resolver-5.7.5.tar.xz 1924960 BLAKE2B cad47756832b34399ea0437ef041ddbfeef10645004ad48ea1ca7cf8fca380b443eb20e345418ebe5dc1566f8f19ee400a1819077bda4d9d2b7949b36a6fb4df SHA512 b9ade76accf60c7eee173cfff18e1881e79bcd63d85ef583973244bf37f40c4c57fed00d840c61643b65b82b1f93f85480c4f10334416cab87fae3da46918fc3 -DIST knot-resolver-5.7.5.tar.xz.asc 833 BLAKE2B 675b91253c5ae72db9e1ef6513a681538967f72b6b7a91f2159b42e7581b398a0a90df7e75da0e6818f1a20549a23677ab34722bbcf762cad019d4c211221f1e SHA512 df06eb244fa051a5f71385424b2da2479203019c6824344ec2226bc4851a3eb12eb3bb0f6f5a3e5ccce8c5875b6867924fa46b6939545cb35b24ef799f9ef6b0 DIST knot-resolver-5.7.6.tar.xz 1924840 BLAKE2B aca1a3f70921c63005b23f3a9ebb6b602bf0e9d75e7d981b68b4c7b60fb3c0221250ca5b2feafad717136a3376270f7314777fdb0e92e4d5932ecdc5ed5c11a8 SHA512 4dcaff56b0368bc147e04ffbf6ce4a3595fa3a59e99e73b516edc7813142abcb20823b987824b11a31e3eca3cc62fa176caf4408361daeac67b6f0587f9a0268 DIST knot-resolver-5.7.6.tar.xz.asc 833 BLAKE2B 93579242e6deee33477610c91d72c1152bdbd05355a57893a9519955ce022034315669a91c311081a6e2b4683bf641305fe79ae360b2b61e51a02e0b5c4d8361 SHA512 478449d96dddaff9aff134a2a3bc991d8e50423f38a00e7256b54be9ab89d85d66eaa8e83815f4b31700b16fd94f8017493db6347e57d0583feec38bb35655f6 -DIST knot-resolver-6.0.15.tar.xz 2149616 BLAKE2B 9eb0df666c93bb6504a1048055c94eab6800ac50bcb7b23f06d71cf5e4c72289707377ba6defafa7478d3dfe0b876cef7b84c02d4d919f63777b020b27ee1a56 SHA512 081aafec48d8171b0faba348894ff4735de3535f6d33c415e1cb4b5c849a9c741fdf4f20d66b79c7d11cabe5838da011028e18a3849d9fdf0823c17c1392b5e7 -DIST knot-resolver-6.0.15.tar.xz.asc 833 BLAKE2B 107ddcc26a5ba018b68587b2f0bf438d233f7844112524653c81fa432870041326884fb77d74bc1d9b3c5d81a36218e9b506d4f2cbc1206b502158b3154af2ab SHA512 3e34ea0c42af6682df6210862f250eedfd8b8b6a0c20c99f73587b4e79c1c339cf833f088f05503b4d0a1cb860960eb1efc332cdef4dda6d577ced7604aaa90d 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 diff --git a/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild deleted file mode 100644 index 189eccc7b551..000000000000 --- a/net-dns/knot-resolver/knot-resolver-5.7.5.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) - -inherit 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 kresc nghttp2 selinux systemd test xdp" -RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - acct-group/knot-resolver - acct-user/knot-resolver - dev-db/lmdb:= - dev-libs/libuv:= - net-dns/knot:=[xdp?] - net-libs/gnutls:= - caps? ( sys-libs/libcap-ng ) - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c:= - ) - jemalloc? ( dev-libs/jemalloc:= ) - kresc? ( dev-libs/libedit ) - nghttp2? ( net-libs/nghttp2:= ) - selinux? ( sec-policy/selinux-knot ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) -" -BDEPEND=" - virtual/pkgconfig - 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}-5.7.4-libsystemd.patch -) - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var # double lib - # https://bugs.gentoo.org/870019 - -Dauto_features=disabled - -Ddoc=disabled - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - -Dopenssl=disabled - -Dmalloc=$(usex jemalloc jemalloc disabled) - -Dsystemd_files=enabled - $(meson_feature caps capng) - $(meson_feature dnstap) - $(meson_feature kresc client) - $(meson_feature nghttp2) - $(meson_feature systemd) - $(meson_feature test unit_tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - 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 - 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:" - optfeature "legacy doh and webmgmt (metrics, tracking)" dev-lua/lua-http - optfeature "server map with geoIP database (webmgmt)" dev-lua/lua-mmdb -} diff --git a/net-dns/knot-resolver/knot-resolver-6.0.15.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.15.ebuild deleted file mode 100644 index ecccdbb4a236..000000000000 --- a/net-dns/knot-resolver/knot-resolver-6.0.15.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# 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 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 ~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 - 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.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_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 and RPZ 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 -}
