gentoo auto-resync : 24:03:2025 - 00:31:53

9 files changed, 239 insertions, 89 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 50777f569ccd..2de6fedc3fc7 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 7a1006e30185..6ca95b249d99 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,6 +3,6 @@ DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0a
 DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b SHA512 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
 DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
 EBUILD bind-tools-9.16.48.ebuild 4437 BLAKE2B ceb368911ac87e28313213ac67024c1bb2ae9c03fd12322a309ff74bc8b113401e5cff37fd1a69e28c8fd4959a5597c5e90ec7ce80fee9e16fec21445918ffe8 SHA512 7025d670c51ccf1c0467ab183a353042d4466d64f68511072ebc2f416b607e49d5517cc4c1e5c261dab4f82d231f0ffc5380084c46863b781935738c9ac89dd0
-EBUILD bind-tools-9.16.50.ebuild 4441 BLAKE2B 6d0be779cca5491aeffef4ecf222c6f09dd9c888b07d7c3afee665a2bc83308576341e538a3cd83213128d74607a7067efe074bc7f78ec3acbf2e1063d6d2754 SHA512 e9dc4768f6968eaa656d98aecc01625ff98372b0b0c502778bbf04930e0591ee428d99c81c8b1ee28dc48c0e6605974c491ef1cc1cffaa93f0658a3cd11655d3
+EBUILD bind-tools-9.16.50.ebuild 4440 BLAKE2B 95f0ead2b8b16727014533324bf47f73040fa71781e9c09d39d4cb1d41f9d7a181d487fd89fb7e66e4c56199f46954dc2e129f247823232e50349cc9637fc448 SHA512 4090b3d0cf02c40670b579494f53828c75455f76d05c771ff14699afb43f753b545e8418582faf7666105d8b0a3dacd6727061eaaaf40b7c3dcbdd59047c4f33
 EBUILD bind-tools-9.18.0.ebuild 1084 BLAKE2B 57a529ebcd51bc45efff84b66456bb6124928f5c029d92fccae43a9d2750343de4bb33f0bec99ef9905a57a42f05bb1fca49dfd9324fee5db80626e35bbb2b99 SHA512 ad9107e08064b84db16564f724a820834cc63a770e8af2b791cb4fed9abe37aa63b621a937b3be6a8ab52af2e500bd05a63fa379731a9dbb6b47594177485431
 MISC metadata.xml 393 BLAKE2B 90453ff0da1ce62c68dbe5c2f8ad99747388e8476afb02fc3794705d9acebbde1fb1d0c1f282a5e3fec62211b02af74c05783ebc2353dbdee3f2f0ba51541430 SHA512 d4e6b6f90058fedc771b2ecde5fb8cb8b3aa4069bded3a7a1ffe01766ca05b08a25b2a7f6d3f9cfa796868b9b290b20d2531ad25b7548427807125a2b8ea5bad
diff --git a/net-dns/bind-tools/bind-tools-9.16.50.ebuild b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
index 122defbfea99..9d1fac1aba0c 100644
--- a/net-dns/bind-tools/bind-tools-9.16.50.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9c006f415c02..a7c0859fc305 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -20,7 +20,7 @@ DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459
 DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf SHA512 e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.48.ebuild 11761 BLAKE2B 18aa8cc8e62794c72bd1ecb6cfc189b2b840b13e49077c6289fc991ebf7802dbb50573e06277b66fd818df6e293d21d8336b0a9fd002375964244b00e4f0f9a3 SHA512 b6b4887ca05afda804c0c3ebc6f06464a0865d86e2d8992c646a119f60c6c88df73ad4af833d88a7f5fc688ddd4cf1d507e38f30f27e6d686025fbf9adb0c7e9
-EBUILD bind-9.16.50.ebuild 11765 BLAKE2B d6a951f9a3c9df2429fd5be6b7bbe2a0d7a3023d1309848c6b6f27ecd624a836c1ccfe87b3671bf1273adc9d599a29611ef1838bf1edc726161b09301d41f5fe SHA512 d63ee808be0167bfafa3ff882435889bb826bc17c82af77e76550049942fc0423ba8cb3cf25de62453d8f2a4bf33f5f2513700a77fabfd6f244f5496da771db5
+EBUILD bind-9.16.50.ebuild 11764 BLAKE2B 16277674954db9c35c488ea1189340c83a596e2bc0f89694fee6e23054aac467923fbc247b1b670b715280cdce4c1ce4747a2cd040d85fbc98b2ce1ca61d0493 SHA512 2ba2e093a4ab7606d3f200124e1b7255c716dd9a3ae4bd9a084b575614c32620d899f63d7c09fcd719da3f452868c8a43d3ee27f7e4f4526ca2d091d69cc4e33
 EBUILD bind-9.18.29-r2.ebuild 8061 BLAKE2B 822c6eeffdeb29b33d01161c9ab021a23e455e82e2f60c209ff39af833cbd0934f1d07981b1502781692f9fa54cfaf804ea6b001003338a773f4b4752ae81a4c SHA512 4fe80f58be8946faafa3679c01450c5d4bca84fac68bb5872fb63749db0c1085ce58def805a35d56aa869bd9e57db90abd355f052c9feea804afe79e9574ce6b
 EBUILD bind-9.18.31-r1.ebuild 8157 BLAKE2B 8c8c8f73b8256ccab95976e352ace4a91963b1984a4672a91131d34cbc05f1e77c9323a56725e1198b9efb20e8db7fc0018ced91283339bc95ea0050b4ea3d31 SHA512 cd511adc466572116ffad991cf918ef5ead59f87f09b16c5af72d0b2f40dcba5faf61e2242dd3df4f0ce5b4be621fcecd54a65d777cd70fe509d79271a75cb3a
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.16.50.ebuild b/net-dns/bind/bind-9.16.50.ebuild
index aba19425fc47..2bd38cc304f0 100644
--- a/net-dns/bind/bind-9.16.50.ebuild
+++ b/net-dns/bind/bind-9.16.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug #602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi"
 IUSE+=" json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9b71475701e8..3e972894e956 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,7 +6,9 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.89.tar.xz 562700 BLAKE2B d8be39697ce7d4e7beacf6d94a9ba1842fe0099f7ed7ebb243a7e6e5af8c83195e4723e60841705aee70a43510279be8484a9474191ddcf17eac1ff4edc5389f SHA512 4384ed5b673e10eaf6532e6eaeb5c0a6b817581433cc28c632bdcbadbfc050a0ab73bc5b73c98d708cd39515bb3f72168714b0aa5f16436cebdd18020648d428
 DIST dnsmasq-2.90.tar.xz 570672 BLAKE2B e5a7a3f3b1457c94f508a17c32f1f14267ed61009058295e0202bee7a1798a3eb72c70e53c799f25fb6030b389c5eefc5e50845896b71b733c0fc302d730dff7 SHA512 e169de1892f935e219b0f49d90107f95cba42b40bca20bd3c973313c2cd4df58b929af6628cd988419051d81c3b4ccf8e9f816274df7d0840e79f5bf49602442
