[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/
Date: Sat, 26 Apr 2025 02:14:23 +0000 (UTC)	[thread overview]
Message-ID: <1745633565.0678c49c2be4ed6c4a44dddba80ee17cd51f2d04.sam@gentoo> (raw)

commit:     0678c49c2be4ed6c4a44dddba80ee17cd51f2d04
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Apr 24 12:05:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 26 02:12:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0678c49c

net-dns/knot-resolver: add 6.0.12

security/bugfixes release

minor changes from 6.0.11 :
* update description for an optfeature
* drop python3_10

Bug: https://bugs.gentoo.org/954555
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/41728
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/knot-resolver/Manifest                    |   2 +
 net-dns/knot-resolver/knot-resolver-6.0.12.ebuild | 182 ++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index cd1b494c0418..1c784fb6b0f5 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -6,3 +6,5 @@ DIST knot-resolver-6.0.10.tar.xz 2138660 BLAKE2B 9a80e76272b4cb7a30b75b832627529
 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.12.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.12.ebuild
new file mode 100644
index 000000000000..6ec43c7c0ad6
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-6.0.12.ebuild
@@ -0,0 +1,182 @@
+# 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"
+
+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 kresd@N.service"
+	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
+}

next             reply	other threads:[~2025-04-26  2:14 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-26  2:14 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-30 13:04 [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/ Joonas Niilola
2025-07-19 16:58 Sam James
2025-07-19 16:58 Sam James
2025-07-19 16:58 Sam James
2025-06-03 13:50 Sam James
2025-06-02 21:41 Sam James
2025-05-28 10:34 Sam James
2025-05-27 19:45 Kenton Groombridge
2025-05-22 22:21 Sam James
2025-05-21 10:56 Arthur Zamarin
2025-04-26  2:14 Sam James
2025-04-26  2:14 Sam James
2025-03-10  2:54 Sam James
2025-02-16 16:36 Sam James
2025-02-16 16:36 Sam James
2025-02-16 16:36 Sam James
2024-12-05 12:29 Sam James
2024-12-01 15:19 Sam James
2024-11-22  7:38 Florian Schmaus
2024-11-20 21:11 Andreas Sturmlechner
2024-09-03 18:32 Jakov Smolić
2024-07-31 17:51 Matthew Smith
2024-04-07 10:40 Matthew Smith
2024-02-16  8:03 Matthew Smith
2024-02-15 20:03 Sam James
2024-02-14  8:32 Matthew Smith
2023-11-26 23:18 Sam James
2023-09-29 10:14 Matthew Smith
2023-02-27 18:22 Matthew Smith
2023-02-27 15:40 Sam James
2023-02-05  9:32 Matthew Smith
2022-12-03 14:43 Arthur Zamarin
2022-11-01 17:59 Matthew Smith
2022-10-19 14:53 Matthew Smith

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:cd1b494c041 dfblob:1c784fb6b0f dfblob:6ec43c7c0ad )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1745633565.0678c49c2be4ed6c4a44dddba80ee17cd51f2d04.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox