gentoo auto-resync : 29:05:2024 - 00:07:15

12 files changed, 214 insertions, 13 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 091942b33fbe..8c5cd679c410 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 1cf58fcabcca..c7cf6e48afd8 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -9,5 +9,5 @@ AUX avahi-0.9_rc1-disable-avahi-ui-sharp.patch 1032 BLAKE2B c1dfaf13ccf195ce3b55
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
 DIST avahi-0.9_rc1.tar.gz 1057252 BLAKE2B f38c35d25c439d0d4dce00131d61d4be816fdcf14ddbe4f91fed95990ac6313b8ed905bca84f693feeccf92b891c849a994cbee80b02732108a18378b044d4b4 SHA512 c46ef2c646ae7a7be8e61ef18924a5c1349e19293ecd2e95f51dd6cd41967ea2f118ca2af48671c68a5b33687cdd6cbadb8745d95e8b69963d0b73f2d447db8d
 EBUILD avahi-0.8-r7.ebuild 5509 BLAKE2B 4f99492f82713eea178d172b907ae9df6dc8014696600f5d24c253d44870e961a65896e0aa60d6c3a6a343f323d8d374bf0fd041542acb9b16b1e4e7f1ca0288 SHA512 9fa30474f35daedc029254b5bfc52f726398f748c3b8bdd629ded23cae29428b1faa6f67b9ca1b78e200661de7542323b2abe1287a43dd27029ab17e01d3d591
-EBUILD avahi-0.9_rc1.ebuild 4901 BLAKE2B 89d7ad68085afd22027053b23a19b7638afeeb25baeebc3897ac4b10abc5483fa8d400976a62b1d176ab72764f8cdbaab2112715fc8babd5d3f87637dd6f02c2 SHA512 690269993eebce51ef783df30d051d9390f722e81da9bed74567f0ef2715910f8fe68300de7774e89fdcd7e3bd8399f161b812d4e0f26aaf6d7018a83936cfd4
+EBUILD avahi-0.9_rc1.ebuild 4894 BLAKE2B 5f9d10d9f47fb7c6cb5852cec58e2ebab0c4f1daf840ddf90980f0790438dcfce16fb5a158010848bc83535c032b65f1fa4d7eb41ecfcc7fde21b2fdc454d3b1 SHA512 5d15f30aa5e245b82040e5d186d8a72720de4b7c4cd1bc5af277adcd2be3a01e971e0690276412943943442fa3939ba343cd67127b701af1578c909c6ffa9915
 MISC metadata.xml 781 BLAKE2B 3cd5c1650ef92da5b2ad262d5fbf1a762af497d6ace24ec7ab3e4759290aa6d552775741e637c3fcd795092374c1de18eb7c55a3ca47a7abc8b576336b50a46c SHA512 5d7b752ef084f7d442cc17e385e35fc1dd1c18eacc77093d3efa398b82c2d69ae4e4183639486ec603081c24fe74ea792aa441225998d2b6c6034ec301ca8831
