7 files changed, 115 insertions, 4 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 08c95b72c16c..3a416cdd84d9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index b0954db53526..0cbb0ca21411 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -3,5 +3,5 @@ AUX jwhois-4.0-avoid-implicit-declarations.patch 1424 BLAKE2B ff8be8c49b456e890f
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
 EBUILD jwhois-4.0-r1.ebuild 664 BLAKE2B 666303e775b637fef393fea99934c39b55ea91815bbd0913aa40cbb5575351753577798b9e2f0156d79bcd1db1fbeed1462a3ca06603cdf4e0c7238f3c3ea562 SHA512 d638232665d795b390bfc1b00c2cf7bee128c28419d7c5d9536b277ecd6b7ca8f1238d385da8e0f5622ed5219ab15cb4752c56b27be19ebbed75315e32b3d221
-EBUILD jwhois-4.0-r2.ebuild 861 BLAKE2B f780c32ec0365aed238629d4d96fd739c0832901609b7a98e2efc037a5edc98528c780661d0fc2a2933fa1f77782a8599737c157a93121477237598484edaac6 SHA512 31e08fe7e410629e801978162f965392951c45f07f059149973b14b156e63183dcfb7613614540d1695549f5a078f68b384e6ea291f62ae0642282920c1b533f
+EBUILD jwhois-4.0-r2.ebuild 860 BLAKE2B cadfe7b53824dd3fb35c3de4078f85ac32504725f547c33729513ab3d7509576713aea4059fb07cafcadbb47fed094aa456a6da2f94f8034d81c56237e6f4a79 SHA512 bbf624b89d352ee06b58088e2ef456658891e16097a929110cb483ce77d89355aab857aa528180284386c3d16042250eea5e0fd059784f99f9b80d8eed262018
 MISC metadata.xml 397 BLAKE2B aba6ab91f71b858ca2399d55f86685ab4973dc6dd31f7b46f718eac316a65064a774b3d830ef35e1f791236c3a2e8b29ee915970ec85d533c9ba4ceae86f84b3 SHA512 5d7f70ab21dd6d8e7378ccc1b619535cc20fd76ffb61f90a2ef06732f58fa5e91ca2d99dc91ef89c2d7c9b3b1de478757ca40dbf3c0d65c3da23df5bde42e16c
diff --git a/net-misc/jwhois/jwhois-4.0-r2.ebuild b/net-misc/jwhois/jwhois-4.0-r2.ebuild
index 3a9eb8df252e..ecfef500523f 100644
--- a/net-misc/jwhois/jwhois-4.0-r2.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="idn nls"
 
 RDEPEND="idn? ( net-dns/libidn )"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 8c7b51c4f0fb..7f253d7a48e3 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -4,6 +4,9 @@ DIST miniupnpd-2.3.3.tar.gz 260079 BLAKE2B 4b32e05bc7002bc7edc946f01b1984f3d184e
 DIST miniupnpd-2.3.3.tar.gz.sig 543 BLAKE2B 33b6166ba64a7a7c1b019c84d8a623d2905f32b41ea6b7cfd96c180e3d8738af264b5f073a9503c037f4609f15cb73f039701368eba63764de9edc79159961f6 SHA512 f2b167fec659e2f366ac180e8245c35e2907f5fb6be31fb62aad072e8a67868b995dd9400b4f41ebdfe2dcb46df583e5a1d6260f93c9b3eb25ba46bc7f6106dd
 DIST miniupnpd-2.3.4.tar.gz 260810 BLAKE2B 7ce722aabcb0142740ffd4669c4326a99ed2903c1a0da984c5c3eb2ce523c4f6919d73b84708857ca51711fb4fdb0f8f00547ba81f3ea0e7bc700d166c07bb69 SHA512 7e84fcc7fbbdcb8e40d8ef35c48b331e0189427ca61d67b33c856c0598496cecade2bc7880590581c5eaf77c686496bb3228ed93d3d8edc073e8f5781a03ae9e
 DIST miniupnpd-2.3.4.tar.gz.sig 543 BLAKE2B 5940c26bc6717e2b6f636dded1a5d7e4625d69e763191fe97fc7c2459ad9957a80d809c5795511ef35ef005817abb01a78e1c0f0af0c2508fea671a1fba17212 SHA512 abcea4fa53b31582e2bd8db1a1df53b25142757e760e62c4200c3067d3f8c2f9b6d11211d6d1232cc44565ded8503279e05ed42c3915a16ed432063f555c00e3
+DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf3726927eac42dc316b7251dd21e705be62e3d0bb2e159ff7a5a72078bae2c04bd279d0a97fe2bf378dc8c039089d8 SHA512 bbb82f1b94a68c1bbf65a2e188b39305ec265cb89d9c0f3ab2d3c72eee43ee33c7d6280161344a8d51828cba2e62e2e5f9a54b0c0089503dbed5cd3a154ff0ff
+DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da
 EBUILD miniupnpd-2.3.3.ebuild 2361 BLAKE2B e3de6c666d983fe708bfe822d6bb5d1c40b1d499862f2e6b9e2fe426a0624e79ae59247a9349af2ccb03f7bb77ef862a069684fe007ae7d957190100e90dcb65 SHA512 04ddf52d97dba78ef993116ea6d44fc564f111392b7ea49b524a8acab9d054ac294a862817668520dfe3bb166aefeabf2e91a7cfcdd632481d1be8e3b36ba9d3
 EBUILD miniupnpd-2.3.4.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+EBUILD miniupnpd-2.3.5.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
 MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild
new file mode 100644
index 000000000000..ef90208e7b6d
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="
+	http://miniupnp.free.fr/
+	https://miniupnp.tuxfamily.org/
+	https://github.com/miniupnp/miniupnp/
+"
+SRC_URI="
+	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
+	verify-sig? (
+		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
+	)
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6(+)?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	default
+
+	# fails without a default route
+	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index f01bdf963ba8..dca8c986489d 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -16,6 +16,6 @@ DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e
 EBUILD rsync-3.2.4-r3.ebuild 4750 BLAKE2B e743c73dae35b841ad484d3a1dc0359ced3ee95d4357949bf1d8a805f170a46039de35275406cc051cf2475f89333f9c8593f08ea6a2de0ab8eaae1702755d8b SHA512 7bcda7d6e51a17fe8ad3a609128934d6859f6b6eecd308a5939199efec0f9726bdb78a726c37541c85e506db55e455b30f050a6b9e615810f4647b79f986941d
 EBUILD rsync-3.2.7-r2.ebuild 5420 BLAKE2B 2116751f4b399612a3869a59d7e361025ddeb179df10a37fc99792e8d33f4cb4fadfc9b143d26b116cfd08753bd181c92055b048ae7b803495840b8ff00c9f1b SHA512 cc714464c0ca82f1ed6b62fbee7c348551b35fdffaaeb1208fa4092be91b05c83b48f19e4ae187242135e34f09beea2bc311969fffe311219aab9604597d2b51
 EBUILD rsync-3.2.7-r3.ebuild 5463 BLAKE2B 2f9d9817d012964c8a8d095c7fb185c997c26df59f00208668df2b22a7149a0cab46d357673b7eee83d93270e64032a2f5bb4789f2b414bcc15b207eede99049 SHA512 9ff32348b129137a44cc994f1fcaa60b0e55377f6d24916ff287e3f8ed4bc282423de2a55dd68265cd48e545b96c00f76440a796b48c16a8b5cec3e8c55ece48
-EBUILD rsync-3.2.7-r4.ebuild 5516 BLAKE2B 433a55570598fa619205ce4916584a1c9b4a6c354b8e2fa8df6067ec40a74ca91b175711bfdf355cdee9c2dc8bbdba284cac17b2c3a3c0caee0bb42a4b31055a SHA512 8e2acb0d03dfad78bad23d886df865a45554f4bc88c0b2020d11c228ab0ee29aa3d90a1076659c88bc5597322d19c70e515220f4763ba94e6de19a43343a548a
+EBUILD rsync-3.2.7-r4.ebuild 5515 BLAKE2B ef7f6b573ce3e6245e8dd1cc7173f3d1d2b66eaddea02e79533ff7b643b6bbe354cfbd0f92749f160c8ca2748a401b5037cc6094da439d13a72dc949c1ce99ad SHA512 578477292c59ba7adf3074cd99505990e9ae09a1aaace7e9fa1ca9df25f734129713059eee5825a8492111a42e5977b09f4315a3ed71d054a3aec2e61b59453c
 EBUILD rsync-9999.ebuild 5428 BLAKE2B 45d968a8a88ecade2dc75a3427d074f0afeb9f4f909ac1a20943a5f89ecd8a1865634dbc26f1327e83b1d7b68ddf2d01380b0e25abe7b77bc78a05f1d991741e SHA512 aa68bb7a0f1ccea651e7e0a55af44346144cb5af1f176d0bc4efd00835498db694afd9bb31eac40d13d12ec624b9ba6e47059df123e9a19d8f211c649322819a
 MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14
diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild
index 07a19b413f0b..2d7cc85f312e 100644
--- a/net-misc/rsync/rsync-3.2.7-r4.ebuild
+++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz