gentoo auto-resync : 08:04:2025 - 08:43:11

14 files changed, 248 insertions, 9 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9261dd1e8711..0b7692a6fbd2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 777f3fbd2c64..2f297a4e0ed1 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -9,6 +9,6 @@ DIST dhcpcd-10.2.2.tar.xz 275700 BLAKE2B 95777f7aedc3a68e9873dd69d2c36b0235da31d
 EBUILD dhcpcd-10.1.0-r1.ebuild 4972 BLAKE2B fff05e778865b69889a86e5522e8103e3ec88495ef2efcfd8184681cf22925309673f868e77d502b26ad4cb1709c3ccd180dc498187ca16fd37fde0a7ec9b7d9 SHA512 bfe60a7f0aa12b2703bd3a8320a79850c906f9b450ebb58b9610d3ef5e6b31f185a3626e1d0f0959fd3d3321b3b9fc9a63d80631e3bce48f30576f255163d0ab
 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.2.0.ebuild 4975 BLAKE2B 80cd65893ab4a5c5b3cd6e9913278d2ecfcb013c40898e3a2f26fcf7ad2f8ac11825ccd26ba633ac420df20d46f6869c3e52c77c7afe286bb7e027262b0f5960 SHA512 5e3d62016332ee3c7c40c1ae2f2e1f23fc416d22a309f6f2f7122fc990a79dbb67f1bce03328abc1a6645a2e8f5cf2468eeac1225ee99539d1612d0f80de8d71
-EBUILD dhcpcd-10.2.2.ebuild 4929 BLAKE2B 289c25dd9b2d324e87038bd5e85e96bd39060100da8edb165ae7e67740e0b70fb484281d1d0de55df4c1117b293be580c85bd11a2a61ba144ae8b7f0d180ba9f SHA512 3f48e484e1c8a61f99c3d845ef8c636ee8487881ec29abf16ec5d780ba8bccd07e626f96d84cd39828cd3043897977f6df2d262d063491915abcb62bb1e831b5
+EBUILD dhcpcd-10.2.2.ebuild 4928 BLAKE2B 2e506dbcbeab7f98c1bf4acdb115c0743973467856262273dcf5d369ff306c62ba4144829934bc455a584f6085a86958708b369aee9c701f6c0b0a3f6da55ed6 SHA512 7651b8095eeef6df8fd12f2e5ddb3a0427d12d7013c6591d1c5adaab4343793084183f45be4791663514f9cc437785be0d11d63caafaa26f25f8c5971cc8c80c
 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
index ff37dac240ee..ab10e990b26f 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 075d1f796652..46d57119cdf7 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -10,5 +10,5 @@ DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b
 DIST dropbear-2025.87.tar.bz2 2368085 BLAKE2B 14c47f8311502a821a1b67e4bcedcdc80cc7cd830abf432822acb7f9854a900ffd5fc5c5e2d55bc5fc273f53250e168c1d08c7fc840bf42721362befcc3615b0 SHA512 afe30b2c795c21ba76d0e4f7b95d9f61ca0ce31510c5fd5183feef2984b49122ccb600c5eae8ac05d9c3cf6bb6237f760cfcf4f7c546656f555e46e992d1efeb
 DIST dropbear-2025.87.tar.bz2.asc 833 BLAKE2B 86f1ac7bd968eddad2d43bca21864db44c21e5875b7fec54fcc0ddce5bc748462d2639bc2394ca682b84527d49b3b0ef46cfbf07c244ded0b86812b1c6aa7894 SHA512 a5b1dcfb0bd5f5de12959f4b47e526cf3844ad8b7ef26fa0692fac6c2a77d36d5171d37fc405f7d4a2e4e70a6d8cc30366cac9046745a5126593c45b54998a7c
 EBUILD dropbear-2024.86-r1.ebuild 5859 BLAKE2B ae93f5140b0e01a7081413919c1dff211db448cd1410c5ee75641124f8eaa203833aa23181f9b43cd529098f6fd8c71b7e700ccfe3feb7d2c652cd3131385944 SHA512 da93b8436f00d14218b0a33b6076a9d502981752e1bb899c539520501c8e1b756a6d2cc34fd698d7be56ddd1981dbd08ee8cef46641cff4a893acc06864e0352
