gentoo auto-resync : 31:12:2024 - 06:31:02

7 files changed, 44 insertions, 182 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0798cd1adcc7..4476fad1ca0b 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index aa2ac9832540..f77d798f1344 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -5,10 +5,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.tmpfile 58 BLAKE2B a107ca27b8d47253409c319d0e69ab151237844d10840155e6ceeb37b8c63268de52c161f63ca27b6c3ec4092c7759fc46d325d4cd79063caa33ef82e23e119e SHA512 db13a4108ce820032a72aa788e6cf79c6bb0870ec457f454dea9102f07255dd5c1543723436665da92236c093ee97161f72298131f80dff09d5faf6aba24bde8
 DIST knot-3.2.2.tar.xz 1632748 BLAKE2B 185567dc883f946570fe60cd7d01d96162c5f13ac84330e5551c293b5011c162401fd25ddbdb43bf9242e13c3cdc8225be107dc579619fe54c05335601cd27ae SHA512 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f
 DIST knot-3.2.9.tar.xz 1642600 BLAKE2B 2c81b2afa96c6077778c3458b2ddeeb8b47ea99607ba755a904278f9755a32171738418ea442b1e6b4afcebe0db2c86e68845d38f8e78342b8354411d1e34af8 SHA512 baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf
-DIST knot-3.4.2.tar.xz 1632976 BLAKE2B 0b633b27b22665db243bc4222f05028a17ee7ec6ba5960ff1cfe503d27bf3d26218f771cb15b70bbf8782898bcc7748bd5c27d55747607a1d93f784cdadddad7 SHA512 d5353fdd51224e20a8009aea7df6fe7503a726756c82041b770d8e90cae00b38ede7ecb2f31178ccb9f472a98b86f90208d4627fa4aaaf3c0383272b451e3015
 DIST knot-3.4.3.tar.xz 1637080 BLAKE2B d5d96a69b2464d75e4f2d3231339c1dedccc1cd95febc8bd5950f68c89a277d002d09a60e629a74b378bc7f765370aaef05bf41fd497e740be6c0a349c27f731 SHA512 c05a214a9e5564d09257aff44c0f42e9d084d47536197c95dff7aa125a8b53ed99e26c90affaa6833779778cd8d37af9cc473f108ab6acf7230c476b5858c03f
