gentoo auto-resync : 07:12:2024 - 02:07:26

6 files changed, 19 insertions, 59 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 1e37ddec2a9f..ec4ba9b59cbe 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 5a2aee9f00ed..a417a6309043 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,14 +1,14 @@
-AUX knot-1.init 891 BLAKE2B 2301f632deba8af7c4f4107cb44ff611eff0b1ce2e5c60c9e3c0670fc7b07a8c93d64b4c2933035df2bc06543a08560d7b687a3925b57efc9251ae0ade3418c3 SHA512 aae41f5443c3f19350cd6869ed5355d194fe99a0110e7f565e4d136c0e258f01e85c374bbb02d4714f21ca8681e6c0858c94cad4c8679f33f567fbb7b9b3452c
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
-AUX knot-2.init 942 BLAKE2B c5905b9f254c0d882b651fa7f591849b5c234171e470b68a84facce233661bb1f1b7d1c0c98699613f43505a261dacc47b2c3737285cbb5566395951b5641059 SHA512 67ae3cd3765386f112bafc70e832d63bc8a52581c6d2dd6ebfb763da59717e3139ecf222592b3b0cef56fc012921c5c5adfab9b02fd8245270f50685fef05e76
+AUX knot-3.init 943 BLAKE2B 068a152efe75d2871d87edf4ff9f52e05e0f0d1ce22fed6bffaf2b5d19d1fbeb7bf706d442b7103aea932fb6eada0c13df935d7c16e43b3906cbf9916c078ff8 SHA512 bc6f35acc9ef9f0555ba59549d9fdb0e6fc2bbb311dd6ce220b0a7afc26835f699fd3ec6c451f250937f5384cddc4c168f172daec9461747e18fc78d8d38c4e8
 AUX knot.confd 194 BLAKE2B 9ff11bcd85f98f461a991b757023238bb18258617387e120e7b15902d8e42668e48980ad5dbfd730b07adcae6acf868f6249d5e7d8a6ee15ba5e4df78dd2443d SHA512 ae0da92420c61ba6b68aef33eb9ff993dd3c86d7cac96421511a6278a235790651ac2696582f7be757e6aaceb82d65d34054fe63063ea3bff74bba8227617bbe
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 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 2351 BLAKE2B 456d0058996844d267484c81541b35d55d48c4451c23762abb98b378f73f6371f66f2dae327fc98d1f648779b784cdcf796d4edb1bae86a9578103c59f5b0c86 SHA512 f07e0ef6885cc8ee60dfcf8a3b064bd7edb81d2f4b7d236f7fecba3ff3292cbdb3f2f2d9fa42ad45da0fc2f5f5142feda4cae40ca0dc0b0954a91db3fb2064f9
 EBUILD knot-3.2.9-r1.ebuild 2387 BLAKE2B b4b7a9a409830e548d4996d350e1958728d2800901fffd1db2a151ced90b79871121ba3c03f9995b967cb069a570d7bcf61e6986406725ff2a9bd568316655a1 SHA512 4c23c2882b13667e9a4ad6d26668abaecb01130853242e705c08e039da59ff10351b8d4262cec2709ca15052fb32fd3b8d0f04103f58cb0dc457fe7654992445
-EBUILD knot-3.4.2-r1.ebuild 3389 BLAKE2B 8a77bf8c9cb1df14a5f658800e53bfe00c5a91e2d569f28b841bb8b54ae49f3d95913da25869c364bb3da1fc4f38244e5ef8239d90d1a6f336a06f7abd8239bf SHA512 993749bc3d5fac36e43560a272134a27adb45a56e6335b4143c25eb17774b55866fa9e1b487efcad131992bde7e751ddcdacf3448ebf059b64e00c2b53121044
-EBUILD knot-3.4.2.ebuild 3348 BLAKE2B eb4d0fb6c91fc7ed0b9415e3c44c4ae0653c3063a24c21e91a7365334cdb88bf275f81e65fc90990b9689ab8ff9f76b290a12a60588ca973f98d2fb30b567b86 SHA512 5ba5bcc094d07831481e0453cbd6e511ea99560e71f717379d0f5b16a1efb4ce48e1aba8ec547a532224d00ec19696e1349810f827b776def8eccd4d0e39c4ba
+EBUILD knot-3.4.2-r2.ebuild 3389 BLAKE2B 3348f503d38da4781c128857539dab58c6858c09f5e29154bce20568ab7c45c4030dc17b5f7ca09deff06ba3708f0818ea0ac72c3b88ab50b3538e0ca8021d21 SHA512 7b4d5c6ba00ee95cff326cd5731d0c2399c5f601bad6dec0a6c3ac80c96f061cf10f3fa5be5ad0f2472df59666616eebf79e061ef199464f53b7ec49fc2440d6
+EBUILD knot-3.4.3-r1.ebuild 3447 BLAKE2B 22cc66d3a5e0d9c8c84732d163b7892db90b850de3af79e63376ac10eb40f10200bda738b24654b512afcc8c7f34f0d2188c81d68c92742427f11f2269cf76a1 SHA512 91eb6dff1a37869fc7af9fbfa5c86cd677535c9e4d9474e7fb8a5caed43aeb681a58b06d2ad33ab9430adee4bb99b7860dbb8170ddf53c71437a8b248f0c8709
 MISC metadata.xml 2358 BLAKE2B 49b224bac7b6828b759663e64d9f768afa7904ab5ad87fbc48a22c9e26a24e3ccec5306171a8ee6cdef32dfe1798cfd6257a8af62f42e70d5b9f487f44dab60b SHA512 a8d48af1366421e506b6117620916a775a3ebca50cdffdd40ee45429fc181aef3d70d5f0f8a99df09ea07babbe6c6c124a2716c71ffa09ec6806e0dc10d44ba4