+DIST dnsmasq-2.91.tar.xz 576820 BLAKE2B a363a084ef528d792829a8f83616dd490a3a37c04812f1b98b8cef6422d742cacf3d91a88b528b3806511a9a7e8c3ab7c42193d35e6a3e05c2c54c7ff4e48252 SHA512 d8b062d28f32d0e499e551aeebba75d3ea9f6a5173d78f45292cb1ef28a5d0f7c86982d987fe25c3cee9f139023b1fd023130dddd0dc849fb0cfbd969c3b0c7f
 EBUILD dnsmasq-2.89-r1.ebuild 4837 BLAKE2B 74552b0fcbeb0bf2b0ae42154bdcb1ade2c9a06e2a86616869e2029c7851f0bb2bb5dc198799ff1f481975009529ab309cda5bfe03b5060e771f9202c81f408e SHA512 ad508eb7fec26485dd3c81f147aa32bae5191d0018e45a8ef1e59634f27df4845a7a7c5584c1b93161fa1985ce0b96e16b80d173d2a95d9757f8eab6ea95c569
 EBUILD dnsmasq-2.90-r1.ebuild 4999 BLAKE2B 4f3f3c35d6cbe331bc9b2fbbe92b08f752f37ea257542b8f8a8066a48e67a72aa103fe25cc85ec978d347f8017429f767eac246c6e0ceeb193998234b99d0217 SHA512 a62110a3107dc2cc49f5a169a2b7749e4312071bae699fb7c8d754ddc77645cd8dbac30649b01c82c2f75d4edddb6d07b98c9c47ff272145b282c26862edf197
 EBUILD dnsmasq-2.90.ebuild 5060 BLAKE2B b16ee4a91ac2d642f84d45c18431924c573f207c363b133b242fd1a9692b322ec738cfe2f7155efc48648e6176f09d3a980e335ecce99d324d2238b77945d7f4 SHA512 76d9a2deaee75c32dc1e8e9db562ca3be81b10e2274150498e6c03d2bb61c513401c2ed502fdee815d65a574bd2e85c24849a70a63fcd9efe7822f0737bb7935
+EBUILD dnsmasq-2.91.ebuild 4933 BLAKE2B e52f0b59b93b28895b5c966de5d816380c8e7a57490738f3cef60e9ea88f8c04488a01e6d8870b8bbf90c92ddfc852eb71df73962b58b78915b2806bc8671f9e SHA512 520d9eb31ec193d60ba93a25631a3650b0482fa607e53d624a4dc7e2409d24bb8c17ca9ff7af5bfb26730b300b8241404b1b48edf5bcc66cb235701cc6f025c3
 MISC metadata.xml 1449 BLAKE2B 532b630e5c03652df74dec95bbb6c1c03b0d8a8fbc78ed1b2d40f47fdfbc20ce21172259f630acb5d14eb32b849d1d5b34482ffe77d4b5eee64051e839f17607 SHA512 e58549ceaf7a252f0b8b4c3a678cbc57bca66bf749bffbf8ec5544e79a380af695e3412c8d59d941bd08ed6cb95ab27bc2a13fbc46a4f5368d9e209e3e33bc99