-EBUILD dropbear-2025.87.ebuild 5866 BLAKE2B 3f73760dd51602f743e0eb23625cd384670fbece054b97be9324254c7e0a6b963b8fdaaebac015c20c964c837ecdc8eb75f6270a7c0eb1ed9b13bf7a8545026b SHA512 3d7b38d0db17d9a22e4950ad51ace9200c1dead495b122d032c05f6d35a9494417876aca3b0b8ade3e413247d7ffe85fb039e5f1aa5958b263c9f3d62158c0a3
+EBUILD dropbear-2025.87.ebuild 5862 BLAKE2B 4d09bbd6f8e0ade02da169720bcc50e3c4e3ef252accb46bb0a1e5d6002fd12f0d572d82089c90e0ec326496528f77875a322504d7a61b9d945840248a64cb85 SHA512 6d944d3cde8a4c7624b8c5eb41632fa66356b7c71d0b290fdd088ba0b1831e30fe4bd829ac636d24ace8900ac23f411a042e9ed1638b3221d2f4c1a12e87000c
 MISC metadata.xml 2144 BLAKE2B 44954b29ea4dfb4008a9411303c502ef2fffee30f16df24a7f6fc7e1969c24209bf88f59a67e32ef422544ae51d46a846a819a8004efad825da702fff7f3af91 SHA512 ff59f6d316473fa41905ff92112f2b57b929668e04730fa88f7af405ee6a1e308a82119b896a5612120cd1cd2bdbea0e8dc8b0d419b7f472b22fa66a89638fe5
diff --git a/net-misc/dropbear/dropbear-2025.87.ebuild b/net-misc/dropbear/dropbear-2025.87.ebuild
index 78da4952b98c..df2b99e97e9d 100644
--- a/net-misc/dropbear/dropbear-2025.87.ebuild
+++ b/net-misc/dropbear/dropbear-2025.87.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 38857fd09d97..a7e7b943d326 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -3,12 +3,15 @@ AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac
 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54
 AUX iperf-3.17.1-Unbundle-cJSON.patch 2784 BLAKE2B 67fa2a15bb0970844f062423d4a3448f32cd6644ba92a02d06fcb76dc60a9e62d0948006765de80458b420344b4f380dde4dbf90f296449664c4fbfdd72ad99a SHA512 dfd2ac4cc3d6666887bff8515399ec79a10f350484c340c615f2a1dc22547c3ac64800499b831caf647a50f7eccb4ceb381942a5f7cacd859333c3afbe2661ae
 AUX iperf-3.17.1-c23.patch 2568 BLAKE2B d099ff7922d40fd94995485c715bd7e2232ad25038a6db0da1141460b55a1f802d4d11b1b7b9d16079ab874ac8820b19857a87460ee5a5788edface059126bbd SHA512 bd1bc3aa090be75dd6d480d703182d9579405a4eca132cb9fbc15242fdc7095d62405c4e2e933ffc5cce2b9ec7bc3ea0fce56038a0bf6cced0d9b10c8808fdad
+AUX iperf-3.18-unbundle-cJSON.patch 2649 BLAKE2B d43425f28d1f34d46c4695f80b67e3cedfe69c0ef35eeba317ea03f938054ac7094419177a8a5a03b1c8d1e956565d8804545474a00c4b8e936ebd99f6c9310d SHA512 443c86aa9732b18baad9151e16b37f4d43142f5557b8b1a03232674e3ffa367d9d55771e517d11d3e7a0e6f0b9b793fe2809886a95807f3141070162936b87eb
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974
+DIST iperf-3.18.tar.gz 688037 BLAKE2B 64272ab8288cb217603d4fa438bc547967baa964bc518c91f9f1f1c85d9a0a9a7ca5b4c558b3e2c68507c1cb76b40592fd9a80f0bb4cc8a1716e029b32289276 SHA512 a458292c34c29a60cce60eb6be4afd15220d4cf29f225a1c1be9ec8ef86baa85fa4e174e747cacfa5711c6957ad16d448c2d3d4029b6bfd58db9c39269f30caa
 EBUILD iperf-2.0.14a.ebuild 876 BLAKE2B cd791db9fa5b74ff692cba8cb61caf649aec855a3f80c01d7ce9e3179f95f85ced11a23e81cb43891803c0767d2bd10236bda4d09bbe91368863888f9937f278 SHA512 10d04995d8046b6c0fca3f7b6985909fb54baffc299c0c4f8351b34b89a3534e8e2a482562f00b1cb40ba5e4666d6233f8a982ac4bf57ed1fc65d9e947d88e80
 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
 EBUILD iperf-3.17.1.ebuild 1160 BLAKE2B c8b7dba064f8bef046ba6386493fc46c596b2f557c03dc3cdf832b18c2335ba50778137ec2888daf65eed3fdbf4dc5da5c4b18be69af523aea7ec119be53ef01 SHA512 4bd66406e1d1a5ec422766c6fd4ebba592d95e8231c74534124c6b698a652c582c236162cfdf19eb3d9ff48f32ab3ea49f2f6e6ab8185df9d590a1b3612af4fc