-EBUILD knot-3.2.2.ebuild 2524 BLAKE2B 569b58aaa8b8d766ac9e57e5d700452686e8c60c1e1217a0db14ba7be9ede31de93c656558a3ac4d5543262cc564582361ee7283d547fcb1e4af986c6ec0471a SHA512 b48ef6e7ff68a4d5a62a225f8c980dd6b2da340d9c3556b11efbd1405e8bfcb7921eff9a9795974ac6dc7c021cd6f6cf0ee0ab52d7b0bfab3a82a1cb32e958b7
-EBUILD knot-3.2.9-r1.ebuild 2562 BLAKE2B 6dc4fbc7f48ef5b8d2ffa9c22ffc94b1b9f38b888687c65822fdb076c70363acc9ba326bf6587ba91a9b4cbf788749305ab1cd6a4dff22fb4926b299d9193276 SHA512 b999641741b12fb2a04d89fd67c1e6e45d9081c0c2c48f7f5a05b3f7b215d05fb16ae761c5a039269da465743292018c66cc3bdfe2b34db564f5413ada3ba139
-EBUILD knot-3.4.2-r2.ebuild 3564 BLAKE2B a489703d8034c81ea10fea456e3d2eeee852e85ae8668de0c779ba4e2c50c2e06abf6f4db6fde5b60991a3e1de0d0659cbd28f42a5314d5eab836faba5a61cd9 SHA512 fa5dec0245ed7d4a7a68f71fb4130d594281c1432efc39732f38028ab8b32cf75b7eaef34c2ceb5d6463880f3b9705ec4bd572e85582faae1ec7d4b7eebdb655
-EBUILD knot-3.4.3-r1.ebuild 3622 BLAKE2B 86475684e9eeca0f8fa98f2fa727831f22aa73b9ecff86785f8e3beff756c3a1054335acc1d522c01f3cb29b5b173f502b457f59d8704978fde92e83461f6416 SHA512 3fd43764dffa985fcc7b8b1d333d6cc515a35dac5eb3bf997be83c2c57c913affe4f85587e89f7798f93a2449c2f98196d93358028ed948f4b2b52f68a9eb0bc
-MISC metadata.xml 2358 BLAKE2B 49b224bac7b6828b759663e64d9f768afa7904ab5ad87fbc48a22c9e26a24e3ccec5306171a8ee6cdef32dfe1798cfd6257a8af62f42e70d5b9f487f44dab60b SHA512 a8d48af1366421e506b6117620916a775a3ebca50cdffdd40ee45429fc181aef3d70d5f0f8a99df09ea07babbe6c6c124a2716c71ffa09ec6806e0dc10d44ba4
+EBUILD knot-3.2.2.ebuild 2519 BLAKE2B 7c38aa28ce1792b1de97e2135b6aa37a0a1cf7b806e67187cf184b4b78ccfd9f7ca18ac076c2562d92e2d6c985c1f1d33a6e5ee77d2364141aed74cf379eebfe SHA512 81d150918959655847b36006b31d6c27615ffe54a57d001ba555cbf4ffb89cf51289850b0f07f9aa5936b36e33dc8246bfff8f91d94ffb296131ea63ddd95fe7
+EBUILD knot-3.2.9-r1.ebuild 2557 BLAKE2B 98623be379ee80b9273209d68697bb6fcda3f0722b22d71a50824a0568762430bc27c28cb20d6c611dbe1503717971a27294f794897bbf04f52cd734ab3c4ed0 SHA512 87bae5d116b2744296e16fdc52b0c27d9f224233849adc0db8bbb86cd34bbbd9920507868aa34bbf7e1c71e769af647c1e8851e5d4d7d386d857aaf9430c831e
+EBUILD knot-3.4.3-r2.ebuild 4401 BLAKE2B f2989d7c9ecfc0e5a9cbebffd2f3c88e484f752f0907563f200b3e0be143bdf454f28fddc205adb6f835f4d73ce32b3b95411cbae66e2b3ac6eb28657e6d0f66 SHA512 0f64660da37cd8fdc6cffd848de88e692373cd842c7400b0c0bb94e4994d1a7668ae87bad74bdf49d455d9066d7561b0dfd47349e908542876279d4f66086ad7
+MISC metadata.xml 2453 BLAKE2B e916665c8a3c2dbb5498e061098d6bd1208acfc79e79e584e85cbd60c7da8a55d97d8e91eaa3a2b8565c9802319fc7bbd64e8212b82cfb799feb3d0dd633f717 SHA512 1a40d2185d65cee18bf8ccba12f27a1a2d17fbbb0433d0f9322a2efddd6156e70213d5fd60a7b1a64a61c02017d21dabe3a1a521e7a6b4d6d9867fea6a7acaf6
diff --git a/net-dns/knot/knot-3.2.2.ebuild b/net-dns/knot/knot-3.2.2.ebuild
index d19b7b58777e..ed2515b95b2d 100644
--- a/net-dns/knot/knot-3.2.2.ebuild
+++ b/net-dns/knot/knot-3.2.2.ebuild
@@ -10,7 +10,7 @@ KNOT_SUBSLOT="13.9.4"
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+SRC_URI="https://knot-dns.nic.cz/release/${P/_/-}.tar.xz"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/net-dns/knot/knot-3.2.9-r1.ebuild b/net-dns/knot/knot-3.2.9-r1.ebuild
index c46323b3e1fb..e93de9489b6c 100644
--- a/net-dns/knot/knot-3.2.9-r1.ebuild
+++ b/net-dns/knot/knot-3.2.9-r1.ebuild
@@ -10,7 +10,7 @@ KNOT_SUBSLOT="13.9.4"
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+SRC_URI="https://knot-dns.nic.cz/release/${P/_/-}.tar.xz"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/net-dns/knot/knot-3.4.2-r2.ebuild b/net-dns/knot/knot-3.4.2-r2.ebuild
deleted file mode 100644
index 93aa5243b76d..000000000000
--- a/net-dns/knot/knot-3.4.2-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd tmpfiles
-
-# subslot: libknot major.libdnssec major.libzscanner major
-KNOT_SUBSLOT="15.9.4"
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-3+"
-SLOT="0/${KNOT_SUBSLOT}"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+authsignal"
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-
-IUSE="caps +daemon dbus +doc doh +fastparser +idn pkcs11 quic systemd test +utils xdp ${KNOT_MODULES[@]}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libedit
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	quic? ( net-libs/ngtcp2[gnutls] )
-"
-RDEPEND="
-	dev-db/lmdb:=
-	net-libs/gnutls:=[pkcs11?]
-	daemon? (
-		${COMMON_DEPEND}
-		acct-group/knot
-		acct-user/knot
-		dev-libs/userspace-rcu:=
-		caps? ( sys-libs/libcap-ng )
-		dbus? ( sys-apps/dbus )
-		geoip? ( dev-libs/libmaxminddb:= )
-		systemd? ( sys-apps/systemd:= )
-		)
-	utils? (
-		${COMMON_DEPEND}
-		doh? ( net-libs/nghttp2:= )
-		idn? ( net-dns/libidn2:= )
-	)
-	xdp? (
-		>=dev-libs/libbpf-1.0:=
-		net-libs/xdp-tools
-		utils? ( net-libs/libmnl:= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		pkcs11? ( dev-libs/softhsm )
-	)
-"
-
-# Used to check cpuset_t in sched.h with NetBSD.
-# False positive because linux have sched.h too but with cpu_set_t
-QA_CONFIG_IMPL_DECL_SKIP=( cpuset_create cpuset_destroy )
-
-src_prepare() {
-	default
-
-	# these tests call this daemon file knot/server/dthreads.h
-	if use test && use !daemon; then
-		sed -i \
-		-e '/test_atomic/d' \
-		-e '/test_spinlock/d' \
-		tests/Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable caps cap_ng)
-		$(use_enable daemon)
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_with doh libnghttp2)
-		$(use_enable geoip maxminddb)
-		$(use_with idn libidn)
-		$(use_enable quic)
-		$(use_enable systemd)
-		$(use_enable utils utilities)
-		$(use_enable xdp)
-	)
-
-	# modules (except dnstap forced by use_enable if set with utils) are only used by daemon
-	if use daemon; then
-		for u in "${KNOT_MODULES[@]#+}"; do
-			my_conf+=("$(use_with ${u} module-${u})")
-		done
-	else
-			my_conf+=("--disable-modules")
-	fi
-
-	if use !daemon; then
-		my_conf+=("--enable-dbus=no")
-	elif use dbus; then
-		my_conf+=("--enable-dbus=libdbus")
-	elif use !dbus && use !systemd; then
-		my_conf+=("--enable-dbus=no")
-	elif use !dbus && use systemd; then
-		my_conf+=("--enable-dbus=systemd")
-	fi
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	if use daemon; then
-		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-		newinitd "${FILESDIR}"/knot-3.init knot
-		newconfd "${FILESDIR}"/knot.confd knot
-
-		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-		use systemd && systemd_newunit distro/common/knot.service knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}
-
-pkg_postinst() {
-	use daemon && tmpfiles_process ${PN}.conf
-}
diff --git a/net-dns/knot/knot-3.4.3-r1.ebuild b/net-dns/knot/knot-3.4.3-r2.ebuild
index 3de295a89f70..7802470727a0 100644
--- a/net-dns/knot/knot-3.4.3-r1.ebuild
+++ b/net-dns/knot/knot-3.4.3-r2.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=8
 