diff --git a/net-dns/dnsmasq/dnsmasq-2.91.ebuild b/net-dns/dnsmasq/dnsmasq-2.91.ebuild
new file mode 100644
index 000000000000..452a2f2337c5
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.91.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit toolchain-funcs lua-single systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
+IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+	acct-group/dnsmasq
+	acct-user/dnsmasq
+	dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( ${LUA_DEPS} )
+	conntrack? ( net-libs/libnetfilter_conntrack:= )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dnssec? (
+		dev-libs/nettle:=[gmp]
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+	nettlehash? (
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dnssec? (
+		!static? ( >=dev-libs/nettle-3.4:=[gmp] )
+	)
+	nettlehash? (
+		!static? ( dev-libs/nettle:=[gmp] )
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="
+	dhcp-tools? ( dhcp )
+	dnssec? ( !nettlehash )
+	lua? (
+		script
+		${LUA_REQUIRED_USE}
+	)
+	libidn2? ( idn )
+"
+
+use_have() {
+	local no_only
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	local useflag="${1}"
+	shift
+
+	local uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
+			"in this case the static USE flag does nothing."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
+		dnsmasq.conf.example || die
+}
+
+src_configure() {
+	COPTS=(
+		$(use_have -n auth-dns auth)
+		$(use_have conntrack)
+		$(use_have dbus)
+		$(use libidn2 || use_have idn)
+		$(use_have libidn2)
+		$(use_have -n inotify)
+		$(use_have -n dhcp dhcp dhcp6)
+		$(use_have -n ipv6 ipv6 dhcp6)
+		$(use_have -n id id)
+		$(use_have -n loop)
+		$(use_have lua luascript)
+		$(use_have -n script)
+		$(use_have -n tftp)
+		$(use_have dnssec)
+		$(use_have nettlehash)
+		$(use_have static dnssec_static)
+		$(use_have -n dumpfile)
+	)
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && printf -- "-i18n\n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		DESTDIR="${ED}" \
+		install$(use nls && printf -- "-i18n\n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${ED}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && \
+		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+
+		docinto
+		dodoc dbus/DBus-interface
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index e409949c589b..b27b2c74deb3 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -5,7 +5,6 @@ AUX knot-resolver-6.0.11-abs_path_socket.patch 14998 BLAKE2B 83cab45c77fb86fc55c
 AUX knot-resolver-6.0.9-config-example.patch 992 BLAKE2B 35d2d4705ee916ffba56a4019bf07fddf64b4ec52fe599338a008acf94c6ec418ee8c6ff2b40706eaffe050b52f322cac5bac27956b639e28b53accabfc24869 SHA512 64d70abeb89210d26fa5d0fa56d8ab9a6294b5955704ccd333f83d94d7aa5e312c3342b9d370697c8eb74590e6c38422d23640a1d3806a33e9817ae56a283ec9
 AUX knot-resolver-6.0.9-libsystemd.patch 799 BLAKE2B 21c94660986683ed2515320c1e9d75fd62d98947c1accbacc3694431a9baf1d35a72c4f487e3938101e104368b5aefab91162f5909501241eefff3b6d7da8d8b SHA512 71fe41053eb4cfa22a7440da49f4f314acba5b688ef938dd4602b00eb12e0f88fdb4d45a6d8fbf816c4ea1f5363b9973c0d3d7f60286b63a7dfa071b7f016046
 AUX knot-resolver-6.0.9-pytest_tomli.patch 929 BLAKE2B 1a0349c2bfbe945411c2220e50be2c93fb917d3c81c8f506576ce7457595da932ab1a717b812656b76b1abc928bd0276327cd37d524a402410016d092d5f71dc SHA512 643e208b9c12156b8a5173afe2d46e489c9f9eb396847c825a484594f3fe3fe7395bd15083a0940e3de36a0b5e6a866364e8dc32297f0e9a4fafde5088ade002
-AUX knot-resolver-6.0.9-sd_notify_alt.patch 2556 BLAKE2B 3f64633d82e1a2b78c0c8f04da68aeb280553ae1ce27a21eca66320e7c99e3f0ee8d15119da8d9ac2fe1d742e1b62ce502a66ef47b2b35c14c1945872bd312b2 SHA512 46135f5f2dfa58055ed6e9b4948d57a56a18119679d82033bb6e4fa9da82975c54a9eff73ecadfd8a597285593ae2d9b7841c078a6587277a3a51219eb3a6d14
 AUX knot-resolver.confd 336 BLAKE2B eb4e119a67bee3cdcebcee7f917ad13a1976eb04fb82f42f810f79ea6550f3b8391842aa213808686f939194768c1ba339e586c0af7df0d34c9309e5b541d93d SHA512 422569884ff1bd7bcc73e710738022de77b8b063125127b584488272f66ee105256b12b1b66b45a68520f6f5c15f519eb7166ba3dc8fb5f9982158d0d0be3fbd
 AUX knot-resolver.initd 936 BLAKE2B f0681cf1c837089348196487ad6858998e76ce6f2303e68478e5b0d9b0de6307f198d5dbbf05a4debea3f02b604352c5460636e29251452833df1b397e5d11af SHA512 535b626f95de4c79906c2df0bf0665234aab05f7bc30a67a8eaf0db37b4bc6cf630d613323a5fa882bb2b40ee712805c8259323c3c87a004c70e8834926d7208
 AUX kres-cache-gc.initd 625 BLAKE2B 9b6002cb2811d1c6ad30e1c6dc98fc39bb17760d80f76f3c218857dd10023001c75684c8930a596713513bae067d68992cb1d91d167eeadd95214cba736b8135 SHA512 f4826fcdb61445aecc6b380f2e44dc193e93eaf6164f6f98e89cd67d5b1aa130eb17941e623276401982a7bf454a2155d3e339ad34d18f0b0bb361260622dfd6
diff --git a/net-dns/knot-resolver/files/knot-resolver-6.0.9-sd_notify_alt.patch b/net-dns/knot-resolver/files/knot-resolver-6.0.9-sd_notify_alt.patch
deleted file mode 100644
index 9752b314cfa0..000000000000
--- a/net-dns/knot-resolver/files/knot-resolver-6.0.9-sd_notify_alt.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1608
-Draft: daemon: add sd_notify alternative
-This allows kresd to run even if libsystemd is not available.
-
-diff --git a/daemon/main.c b/daemon/main.c
-index 44b8ae4c1b745c19ae91f6c9119b895d7738947f..230b1e453217682df387165c08f4115d795cb983 100644
---- a/daemon/main.c
-+++ b/daemon/main.c
-@@ -36,6 +36,8 @@
- #include <uv.h>
- #if ENABLE_LIBSYSTEMD
- #include <systemd/sd-daemon.h>
-+#else
-+static int notify_ready(const char *state);
- #endif
- #include <libknot/error.h>
- 
-@@ -68,6 +70,7 @@ KR_EXPORT const char *malloc_conf = "narenas:1";
- #define TCP_BACKLOG_DEFAULT 128
- #endif
- 
-+
- /** I don't know why linker is dropping these functions otherwise. TODO: revisit. */
- KR_EXPORT void kr_misc_unused(void)
- {
-@@ -209,6 +212,8 @@ static int run_worker(uv_loop_t *loop, bool leader, struct args *args)
- 	/* Notify supervisor. */
- #if ENABLE_LIBSYSTEMD
- 	sd_notify(0, "READY=1");
-+#else
-+	notify_ready("READY=1");
- #endif
- 	/* Run event loop */
- 	uv_run(loop, UV_RUN_DEFAULT);
-@@ -414,6 +419,47 @@ static int start_listening(flagged_fd_array_t *fds) {
- 	return some_bad_ret;
- }
- 
-+#if !ENABLE_LIBSYSTEMD
-+/* Notify supervisord about successful inicialization
-+ * @note tested only on an abstract address in $NOTIFY_SOCKET*/
-+static int notify_ready(const char *state)
-+{
-+	int sockfd;
-+	struct sockaddr_un addr;
-+	char *socket_path = getenv("NOTIFY_SOCKET");
-+	if (!socket_path) {
-+		kr_log_error(WORKER, "Failed retrieving env variable $NOTIFY_SOCKET\n");
-+		return EXIT_FAILURE;
-+	}
-+	if ((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-+		kr_log_error(WORKER, "Failed to create unix socket at $NOTIFY_SOCKET ('%s'): %s\n",
-+				socket_path, strerror(errno));
-+		return EXIT_FAILURE;
-+	}
-+
-+	addr.sun_family = AF_UNIX;
-+
-+	int addrlen;
-+	if (socket_path[0] == '@') {
-+		addr.sun_path[0] = '\0';
-+		strncpy(&addr.sun_path[1], socket_path + 1, sizeof(addr.sun_path) - 2);
-+		addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path + 1) + 1;
-+	} else {
-+		strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
-+		addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path) + 1;
-+	}
-+	if (sendto(sockfd, state, strlen(state), 0, &addr, addrlen) == -1) {
-+		kr_log_error(WORKER, "Failed to send notify message to '%s': %s\n",
-+			socket_path, strerror(errno));
-+		close(sockfd);
-+		return EXIT_FAILURE;
-+	}
-+
-+	close(sockfd);
-+	return kr_ok();
-+}
-+#endif /* if !ENABLE_LIBSYSTEMD */
-+
- /* Drop POSIX 1003.1e capabilities. */
- static void drop_capabilities(void)
- {