+EBUILD iperf-3.18.ebuild 1166 BLAKE2B cd6995e654e0f2a957020db2f435a26ea1ff3beaaf2bd51d5994b833b46ca61a98053ae5157ce94473285a1ad0484d0cd7e1bd4f0691ae8f9a132f49caa0582b SHA512 59791347f8cb8584c0c6e35e7ee4d3b9774cfdaeb12637aad06e19ad26d8c00994d65eaa9fbf89de277787058745a9a8f01c3aae5739289c753ee5a2f8e5100f
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/files/iperf-3.18-unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.18-unbundle-cJSON.patch
new file mode 100644
index 000000000000..56db6c6b6ad2
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.18-unbundle-cJSON.patch
@@ -0,0 +1,103 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,6 +61,8 @@ AC_ARG_ENABLE([profiling],
+     AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
+ AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
+ 
++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
++
+ # Check for the math library (needed by cjson on some platforms)
+ AC_SEARCH_LIBS(floor, [m], [], [
+ echo "floor()"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,8 +10,6 @@ include_HEADERS         = iperf_api.h                                   # Define
+ 
+ # Specify the source files and flags for the iperf library
+ libiperf_la_SOURCES     = \
+-                        cjson.c \
+-                        cjson.h \
+                         flowlabel.h \
+                         iperf.h \
+                         iperf_api.c \
+@@ -46,10 +44,13 @@ libiperf_la_SOURCES     = \
+                         units.c \
+                         units.h \
+                         version.h
++libiperf_la_CPPFLAGS    = $(CPPFLAGS) @libcjson_CFLAGS@
++libiperf_la_LIBADD      = @libcjson_LIBS@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_LDADD            = libiperf.la
++iperf3_CPPFLAGS         = $(CPPFLAGS) @libcjson_CFLAGS@
++iperf3_LDADD            = libiperf.la @libcjson_LIBS@
+ 
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+--- a/src/iperf.h
++++ b/src/iperf.h
+@@ -52,7 +52,7 @@
+ 
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+ #include "portable_endian.h"
+ 
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -79,7 +79,7 @@
+ #endif /* HAVE_SCTP_H */
+ #include "timer.h"
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "units.h"
+ #include "iperf_util.h"
+ #include "iperf_locale.h"
+--- a/src/iperf_tcp.c
++++ b/src/iperf_tcp.c
+@@ -43,7 +43,7 @@
+ #include "iperf_tcp.h"
+ #include "iperf_util.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ #if defined(HAVE_FLOWLABEL)
+ #include "flowlabel.h"
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -45,7 +45,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ /* iperf_udp_recv
+  *
+--- a/src/iperf_util.c
++++ b/src/iperf_util.c
+@@ -46,7 +46,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf.h"
+ #include "iperf_api.h"
+ 
+--- a/src/iperf_util.h
++++ b/src/iperf_util.h
+@@ -28,7 +28,7 @@
+ #define __IPERF_UTIL_H
+ 
+ #include "iperf_config.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include <sys/select.h>
+ #include <stddef.h>
+ 
diff --git a/net-misc/iperf/iperf-3.18.ebuild b/net-misc/iperf/iperf-3.18.ebuild
new file mode 100644
index 000000000000..302b37c9ef74
--- /dev/null
+++ b/net-misc/iperf/iperf-3.18.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.18-unbundle-cJSON.patch
+	"${FILESDIR}"/${PN}-3.17.1-c23.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 7c9788270fac..40853a0ea088 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -4,5 +4,5 @@ AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb2
 AUX minidlna-1.3.3-ffmpeg7.patch 865 BLAKE2B c705533df67a924d286856cfde59c8cc3135f98b51b062ce30b2a78c19ae2a06bfbdfe190d4790730262c4ba9a1d6c40f4afb5045a6cc45cd103f604c7d517a9 SHA512 31b4b7cacefb5233df798aeae2b3f3ca40de5be9b1b8c8ae74b5c8c70a6fa4e1ee51b65aa84826541d357182c8694918d3788eb0eec87d0e09724fcb6f837b41
 DIST minidlna-1.3.3.tar.gz 824527 BLAKE2B 489b7ecb54a20f6111a65388ad2c52d477164046131af490cbcef7cd3ff2b841644f549bcad708ea6d4548f4111d5b2b63bafc0f079edf160467b85c682cbc5b SHA512 3571af71b49d46aacc273a9b35e2c78aeccb966c1d6122f8186074c34f9a177ac60622ccf29f307d8d73f502c7a99f023f96f0c43bbd398c7ef82bb57d77cc1d
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.3.3.ebuild 2117 BLAKE2B 211061f0e8f2dac72438845aff0974de52f240ce287cb43410110181f8f113ebf4e3466014d586f677799a6461e277b05d9966fde66c034dc2e7091c0526f830 SHA512 92af5ae80311e42420ddb68ee779cd5881273ec77da61f2cc2ec27e4f406d26b90dd60a5ed945bd9977f0c6073fb6c99f28b40dcd9d7a84a5cbebda7557fd670
+EBUILD minidlna-1.3.3.ebuild 2150 BLAKE2B 071e17c522f779b2c876f0c53d88a0cb28ae947e22ca67ae7f2543e68a7a765e9c2a79a4d9d32150a40ed4f7b89511478cd119e479b68e1cdfcd4a4dc060b368 SHA512 04df45d5f22122055c146b156bcefc21b424a20a3cbd371c76b9b12715a9f042e79192bc976eb64fc497d8cfcf671abba2f9705fefa580f861dffc775fe469cf
 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1
diff --git a/net-misc/minidlna/minidlna-1.3.3.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild
index 2f3e5511e18c..060792c9092c 100644
--- a/net-misc/minidlna/minidlna-1.3.3.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="netgear readynas zeroconf"
+IUSE="branding netgear readynas zeroconf"
 
 DEPEND="
 	dev-db/sqlite:3
@@ -41,7 +41,6 @@ BDEPEND="
 CONFIG_CHECK="~INOTIFY_USER"
 
 PATCHES=(
-	"${WORKDIR}"/minidlna-gentoo-artwork.patch
 	"${FILESDIR}"/minidlna-1.3.3-ffmpeg7.patch
 )
 
@@ -50,6 +49,8 @@ src_prepare() {
 		-e "/db_dir/s:/var/cache/:/var/lib/:" \
 		-i minidlna.conf || die
 
+	use branding && eapply "${WORKDIR}"/minidlna-gentoo-artwork.patch
+
 	default
 	eautoreconf
 }
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 360800fd1a71..2d6958904629 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -11,5 +11,5 @@ AUX sitecopy-0.16.6-33-c99-build-fix.patch 304 BLAKE2B 6bafbaec861af759dcc3de59e
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r3.ebuild 2193 BLAKE2B 0f4f3d8f68a99bc0b18e6bb693556483d2a8ea1b099d47d15b82e0bf61d6913b86e8c0d31f7f016fe561019dd085d636aff9386f9f7d2f982aa8f2eba5e1f831 SHA512 7054893c491ef937aab53798f42efc9e57f9aa92bd89d8a6f61255bba5260e8c3d03cdadf578a8170fab9f7eedba08843ff5f9ff82c68dc4e31ad6cc084ec4ad
-EBUILD sitecopy-0.16.6-r4.ebuild 2046 BLAKE2B b4d6348b8f78961780413d862f255cf3f8414b2204b537b0d8176077cb8b6778255b072acef240a494ec86073f1a4eebb03c2645ef5073f3968ffb1080d89531 SHA512 10b3650355dcd93945a271b2ac7141bd0c2966f2e3b3140e6bd0c666e59fee11d4d5f834e3e904fc0fca2e814fc90f8614be033bc60433b32140e8b4782b7323
+EBUILD sitecopy-0.16.6-r4.ebuild 2044 BLAKE2B 9ec82d11d96316c04dac5fe739fa477f2bf27dbe301a1a151f6e3ada23ae1f22e13ebb81d39138b4e590ef04c775258ff11d1308df316da1df6fc243f7e91011 SHA512 3bf8c95172eb9fdba79f7b6795c799f6225651de7039feb02425d324d65ca8010921bde644d7973812ea62a90b079d907346c5d8264bced1c1460080141c4b09
 MISC metadata.xml 692 BLAKE2B 07d5d18bb4a8aa24f5c41910c7c326cfa477f1a1bfb7d3cb48e7928d7b456362f66cfc97c2f4e8e3d4475ef4177de389f3bf2bc141a138306ce82737cfd5cb92 SHA512 f7d3322134d7a8a037c9c4a3842442ac0970bc1ecebbf3bcb4e8342119d36e603af1c4f162a9db25dae58207e0dfce349b5947c942b6bcc3a36e21740d78b682
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild
index 0333e04264ad..784097cf98a3 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="expat nls rsh ssl webdav xml zlib"
 
 RDEPEND="
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 600da575560f..59d5319aa256 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -3,7 +3,9 @@ AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53
 AUX sslh.service 661 BLAKE2B d6a94b992745a1282a6ac9ba3d95395f708f703b1a22a591c03092243d5e73f87c177685d4d469ed96ef439aead22e505ba2f479107e640c3434af6536c2b866 SHA512 4fa63d43159c3f3f66bdecd087caf6a2677619dcd8baa65e97593f70c334efa5d5835e98ecf9771ad28e624c2b69b3798f1025014f4a70de65610caff8917694
 DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631
 DIST sslh-2.1.4.tar.gz 461963 BLAKE2B 82194b7cfe2a41b4d0c85b1ddf9c84b5b81dd8cc38e4d66f2c69aab2f9eb4091b3747c194e52a571dffb6d63308a9d1b1a53c9e8df59e1a78d314aae76b08d73 SHA512 1678682bfe28aa2615068ab738b8413632f7799744fb5ee69287f759b1bc600b891e89fed2ff28a92b6d91b79ff4e52fe12ba448572828b38471efbeffdb4f62
+DIST sslh-2.2.1.tar.gz 515014 BLAKE2B fa9f1db4be966a4d8428cc920248e2811057233b38814c9cae77a87459b5ffd24176662f0588bec98a69e24c6eda23a4f2fc212b6be85ad42a9231b7ca8c49eb SHA512 3a8a74a4f94769479daee295f82beab23a403e6c128ad0fb0982cf3a4032ff0c8d69cab2f5d7d1ed2352aeda234cdf6b554b2ecf27c22c3ab9517cc84374f220
 EBUILD sslh-2.1.2-r1.ebuild 1707 BLAKE2B d35fd9bc8b3e785ba1e833c079306335f8d4d2119fc930e7f937a060e271023b620386ef3d3e87b8df07de262620f2fda6a9bef1e6c377561783a23613bcaf6f SHA512 4ecb6c54657eb23c236d7cb483b5d5a9b85f94d336c131ed5409876633790c04c901f42c50869ea8d40a6b943dcde6ca86f7dba8df4c6101b9f0234e5e75e912
 EBUILD sslh-2.1.4.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
+EBUILD sslh-2.2.1.ebuild 1709 BLAKE2B 2a9bf9b37d1c41738561ad5f72abbd3132d6f8b00bfa7fe26658d8e4c6c6785b80c52bcd2fb40c1ce8530f91588609dc0ed96b08a33197a4315de24dcc5b703c SHA512 e3924dc83afc55e637c8c952c9458f28d12fc8e1d5e893d66da64163e7d1f7be39d81d1dbaa711d452ab57a7fb729b45aefb9a7c320838e3d4788200e1044917
 EBUILD sslh-9999.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
 MISC metadata.xml 482 BLAKE2B d2c26b25b184b90e3a7d85e81ceb0a0631fca8c267823a87f9302e91d40e80a31c23b184c572af1a32c5b02f86e62ec86efb7a39d5d2c01187e16dd6dc4e2f6c SHA512 3ba2f78c8498d79c318619ddf6e2b3ccd35821ead01dfd65bd2dbae95b1c7d66d7f16751221cceb1439db9629add3bb0538057feeacccc8caea3a0e5041e9184
diff --git a/net-misc/sslh/sslh-2.2.1.ebuild b/net-misc/sslh/sslh-2.2.1.ebuild
new file mode 100644
index 000000000000..01d433e051ac
--- /dev/null
+++ b/net-misc/sslh/sslh-2.2.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps libev systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	dev-libs/libpcre2:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig:=
+	libev? ( dev-libs/libev )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile.in || die
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBEV=$(usev libev) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	if use libev; then
+		dosbin sslh-ev
+		dosym sslh-fork /usr/sbin/sslh
+	else
+		dosym sslh-fork /usr/sbin/sslh
+	fi
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		systemd_newunit "${FILESDIR}/sslh.service" sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}