commit: 4c13b122e477a9a26c908e77148187f153b4f643 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Jan 23 13:49:01 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=4c13b122
net-dns/knot-resolver: drop 5.7.2 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 - .../files/knot-resolver-5.7.0-r2-tmpfiles.patch | 60 ------------ net-dns/knot-resolver/files/kresd.initd-r1 | 31 ------- net-dns/knot-resolver/knot-resolver-5.7.2.ebuild | 101 --------------------- 4 files changed, 194 deletions(-) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index c38fb5295503..c1b1ecd370d2 100644 --- a/net-dns/knot-resolver/Manifest +++ b/net-dns/knot-resolver/Manifest @@ -1,5 +1,3 @@ -DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B c4f17a050752a5d1ed141bae646f53f313e866b91b80bb72d37c6b2907d365333ca02fbadf4ff49e5559b721b695d1e7af3417a25e0518dbdfdec1860f890408 SHA512 973e9a541b54cee0d230247d279785a83ce2127216b12ee9f314a49adedac3e23e8369900d6f0985b0a666e9bcae7772f29224565e6208ed4988b13530e4ff0b -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 diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch deleted file mode 100644 index a909a6e8c89b..000000000000 --- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch +++ /dev/null @@ -1,60 +0,0 @@ -Always install tmpfiles config. - -Bug: https://bugs.gentoo.org/921567 -Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886 ---- a/meson.build -+++ b/meson.build -@@ -237,9 +237,7 @@ subdir('etc') - - - # Systemd unit files --if systemd_files != 'disabled' -- subdir('systemd') --endif -+subdir('systemd') - - - # Additional files ---- a/systemd/meson.build -+++ b/systemd/meson.build -@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir) - systemd_config.set('run_dir', run_dir) - systemd_config.set('lib_dir', lib_dir) - -+## tmpfiles -+tmpfiles = configure_file( -+ input: 'tmpfiles.d/knot-resolver.conf.in', -+ output: 'knot-resolver.tmpfiles', -+ configuration: systemd_config, -+) -+install_data( -+ tmpfiles, -+ rename: ['knot-resolver.conf'], -+ install_dir: systemd_tmpfiles_dir, -+) -+ - if systemd_files == 'enabled' - ## unit files - kresd_service = configure_file( -@@ -39,18 +51,6 @@ if systemd_files == 'enabled' - ) - install_man(kresd_systemd_man) - -- ## tmpfiles -- tmpfiles = configure_file( -- input: 'tmpfiles.d/knot-resolver.conf.in', -- output: 'knot-resolver.tmpfiles', -- configuration: systemd_config, -- ) -- install_data( -- tmpfiles, -- rename: ['knot-resolver.conf'], -- install_dir: systemd_tmpfiles_dir, -- ) -- - ## sysusers - sysusers = configure_file( - input: 'sysusers.d/knot-resolver.conf.in', --- -2.43.0 - diff --git a/net-dns/knot-resolver/files/kresd.initd-r1 b/net-dns/knot-resolver/files/kresd.initd-r1 deleted file mode 100644 index 9732b48cc2cb..000000000000 --- a/net-dns/knot-resolver/files/kresd.initd-r1 +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${KRESD_GROUP:=knot-resolver} -: ${KRESD_USER:=knot-resolver} -: ${KRESD_CONFIG:=/etc/knot-resolver/kresd.conf} -: ${KRESD_RUNDIR:=/var/run/kresd} -: ${KRESD_PIDFILE:=/var/run/kresd.pid} - -command="/usr/sbin/kresd" -command_args="${KRESD_OPTS} -n -c ${KRESD_CONFIG} ${KRESD_RUNDIR}" -command_user="${KRESD_USER}:${KRESD_GROUP}" -pidfile="${KRESD_PIDFILE}" -command_background=true -retry="TERM/60/KILL/5" - -capabilities="^cap_net_bind_service,^cap_setpcap" - -name="knot-resolver" -description="scaleable caching DNS resolver" - -depend() { - need net - use logger - provide dns -} - -start_pre() { - checkpath -d -m 0750 -o "${KRESD_USER}:${KRESD_GROUP}" ${KRESD_RUNDIR} -} diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild deleted file mode 100644 index f6591f2c3a50..000000000000 --- a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) - -inherit lua-single meson 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 systemd test" -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:= - 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:= ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-util/cmocka - ) -" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.5.3-docdir.patch - "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch - - # Bug #921567 - "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} - fi - - unpack ${P}.tar.xz -} - -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) - $(meson_feature caps capng) - $(meson_feature dnstap) - $(meson_feature kresc client) - $(meson_feature nghttp2) - $(meson_feature test unit_tests) - $(meson_feature systemd systemd_files) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - fowners -R ${PN}: /etc/${PN} - - newinitd "${FILESDIR}"/kresd.initd-r1 kresd - newconfd "${FILESDIR}"/kresd.confd-r1 kresd -} - -pkg_postinst() { - tmpfiles_process knot-resolver.conf -}