-inherit flag-o-matic systemd tmpfiles
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-single-r1 flag-o-matic systemd tmpfiles
 
 # subslot: libknot major.libdnssec major.libzscanner major
 KNOT_SUBSLOT="15.9.4"
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+SRC_URI="https://knot-dns.nic.cz/release/${P/_/-}.tar.xz"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -33,8 +35,12 @@ KNOT_MODULES=(
 	"+whoami"
 )
 
-IUSE="caps +daemon dbus +doc doh +fastparser +idn pkcs11 quic systemd test +utils xdp ${KNOT_MODULES[@]}"
+IUSE="caps +daemon dbus +doc doh +fastparser +idn pkcs11 prometheus python quic systemd test +utils xdp ${KNOT_MODULES[@]}"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	prometheus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 COMMON_DEPEND="
 	dev-libs/libedit
@@ -62,6 +68,13 @@ RDEPEND="
 		doh? ( net-libs/nghttp2:= )
 		idn? ( net-dns/libidn2:= )
 	)
+	python? ( ${PYTHON_DEPS} )
+	prometheus? (
+		$(python_gen_cond_dep '
+			dev-python/prometheus-client[${PYTHON_USEDEP}]
+			dev-python/psutil[${PYTHON_USEDEP}]
+		')
+	)
 	xdp? (
 		>=dev-libs/libbpf-1.0:=
 		net-libs/xdp-tools
@@ -72,6 +85,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
+	python? (
+		${PYTHON_DEPS}
+	)
 	test? (
 		pkcs11? ( dev-libs/softhsm )
 	)
@@ -81,6 +97,10 @@ BDEPEND="
 # False positive because linux have sched.h too but with cpu_set_t
 QA_CONFIG_IMPL_DECL_SKIP=( cpuset_create cpuset_destroy )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	# https://gitlab.nic.cz/knot/knot-dns/-/issues/946
 	cat > tests/contrib/test_atomic.c <<-_EOF_ || die
@@ -149,6 +169,18 @@ src_compile() {
 src_install() {
 	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
 
+	if use python; then
+		python_domodule python/libknot/libknot
+		newdoc python/libknot/README.md README.python.md
+	fi
+
+	if use prometheus; then
+		python_domodule python/knot_exporter/knot_exporter
+		python_scriptinto /usr/sbin
+		python_newscript python/knot_exporter/knot_exporter/knot_exporter.py knot-exporter
+		newdoc python/knot_exporter/README.md README.knot_exporter.md
+	fi
+
 	default
 
 	if use daemon; then
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index eb4839a1be64..6544e399dce4 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -51,6 +51,9 @@
 		<flag name="pkcs11">
 			Add support for PKCS#11
 		</flag>
+		<flag name="prometheus">
+			A Prometheus exporter for server and query statistics.
+		</flag>
 		<flag name="queryacl">
 			Enable the module for query access control
 		</flag>