commit: e8be481655514a9ba43604b24ec2d4bf87c28dd6 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Apr 24 12:05:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 02:12:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8be4816
net-dns/knot-resolver: drop 6.0.10, 6.0.11 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/41728 Closes: https://github.com/gentoo/gentoo/pull/41728 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/knot-resolver/Manifest | 4 - net-dns/knot-resolver/knot-resolver-6.0.10.ebuild | 183 --------------------- net-dns/knot-resolver/knot-resolver-6.0.11.ebuild | 185 ---------------------- 3 files changed, 372 deletions(-) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index 1c784fb6b0f5..d92a6e75efb7 100644 --- a/net-dns/knot-resolver/Manifest +++ b/net-dns/knot-resolver/Manifest @@ -2,9 +2,5 @@ DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B 670bd0bac1417fde0f7b6a02797e49e2 DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B 6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb SHA512 d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f 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-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.11.tar.xz 2139448 BLAKE2B 0d96790ce3ecb85d9466d90683de77d46f75d360f032ae94d18a7b493eedb58c86f6274a5de2eaed4eca792b3ef6ff673120c3a7526e9167d404b8dd0ccd20f3 SHA512 7a3dd8e925a8ba44c66d00175fd689b4daddacde8ffb96712c3770dbaf1c54a2cb90dda340fe674dc11e1222fdd3e4112aa3df72270f422b4c8d2c60f9af9cea -DIST knot-resolver-6.0.11.tar.xz.asc 833 BLAKE2B 3e959798699c1dc0698cdb6e0c8509ba8a3287eab485511b18e01cc80e906149095ca9a537b3b4c45969c338022b61afd6377f106506b59f969fdf44d5e729be SHA512 cf6b034a9ad0daf118c18179dea1c32c9de604581735d89127c9c0fe80122a6159b49ec6176bee0955114d12f8ad20e29958a841c9b6464551e3def69d2e3932 DIST knot-resolver-6.0.12.tar.xz 2144940 BLAKE2B 72a8592591ba7ca8ee8b57eae105096125a71f7d4a7e1b096962683f66cc608f65ad5743ee2213b0b898983c52cf9b7d651088929b56db952871bb8b03607283 SHA512 2941de1d05258a627fa859de826487e940cd0c90befa5d2a678e0bf3111c048cb558cfe1258711417bec71a6f0d6e38aa40c1ba6743f3279862684109634d6dc DIST knot-resolver-6.0.12.tar.xz.asc 833 BLAKE2B ffb7758c151485fe65e8ad636767943b1280d4a02d5889fbc22247fcfe1d3d53969e369cff6d0d2a438ed241f96ec2c97d792fc7d07af3f51ec252eb20357c42 SHA512 1adafdb6ffcf8d2bcb0a6b6ed2a39eb8be237954280f8845fef62dc32dfa64f5101400db94d8ecad30c27c8ca21945414b8c4c4ec0db88ba8be679e99c60947e diff --git a/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild deleted file mode 100644 index 8ae140b0c8cd..000000000000 --- a/net-dns/knot-resolver/knot-resolver-6.0.10.ebuild +++ /dev/null @@ -1,183 +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_{10..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" - -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 -} diff --git a/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild deleted file mode 100644 index c7cbc691b42a..000000000000 --- a/net-dns/knot-resolver/knot-resolver-6.0.11.ebuild +++ /dev/null @@ -1,185 +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_{10..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" - -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 - # to be removed at next release 6.0.12 - "${FILESDIR}"/${PN}-6.0.11-abs_path_socket.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 -}