diff --git a/net-dns/avahi/avahi-0.9_rc1.ebuild b/net-dns/avahi/avahi-0.9_rc1.ebuild
index e4f7cb84a6ab..a26412baf8ae 100644
--- a/net-dns/avahi/avahi-0.9_rc1.ebuild
+++ b/net-dns/avahi/avahi-0.9_rc1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 6738dda3b484..eb00901eaf84 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -9,6 +9,8 @@ AUX CVE2012-1191_0001-ghost-domain-attack.patch 642 BLAKE2B 0d20b60b4f606a84f100
 AUX djbdns-dnscache-configurable-truncate-manpages.patch 1437 BLAKE2B 9ce45b62daeaf5d7a20ed3753da637d42837d2fd572a71b410e68c2c6ed5807fa5d0f7dd47a1cb7c5fa5af3b86eed69800f19c8b190f9a6c0c256493094cfa1c SHA512 464cf51a40317bb5a055463a3ccd0806a7d90b8b8ec02e95082a66e9decbb28714e8af6bf761bdf3f48dd33b9863381a2f0a4a6438a72d43ceeaa8e50d305dd8
 AUX djbdns-dnscache-configurable-truncate-size-nov6.patch 2005 BLAKE2B 01637f9b3c94831cb31688faa35a099b23d79dd57a3292d53b7b9a1b33f7feabb1fa64b6ad8578e760ace13a4de7a9e3c8d8d22588c74433774928cd87261216 SHA512 c8e1a01089d45952babff325339074c5235308a5f2788bdde967b3dc015d86f3687b589d1e8c17bb97a52f1893d94bd190a449711ab206988852c02b6715a895
 AUX djbdns-dnscache-configurable-truncate-size-v6.patch 2943 BLAKE2B 00e8547f0918ee29d1c1f38f67ea9fcacc2a773fd3d874690c588d71e6dfbc0405101e49039c231122660b8168039a6dce9012857e8d8b1aa59cee7747720dda SHA512 0aba025b163cd727b80711888cf8f329ca3f0dc14fa0b1de8f2c94bd5051ed02d5c3c84069fcc539baa797871309a1f42932e664bcd3e456831c26be19d5f5fa
+AUX djbdns-udp-overflow-response-buffer-truncate-nov6.patch 574 BLAKE2B 0af6d690af4eee6e2f050b56d790e05691e177207c81e4c06c5e8c8464d4abd1bf0d62b6d62a69b3d1d5c25180bcb04d0037a6649903754ab336f43a1d5822a1 SHA512 5a6f0492b091e1fedc40ed9dea74ee5dc26c136e5a0a6e227ff61790ec639ded6445f31cdbe984206fef9e3af8f9a8b03b71466e0d8038cd75b0ff6f3a77ac3a
+AUX djbdns-udp-overflow-response-buffer-truncate-v6.patch 1592 BLAKE2B d462b83b54580bb4a221cf0732b9523a2da74eb6494771fb43bd04896709b51cfe829c26da080de92ea12c21e5404434e4a6dc8da2388a46c22ade53f2d2cb26 SHA512 e1c06c9d0ff829e2670b8dfcb1e11cc4e061b55514bed4af3500a9e6922650afd4b002182cfdeec7591be63fffb8f02a6434d7ab38de9a65dcde1087c0f4eb73
 AUX dnsroots.patch 296 BLAKE2B 8a4375b01aab95400dd85966b6b2ddaf5734307fa66710778d5e8a1d5cce4692baad16a2b6ce0a9a85b7fb90c56ca1ab964fa0d7b57e899616fee23aaeec1029 SHA512 2c745f2545d791ed6646406e749ef8e85c30b4546657ce241c413103e42cf3cfb5001c46481bd2966390563a9cc42e53e44519747350da2b8bb0fdf1d0f5c62e
 AUX dnstracesort.patch 327 BLAKE2B 483b4a4407b3df88d91a3474a5ba29080d5e0f12c87f97052ce4dfa481f8bb3a3307c923c78f2664aa2154ca41c58c5d4159f8db81161c323198f8b177774bc1 SHA512 ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9
 AUX implicit-declarations-nov6.patch 1590 BLAKE2B 8bd687e92e22fa195d585664c254b280741602d939ff23e05ecbf4183bef05ea093580754568c2cb4e2c11015c147d92924526fd537d0dcd6d97b459507e24ec SHA512 d22e3b14c8410fbebe329002451b21a28d36a9df021000f1f0a6f8d0a3e36295fb413b7299c923dc674b14abbd7ddb08e9bd5f694326ff0a6c75146702ded6b8
@@ -21,4 +23,5 @@ DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101f
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r38.ebuild 3865 BLAKE2B 48ad84b7063fe3bad4f85a31cabf347cf190184d8ba53a1f58e41a687dcdf4ab4073a2e81745f475eeeb5eb2e9b4d90db2525e9db76fbd43e3669be435722f03 SHA512 cde9e09279e6934bd862d3e8962b2aa40348eeff2bb1ba03c7d4b8788ffc9a895a484bd7fee63b0ead42dadfb34c8cc26f700056f3417f2c26565fb443a5e2a2
 EBUILD djbdns-1.05-r39.ebuild 4289 BLAKE2B 9945ba00fa1d8ba613245a7dc86cedc0470bd43de7541419c4bbd999f469a31d8f408bc3f0cfc08d0ff9893428597907f5e8762096e6ec1b4c188aceafb40b10 SHA512 3392601d470e4e1830f23d7a7daac0dcd9149cbfcf827db762c0f6e3369ef53c8a65bdf9707591ad6c1237af62f375d8e2f9e3b5d7a7ee4b0d7107e6bd072f4c
-MISC metadata.xml 339 BLAKE2B 96fff35d31b4d0d68ddcacc52217855fa8a9273e72591c3a2eb21119dd01c7b0726cdd0f62007ee04192dd5a4999b7fe3f5a422f54432d7d35b13ba2893cc71a SHA512 e009dd7d1ab046ac9b0e2dd3d15f7371c889900beffcf9e5e0c3fc447ad513ba73186915a8c8d1518c77efc7448ca91337ed5d72c8e07d074c1577b7e06ff493
+EBUILD djbdns-1.05-r40.ebuild 4434 BLAKE2B c2cec8e3016d5b0711791f63e042f8bf263f7d58bdbb91fc1ecd112ec1d27b7f91f0956daf60a6cbab4f2d826307acc6e2c582b25504111830a8204043bd5c71 SHA512 6d0b9a11bcac2d0c1cbc2e67f990c708fb499b8b072e9e03575086968f4ea1ac978f1ae960fc24fc46492b5fbf471dfd709cea2110c95f1d43eda5ccd843e46b
+MISC metadata.xml 576 BLAKE2B ade984b384316960d3ea8de1f6ef83c8a578901cf644af5e42543038d52cdac99a834a3881e244fe6f3999f1aac030f4e39cd3cd83d4eed39dbf24b4a55ea9be SHA512 7d85669a1c841d3ea2a97ab5efcd4c18e03062526827f8ae9a97e7becddcf9e3222fee03a67933d01675b605c51dbf0ed6b1e17b9130829545c7c5bad651b5fd
diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild b/net-dns/djbdns/djbdns-1.05-r40.ebuild
new file mode 100644
index 000000000000..f5a5afde9b70
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="https://cr.yp.to/djbdns.html"
+IPV6_PATCH="test32"
+
+SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
+	https://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+	ipv6? ( https://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+RDEPEND="
+	acct-user/dnscache
+	acct-user/dnslog
+	acct-user/tinydns
+	sys-apps/ucspi-tcp
+	virtual/daemontools
+	selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+	# Unpack both djbdns and its man pages to separate directories.
+	default
+
+	# Now move the man pages under ${S} so that user patches can be
+	# applied to them as well in src_prepare().
+	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+	"${FILESDIR}/dnsroots.patch"
+	"${FILESDIR}/dnstracesort.patch"
+	"${FILESDIR}/string_length_255.patch"
+	"${FILESDIR}/srv_record_support.patch"
+	"${FILESDIR}/increase-cname-recustion-depth.patch"
+	"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+	"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+	"${FILESDIR}/AR-and-RANLIB-support.patch"
+	"${FILESDIR}/tinydns-softlimit.patch"
+	"${FILESDIR}/${PN}-dnscache-configurable-truncate-manpages.patch"
+)
+
+src_prepare() {
+	if use ipv6; then
+		PATCHES=(${PATCHES[@]}
+			# The big ipv6 patch.
+			"${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+			# Fix CVE2008-4392 (ipv6)
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch"
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
+			"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-v6.patch"
+			"${FILESDIR}/${PN}-udp-overflow-response-buffer-truncate-v6.patch"
+		)
+	else
+		PATCHES=(${PATCHES[@]}
+			"${FILESDIR}/implicit-declarations-nov6.patch"
+			# Fix CVE2008-4392 (no ipv6)
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+			# Later versions of the ipv6 patch include this
+			"${FILESDIR}/${PV}-errno-r1.patch"
+			"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-nov6.patch"
+			"${FILESDIR}/${PN}-udp-overflow-response-buffer-truncate-nov6.patch"
+		)
+	fi
+
+	default
+
+	# Change "head -X" to the posix-compatible "head -nX" within the
+	# Makefile. We do this with sed instead of a patch because the ipv6
+	# patch uses some of the surrounding lines; we'd need two versions
+	# of the patch.
+	sed -i Makefile \
+		-e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \
+		|| die 'failed to sed head in the Makefile'
+}
+
+src_compile() {
+	# Bug 927539. This is beyond our ability to realistically fix due
+	# to patch conflicts.
+	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
+	emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global
+
+	into /usr
+	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+	if use ipv6; then
+		dobin dnsip6 dnsip6q
+	fi
+
+	dodoc CHANGES README
+
+	doman man/*.[158]
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS='
+To configure djbdns, please follow the instructions at,
+
+	http://cr.yp.to/djbdns.html
+
+Of particular interest are,
+
+	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
+	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
+	tinydns : http://cr.yp.to/djbdns/run-server.html
+
+Portage has created users for axfrdns, dnscache, and tinydns; the
+commands to configure these programs are,
+
+	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
+	2. dnscache-conf dnscache dnslog /var/dnscache $ip
+	3. tinydns-conf tinydns dnslog /var/tinydns $ip
+
+(replace $ip with the ip address on which the server will run).
+
+If you wish to configure rbldns or walldns, you will need to create
+those users yourself (although you should still use the "dnslog"
+user for the logs):
+
+	4. rbldns-conf $username dnslog /var/rbldns $ip $base
+	5. walldns-conf $username dnslog /var/walldns $ip
+'
diff --git a/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-nov6.patch b/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-nov6.patch
new file mode 100644
index 000000000000..058691cb94ff
--- /dev/null
+++ b/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-nov6.patch
@@ -0,0 +1,13 @@
+--- djbdns-1.05.o/dns_transmit.c	2001-02-11 23:11:45.000000000 +0200
++++ djbdns-1.05/dns_transmit.c	2024-05-27 16:25:11.857369652 +0200
+@@ -265,9 +265,9 @@
+       if (errno == error_connrefused) if (d->udploop == 2) return 0;
+       return nextudp(d);
+     }
+-    if (r + 1 > sizeof udpbuf) return 0;
+ 
+     if (irrelevant(d,udpbuf,r)) return 0;
++    if ((size_t)r + 1 > sizeof udpbuf) return firsttcp(d); /* if udp overflowed, retry with TCP */
+     if (serverwantstcp(udpbuf,r)) return firsttcp(d);
+     if (serverfailed(udpbuf,r)) {
+       if (d->udploop == 2) return 0;
diff --git a/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-v6.patch b/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-v6.patch
new file mode 100644
index 000000000000..bf55e7dd86df
--- /dev/null
+++ b/net-dns/djbdns/files/djbdns-udp-overflow-response-buffer-truncate-v6.patch
@@ -0,0 +1,34 @@
+Deal with local recv() truncation.
+
+In the case where an upstream cache sends a UDP response that would overflow
+the djb cache's default receive buffer, then djbdns would treat this as an
+invalid response.  The norm nowadays is the send >512b UDP responses,
+especially for TXT RRs.  It looks like up to around 4KB is deemed acceptable in
+most cases I've investigated.
+
+So, in the case where we locally end up reciving a truncated packet by way of
+recv() because the local UDP buffer is too small, treat that like the TC bit
+was set, because really we can know the response was truncated.
+
+Therefor check the irrelevant (inappropriate response) data first, then if the
+buffer was fully received (it might be that the response fits exactly, but
+short of parsing this buffer there is no simple way to confirm this, so just
+assume it's unlikely to get an exact sized buffer back and retry using TCP
+anyway).  Yes, this is a waste of resources in this specific case, but so be
+it.
+
+Signed-off-by: <jaco@uls.co.za>
+
+--- djbdns-1.05.o/dns_transmit.c	2024-05-27 13:20:25.788463090 +0200
++++ djbdns-1.05/dns_transmit.c	2024-05-27 14:13:38.786335627 +0200
+@@ -266,9 +266,9 @@
+       if (errno == error_connrefused) if (d->udploop == 2) return 0;
+       return nextudp(d);
+     }
+-    if ((size_t)r + 1 > sizeof udpbuf) return 0;
+ 
+     if (irrelevant(d,udpbuf,r)) return 0;
++    if ((size_t)r + 1 > sizeof udpbuf) return firsttcp(d); /* if udp overflowed, retry with TCP */
+     if (serverwantstcp(udpbuf,r)) return firsttcp(d);
+     if (serverfailed(udpbuf,r)) {
+       if (d->udploop == 2) return 0;
diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index 6e76cd2b88bd..7fb0b75a8609 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <!-- leave this global flag defined here to avoid a pkgcheck warning -->
-    <flag name="ipv6">
-      Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 support.
-    </flag>
-  </use>
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<!-- leave this global flag defined here to avoid a pkgcheck warning -->
+		<flag name="ipv6">
+			Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 support.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index e3f6c7cd388b..83525c1398a6 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -7,5 +7,5 @@ AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93
 DIST maradns-3.5.0022.tar.xz 7375408 BLAKE2B d79fd800099f41e6395537b8a9d945820cd295c9a3be8bec0850b8c85df65a607b07c3a0949a6ed058d1155514836d5a72a3ab0512a4369a979b021c80159908 SHA512 0c4df5aac0a979a74f811c9ccd30e2708f6b21816d9d70b88bf31ac4a65175b46c3a53adf439e098c57aa9b79250c26a38c8cdf26e0ee52637092a184d852076
 DIST maradns-3.5.0036.tar.xz 9192932 BLAKE2B 43d2f84b937a176b794aff68fc4fe73b5aada96df27ebf16dde04be1b7883ff5a95a07b5ce37dc65b305979e1b4379d5b540e59f917bbf1518d4f909bab717a1 SHA512 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e
 EBUILD maradns-3.5.0022.ebuild 2674 BLAKE2B ea27c89935236f60a66d814b790195e5c7bcdfb8fe1bdda655cb833513b3d110e852335171d5e3226722f48db575dc5d4b6885061fd4b509a5caf503ca0e4528 SHA512 ad40901959a7e86272dd6c606c5f4b8ef6c8e7e5c81e510ef89317a1fd29b33c4145c10b3d5b7f86da0955dce491b6a054b539d30f0c6a569640255f162f2085
-EBUILD maradns-3.5.0036.ebuild 2602 BLAKE2B 89dd5e39c790e86b778373959481817b389d78934903e4f56b683ac8706de57369c58bd34c121df20d962ad2c23accfee33c995a18feba0c2c90d368137fd6e6 SHA512 8d80d7e08770579f76cecb408f4f2befa6166712fa351890fa4e69cc23a96463ac91c340f8c58be001e119a626b3ed25bca5cb94416c8884cbce881f8a8d689e
+EBUILD maradns-3.5.0036.ebuild 2601 BLAKE2B f9e7ca47be9f41be44ab25bd4dfb36fc7b87b931dff9dfccb8e510c8f49d8181822006695b20f61d054336d0f9936d8dfaab072bfe93e1ad871750f804024d53 SHA512 fd1470ac60ba14d738d53acb1293767477f5d4cc3395ec62f9ee19c83c840cfa27ea54c9a49f01202d2723b1863b0ecf695c9c62d00362c3a8b2e353e78a4ebb
 MISC metadata.xml 262 BLAKE2B c06e19c824b3a1235a60dd441b0443e2bd2880c90d531b7775402b1f89a89347127b4ee72d7d114f93a2ded7bc0dde81c61cd16e5eb38923ea3d13565598e3df SHA512 a6cf0c235960afadbf8e447a7f7c07c0fa2f713334ad7019e237885df34c0027a62bf3bed1f9600e8d1a4be1366686f6ae65ac3b113f0328e3d628a6eabb7f71
diff --git a/net-dns/maradns/maradns-3.5.0036.ebuild b/net-dns/maradns/maradns-3.5.0036.ebuild
index de0218026790..e60c33eba95b 100644
--- a/net-dns/maradns/maradns-3.5.0036.ebuild
+++ b/net-dns/maradns/maradns-3.5.0036.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
 # The GPL-2 covers the init script, bug 426018.
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc x86"
 IUSE="examples"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 486f378931a5..51766fb3f6c1 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -14,6 +14,6 @@ DIST unbound-1.19.3.tar.gz.asc 833 BLAKE2B 6eb71dde451a123ffba44c298d83256613c63
 DIST unbound-1.20.0.tar.gz 6550938 BLAKE2B b272a6b8c0118819d9803f0c7f7a4b7eff77e37682f4a9a0f749cafa08da4d4de01cd7bf71698b8fc5a7cdf5ca03685978e6b4395c586c35d1d13bebb7cbb538 SHA512 2f6bc76c03b71ca1c2cd2331dc72d62f51493d15e17c59af46b400e542fcabff22e6b9d33f750a3e5f918a0116f45afa760651b2d5aa2feadac151cbbd71b0bd
 DIST unbound-1.20.0.tar.gz.asc 833 BLAKE2B 14e53fcb692c1e078ae334d298c76ed30b8dd58fc0ba396c6b46edc7a4af49e4a3d2a15874f2a6a59365b129bb819b47327a5cc6e0589c06471a466d84d15785 SHA512 1586a320077c606c5c19f251615df54a61854f51acca02df1d391dcc2287aff2c641b009aeee1a98392f63719d70b6bac23ebb7d86b780f8a27cda6e114fc0ad
 EBUILD unbound-1.19.1.ebuild 6499 BLAKE2B af0b2c77a1a13323791bd72c0f47d924b39febf6e7e248140ca5da9a9b74047c9cffa6f504cb96d047e4902488983da89afbffaa56c3cb4c0c324da3f18d8929 SHA512 b69fefd7c1f4946a88267d7505af742a26c37998b6f63f604093e7892f29916904b7517ff2f6a19a6d8eb98f74370c43d45ad054b14853a95ba7458a3f733feb
-EBUILD unbound-1.19.3.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
+EBUILD unbound-1.19.3.ebuild 6502 BLAKE2B 1749580250aa84424fb0f9e05f30d7653a5c4c98d1308d52813efe449f5afb39ef1c917ca0aab027a54cc88a99bebf76a0f1bfb0f173fed41c8dcfc2261ea2e5 SHA512 6701384580f6c42dc6c7e63ef6b157eaef6e3a0d3739afdc2576a9ea6aa8f54dbd46a810f5ae3f17000dbbb1e0b181c2774616ce2c7207f4d600d0abe8bb9b9e
 EBUILD unbound-1.20.0.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.19.3.ebuild b/net-dns/unbound/unbound-1.19.3.ebuild
index 67da62c07740..c4220315f7ac 100644
--- a/net-dns/unbound/unbound-1.19.3.ebuild
+++ b/net-dns/unbound/unbound-1.19.3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc ~x86"
 fi
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"