diff --git a/net-dns/knot/files/knot-1.init b/net-dns/knot/files/knot-1.init
deleted file mode 100644
index 989a576dcc59..000000000000
--- a/net-dns/knot/files/knot-1.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${KNOT_USER:=knot}
-: ${KNOT_GROUP:=knot}
-: ${KNOT_PIDFILE:=/run/knot.pid}
-: ${KNOT_CONFIG:=/etc/knot/knot.conf}
-
-name="knot"
-description="High-performance authoritative-only DNS server"
-command="/usr/sbin/knotd"
-command_args="-c ${KNOT_CONFIG}"
-command_user="${KNOT_USER}:${KNOT_GROUP}"
-command_background=true
-pidfile="${KNOT_PIDFILE}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
-	/usr/bin/knotc conf-check 1>/dev/null || return 1
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile $pidfile
-	eend $?
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		checkconfig || return 1
-	fi
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		checkconfig || return 1
-	fi
-}
diff --git a/net-dns/knot/files/knot-2.init b/net-dns/knot/files/knot-3.init
index 746681496c53..907c328a58d0 100644
--- a/net-dns/knot/files/knot-2.init
+++ b/net-dns/knot/files/knot-3.init
@@ -21,7 +21,7 @@ extra_started_commands="reload"
 capabilities="^cap_net_bind_service,^cap_setpcap"
 
 checkconfig() {
-	/usr/bin/knotc conf-check 1>/dev/null || return 1
+	/usr/sbin/knotc conf-check 1>/dev/null || return 1
 }
 
 reload() {
diff --git a/net-dns/knot/knot-3.4.2-r1.ebuild b/net-dns/knot/knot-3.4.2-r2.ebuild
index f15285db8abe..3e4f6cadbe37 100644
--- a/net-dns/knot/knot-3.4.2-r1.ebuild
+++ b/net-dns/knot/knot-3.4.2-r2.ebuild
@@ -149,7 +149,7 @@ src_install() {
 	if use daemon; then
 		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 
-		newinitd "${FILESDIR}"/knot-2.init knot
+		newinitd "${FILESDIR}"/knot-3.init knot
 		newconfd "${FILESDIR}"/knot.confd knot
 
 		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
diff --git a/net-dns/knot/knot-3.4.2.ebuild b/net-dns/knot/knot-3.4.3-r1.ebuild
index 06a4f78e8400..40e3b8bd878c 100644
--- a/net-dns/knot/knot-3.4.2.ebuild
+++ b/net-dns/knot/knot-3.4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic systemd tmpfiles
+inherit flag-o-matic systemd tmpfiles
 
 # subslot: libknot major.libdnssec major.libzscanner major
 KNOT_SUBSLOT="15.9.4"
@@ -78,16 +78,17 @@ BDEPEND="
 "
 
 src_prepare() {
+	# https://gitlab.nic.cz/knot/knot-dns/-/issues/946
+	cat > tests/contrib/test_atomic.c <<-_EOF_ || die
+		#include <tap/basic.h>
+		int main(int argc, char *argv[])
+		{
+		skip_all("not supported");
+		return 0;
+		}
+	_EOF_
+	cp tests/contrib/test_{atomic,spinlock}.c || die
 	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() {
@@ -149,7 +150,8 @@ src_install() {
 	if use daemon; then
 		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 
-		newinitd "${FILESDIR}/knot-1.init" knot
+		newinitd "${FILESDIR}"/knot-3.init knot
+		newconfd "${FILESDIR}"/knot.confd knot
 
 		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf