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

13 files changed, 191 insertions, 292 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2ca24e9f3336..b816b996539b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index dff3b5cca346..38857fd09d97 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,18 +1,14 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54
-AUX iperf-3.12-Unbundle-cJSON.patch 2894 BLAKE2B 74981580ed628224fbbbf19f35c5a7972b066029d45ba8a86b437f7aafda80a6f1bba5696b5a35f210993bd9af0406de1ff168f41ec36f8bfbe2674dd626b34f SHA512 c9f7d8f0286135043e1d686e2936f4765d8b344b57ea3c7b887c94665201904e10119f6f7fed028fef898ae75a25aa9157b26def007515921ec249503fa9d66a
 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.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.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2
-DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c
 DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974
 EBUILD iperf-2.0.14a.ebuild 876 BLAKE2B cd791db9fa5b74ff692cba8cb61caf649aec855a3f80c01d7ce9e3179f95f85ced11a23e81cb43891803c0767d2bd10236bda4d09bbe91368863888f9937f278 SHA512 10d04995d8046b6c0fca3f7b6985909fb54baffc299c0c4f8351b34b89a3534e8e2a482562f00b1cb40ba5e4666d6233f8a982ac4bf57ed1fc65d9e947d88e80
 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
-EBUILD iperf-3.15.ebuild 1135 BLAKE2B 65b8302dbdef4e7538fef77bf15649f442d339e20807e223071989cc50096c534c02d12bdb99e62b45fe92cf13be89d1ad6af60ca3856a0103957e052cf348bd SHA512 5086085eb08c674d481a9a5ffeceb0f802cf6967587e3a95b2217e59d948f4a7456347f84226b83af240f1b8fa03803635a177f84699d37b387fab915c7ddf0c
-EBUILD iperf-3.16.ebuild 1135 BLAKE2B a100eb43e164106a71429f9c76809fb1800cb36921766c635f214d62e219697d4f0f599815fbe666431614709f41700001a0250a0ea3605b57178e01ae5b76eb SHA512 5043ea01e2057654ceb39c9f579cf5cd770feb05ce2fa904b8df3745564157dcaacf64576fec1d44e520f51736fc4d34e7e61135c0174ec064e5fda59fdba76b
-EBUILD iperf-3.17.1.ebuild 1122 BLAKE2B 5fccea022a362dbbb3b34d4dea4b00b332417a4b60ba0cedd796af633d59f660965b01ac548525b97edda7bef683501d5c86d78e138407b22c22316f17956267 SHA512 acb5432b55cb099149e9d42f6436c68a043a406bc7792c1fb6d64610b5903daf7b3bb695d6e297abbfa27d7996b69e6ff34687a7c994daa255c25be0a3394fa3
+EBUILD iperf-3.17.1.ebuild 1160 BLAKE2B c8b7dba064f8bef046ba6386493fc46c596b2f557c03dc3cdf832b18c2335ba50778137ec2888daf65eed3fdbf4dc5da5c4b18be69af523aea7ec119be53ef01 SHA512 4bd66406e1d1a5ec422766c6fd4ebba592d95e8231c74534124c6b698a652c582c236162cfdf19eb3d9ff48f32ab3ea49f2f6e6ab8185df9d590a1b3612af4fc
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
deleted file mode 100644
index c5b1b49ec1a7..000000000000
--- a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 85b225cdd00b9a483a603b8b124a829ffbf92b88 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 2 Oct 2022 03:07:40 +0100
-Subject: [PATCH] Unbundle cJSON
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,6 +62,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 \
-@@ -44,10 +42,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
-@@ -65,7 +65,7 @@
- 
- #include "timer.h"
- #include "queue.h"
--#include "cjson.h"
-+#include <cjson/cJSON.h>
- #include "iperf_time.h"
- 
- #if defined(HAVE_SSL)
---- a/src/iperf_api.c
-+++ b/src/iperf_api.c
-@@ -81,7 +81,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
-@@ -42,7 +42,7 @@
- #include "iperf_api.h"
- #include "iperf_tcp.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
-@@ -46,7 +46,7 @@
- #include "iperf_udp.h"
- #include "timer.h"
- #include "net.h"
--#include "cjson.h"
-+#include <cjson/cJSON.h>
- #include "portable_endian.h"
- 
- #if defined(HAVE_INTTYPES_H)
---- 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/files/iperf-3.17.1-c23.patch b/net-misc/iperf/files/iperf-3.17.1-c23.patch
new file mode 100644
index 000000000000..80c432156f5a
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.17.1-c23.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/944381
+https://github.com/esnet/iperf/pull/1805
+
+From beadb59b90e8d3339d31f9f15525108072fde135 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 9 Dec 2024 10:13:02 +0000
+Subject: [PATCH] fix build with gcc-15
+
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -603,25 +603,25 @@ iperf_set_mapped_v4(struct iperf_test *ipt, const int val)
+ }
+ 
+ void 
+-iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *))
+ {
+         ipt->on_new_stream = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_start = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_connect = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_finish = callback;
+ }
+--- a/src/iperf_api.h
++++ b/src/iperf_api.h
+@@ -213,10 +213,10 @@ void    iperf_set_dont_fragment( struct iperf_test* ipt, int dont_fragment );
+ void    iperf_set_test_congestion_control(struct iperf_test* ipt, char* cc);
+ void    iperf_set_test_mss(struct iperf_test* ipt, int mss);
+ void    iperf_set_mapped_v4(struct iperf_test* ipt, const int val);
+-void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)());
++void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *));
++void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
++void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
++void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+ 
+ #if defined(HAVE_SSL)
+ void    iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username);
+
diff --git a/net-misc/iperf/iperf-3.15.ebuild b/net-misc/iperf/iperf-3.15.ebuild
deleted file mode 100644
index e40caf524cd5..000000000000
--- a/net-misc/iperf/iperf-3.15.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 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"
-S="${WORKDIR}"/${P/_/}
-
-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.12-Unbundle-cJSON.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' -delete || die
-}
diff --git a/net-misc/iperf/iperf-3.16.ebuild b/net-misc/iperf/iperf-3.16.ebuild
deleted file mode 100644
index 36229e8b9dea..000000000000
--- a/net-misc/iperf/iperf-3.16.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 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"
-S="${WORKDIR}"/${P/_/}
-
-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.12-Unbundle-cJSON.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' -delete || die
-}
diff --git a/net-misc/iperf/iperf-3.17.1.ebuild b/net-misc/iperf/iperf-3.17.1.ebuild
index 8443a1f6c258..25afe4690086 100644
--- a/net-misc/iperf/iperf-3.17.1.ebuild
+++ b/net-misc/iperf/iperf-3.17.1.ebuild
@@ -27,6 +27,7 @@ DOCS=( README.md RELNOTES.md )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
 	"${FILESDIR}"/${PN}-3.17.1-Unbundle-cJSON.patch
+	"${FILESDIR}"/${PN}-3.17.1-c23.patch
 )
 
 src_prepare() {
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index bab85ae0390f..6fd21727e03b 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,9 +1,7 @@
 DIST rclone-1.68.0-deps.tar.xz 313382892 BLAKE2B 5dbf928d1a9ee4eccd796c5d083da1fefc115af9b087072708fa5a9e98a5bc74f824e922c1cad8f132c2549d4c335877c4fa78f8842a1732972bbe862b0bba28 SHA512 e32a8489ab822648f26b47e58ef7a7a1f3776ee08b585a642a21e02b31095ddef22b068e97cf21545e6a806b467d4d5e79eab4ae31da9ccf238d7735ca6dc35f
-DIST rclone-1.68.0.tar.gz 17441116 BLAKE2B 445cd8607950b25cf973350a62d884c3b786eadd6e781d36a1886e085871accc6743672f993f6da8a15a1af7e0146110ff931fe169d6f8a4586cf772e6e17fc9 SHA512 899255f6a22c53b7ab5b59c0f3532bc64b9b3b2691e7202a97fea5047cc8cdf042c2e235cdac67c8cf18e3d68ca2b2ca1eb4d871bffcba8c97514c7ef8db0e13
 DIST rclone-1.68.1.tar.gz 17452992 BLAKE2B 34e16868cc84b80becd4403ceae925c3c20d0989383c563b58a46190fec983f1949572643843509a060afefa4808c3b8865335681529203a91c3bb5201d9888d SHA512 8f98e569c0959dfa407621d35acb552e6a5f5b409d2f1d89efd116d746f2a6a742e0bebf8f298ba189d7f187fc4c79d285e7db28e52d5d9e7517d5e0a6aa7fc9
 DIST rclone-1.68.2-deps.tar.xz 313358984 BLAKE2B e57d4036e37b041b1c1c34b377683f32a10b6ed147f9a290c223bf1935ef78455ef307bb804ae93dc8577943d858104bcc77eecd6f797875ff7ebb298e95470c SHA512 14cef2b92e6114f902ede83ee502ab50952322ddf1147488eea53f7dc0f80b53d52e3cca49de72efce9b4859d7f915bb1434d87d2061dc56a1ac6148da1d8819
 DIST rclone-1.68.2.tar.gz 17456579 BLAKE2B 9b8a3cd10690104ef262bac99d676997be1e5aad19172b6536b74a73c5d15bf6d67b0550ed6dcc8c4406d4082de11b5f8e6bcf92c9fdde61b140c0edbe095c23 SHA512 02baef752b8537ef5de05c51ce556ee76aee62c6835dc2f0cb6a8ebf0837d524dee1ed69136fb8319511a248d6776e36e53038138bf245f19aa66ea2aac6815c
-EBUILD rclone-1.68.0.ebuild 1481 BLAKE2B 5ef10483275adc5c1528f671142d9d7ed5815af544850052c57343057ba965c001967e11a8cad63eb5704e187643c6a7a1e5fcdeae756fcc17273f72e35db9dd SHA512 06356bb6db628ab899b3946795c4b5687f7d32ffb1ae85c5f718828502659257b050861e720f084cc4221c6cfb7e95023ea08dc64750866a3617109a50579e33
 EBUILD rclone-1.68.1.ebuild 1489 BLAKE2B db125cf3c06153461fb74b40a0cf4668e34ca9fce069d29411ac03ae96605d9cddd528d04a0c331ccf3e5159d365d9857ea5283df5c998190ad5f61c9a15594f SHA512 7657a97b891d6d53e7b9bc61daf40124385487a6a5482ad53c01b16bc370d6c8ca3bc4d91f23eff4945bb0576631c7da177160cfdb50225eec3c58f3fc16084d
 EBUILD rclone-1.68.2.ebuild 1489 BLAKE2B 1580a6c7bc20ea4488061e439b64bef4fb35eb96d672500de688c2ea0c68f800fe7721895f9f0b10b40945d7e97008a282723445a0e657194a1fed3400658e4c SHA512 878f8d415f8070aa8d13667ca4fc290a418e5c4b6a43a4ae5fd90263b0dd5e5f32326d9d6bf7612bfc85fba718d78c8963caa8d0203b89484453ca30c9421e2d
 MISC metadata.xml 492 BLAKE2B cec7693bf30b3780ce77094c6ac87d0874a92220d2179f41aedfe65557a3238c65bac28fd467fadc537cb1c814500b1855545d3e31aa9ccbda7838be373b561f SHA512 5312b6a481ee70027653ee271d9e08576c09b4e48a0d0848479cc8a2a8d22a47fc2c14b446fb4fe2f26e4636b4eec20b0f5cba6ed4fa89712a95fd0d235671e8
diff --git a/net-misc/rclone/rclone-1.68.0.ebuild b/net-misc/rclone/rclone-1.68.0.ebuild
deleted file mode 100644
index aea77db97b4b..000000000000
--- a/net-misc/rclone/rclone-1.68.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 check-reqs edo go-module
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/
-	https://github.com/rclone/rclone/"
-SRC_URI="
-	https://github.com/rclone/rclone/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	sys-fs/fuse:3
-"
-
-CHECKREQS_DISK_BUILD="2500M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_compile() {
-	local go_ldflags="
-		-X github.com/rclone/rclone/fs.Version=${PV}
-	"
-	local -a go_buildargs=(
-		-ldflags "${go_ldflags}"
-		-mod=readonly
-		-o ./
-	)
-	ego build "${go_buildargs[@]}" .
-
-	edob ./rclone genautocomplete bash "${PN}.bash"
-	edob ./rclone genautocomplete zsh "${PN}.zsh"
-}
-
-src_test() {
-	# Setting CI skips unreliable tests, see "fstest/testy/testy.go"
-	# "TestAddPlugin" and "TestRemovePlugin" fail.
-	local -x CI="true"
-	local -x RCLONE_CONFIG="/not_found"
-
-	edob go test -mod=readonly -v -run "!Test.*Plugin" ./...
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe "${PN}"
-	dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone
-	dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs
-
-	newbashcomp "${PN}.bash" "${PN}"
-	insinto /usr/share/zsh/site-functions
-	newins "${PN}.zsh" "_${PN}"
-
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 952713586ecc..ccec2e3dcfc9 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,7 +1,9 @@
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a SHA512 dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b
 DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 0af65b18dc6fec28e59d75048b1e1c4f442f134d87bc6a9b5ea7b3032a0c5519e0d042ae760d451006eacf368870a0a47465d9ec2d5f2fe8d41efcd639ef58c5 SHA512 ce8147df545f74d4b6e1d3d0dae2dcea58c4c7e6ccd1cb2eec68c29ead2c3a818e9851b30a5e5f1456d70463c31b13ab1c5b350293359419a583ed693a917231
+DIST socat-1.8.0.2.tar.bz2 579370 BLAKE2B 148bc4a49113af987f3c9faf9971bd309e1114358d2f32722c975715a151a4d8f194be58858c4a1a1833c53e2f4334afe105423550776bc174afc84126f8d0db SHA512 549380b3bf95fcf7088a7b774e0cbf5532c6fa86895cfbb44ee1dd7895391f3696f78bda886e786275951656d7c90b99c658eb28e58d2365eb33946768f04321
 EBUILD socat-1.7.4.4-r1.ebuild 1209 BLAKE2B 4e63b10678302ef5ad6dee0af7f041806d4963b5d218e02e9a3c0035ae1c90eac0b34f5dc31ae965ed1bd337dc5e02f2bb62ec7131e02b389e0eb197694be04b SHA512 0cc2ef381c48ef9f8c2380ad7cd4e88c401bccc14709518e1ccf7e70758a878356dde18e039d39daf15f70da58006b32d005ae053a3e6718c11820bb51f11f41
 EBUILD socat-1.8.0.0.ebuild 1436 BLAKE2B 2104f758c85150611862331a5f0f17613980b50f331d342a27b5bd0adebe16e3a5a8858b06f8f049dc93610191697054692e0a368a4e48e9381c9df1b60d3b59 SHA512 23e8e14be9bab9ffc76020ae34e70245407cf5ba0aebca391047a5129aa25e975f73607d4cb650017902a46f1f5ab679c0674af06770a9fea34105f64388a44e
 EBUILD socat-1.8.0.1.ebuild 1296 BLAKE2B c638640d4ed2d7122278c4d4f9de4d533d183e15e943496e9aac16e6ccebca86c630dbf0bf890e79be09182b35e43224a7ecc958161ae9856db97632fc555654 SHA512 7e9b141fcb2d85425e7edf9eccdbaf620f96f4d0b20daf130102d46d8e72453b7b04b44e02111577debe7eb616db1ca441614c5bf1ee59ddcbf00c30ce9b8abe
+EBUILD socat-1.8.0.2.ebuild 1373 BLAKE2B 3ecf7f71167873f7458f5397e9d7952fd461348ab68abcd4c0248cc395701e46d17f17e67d24d7fba4c1e5159d1e5341549d0269e8ecb9438c3636d3651dcd8d SHA512 39afddac8a3210bfd18de382169ac69a79f0ddcc304a39a72aaff5e1557eb8b8cebd4f7d6473afb7ebc2e0251f4bed8f567899585c5c2932db0f7bc62276495a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.8.0.2.ebuild b/net-misc/socat/socat-1.8.0.2.ebuild
new file mode 100644
index 000000000000..52cfbb352af3
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+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"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+	ssl? ( >=dev-libs/openssl-3:= )
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
+src_configure() {
+	# bug #293324
+	filter-flags '-Wno-error*'
+
+	tc-export AR
+
+	local myeconfargs=(
+		$(use_enable ssl openssl)
+		$(use_enable readline)
+		$(use_enable ipv6 ip6)
+		$(use_enable tcpd libwrap)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Most tests are skipped because they need network access or a TTY
+	# Some are for /dev permissions probing (bug #940740)
+	# 518 519 need extra permissions
+	edo ./test.sh -v --expect-fail 13,15,87,217,311,313,370,388,410,466,478,518,519,528
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 53041df94b2a..b1849ffc95ed 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,6 +1,8 @@
 DIST yt-dlp-2024.12.03.tar.gz 5810980 BLAKE2B 9179ca63231362d88575516592a5268ca43c9d96da5c6f4c86823a8c9aeed7aa945623f6f3a869f562cf59cafe2b52fa418c8af0bdd2065cc45b23ace039ef0e SHA512 f6d00f77d65f8d6cba8c43bc31731b279b2ceb1f33a1b3bbd3c60ee95f39961c4e7b745bc0b0bc6068e713685762fc99d1b26d01f5b501604b0d32e05824cd5c
 DIST yt-dlp-2024.12.06.tar.gz 5812742 BLAKE2B 070faffaaad2cccc0c055375744e6d2f047d619615c8ae0255f4a9665bb7db06e899b43aa6551ea9f323c03f754545083143feb267997cda8d0488e9f92b0bd4 SHA512 f4d38adc9a9e4c59f1e82bce9457bb56761e12b68eb7e7456fd83fd652ef7b996930d296088774486a4f37ea82558ffd2f4b48727a3197b9a308585d9c512219
+DIST yt-dlp-2024.12.13.tar.gz 5813833 BLAKE2B ead14c4922e74e75dcdabe63ed5bb4a91e7d30a3b475acad63c03320a5958190118a886c88a7f5424ed6b7cbb9115c2368b41737b1ad99165f925c3f6a38275b SHA512 369cb303a4bf14b8e872ea3315478c943bc13741eaa4ee1d219df0d5e89d1c46992577acb8530c592e4278da1af7969a25417972c2ca55d84ee0f8e7e25c31b4
 EBUILD yt-dlp-2024.12.03.ebuild 2177 BLAKE2B 5a7c49c8b9c8929ca34cf4e1f271735d0f84f9d860157e3ee6b9c8af0fd7a15b7657a05c0dc79f680f146ed171577f4714ff82708e7134c0848d717722960a4e SHA512 276d7684b50801919ab4b66b169148f65174e1d630e632d4ea7410fecdf0ccff575826e1feb0e4c55d6e8abe934a77f6ccc643a882a577cc0187f438c3c2e404
 EBUILD yt-dlp-2024.12.06.ebuild 2177 BLAKE2B 5a7c49c8b9c8929ca34cf4e1f271735d0f84f9d860157e3ee6b9c8af0fd7a15b7657a05c0dc79f680f146ed171577f4714ff82708e7134c0848d717722960a4e SHA512 276d7684b50801919ab4b66b169148f65174e1d630e632d4ea7410fecdf0ccff575826e1feb0e4c55d6e8abe934a77f6ccc643a882a577cc0187f438c3c2e404
+EBUILD yt-dlp-2024.12.13.ebuild 2177 BLAKE2B 5a7c49c8b9c8929ca34cf4e1f271735d0f84f9d860157e3ee6b9c8af0fd7a15b7657a05c0dc79f680f146ed171577f4714ff82708e7134c0848d717722960a4e SHA512 276d7684b50801919ab4b66b169148f65174e1d630e632d4ea7410fecdf0ccff575826e1feb0e4c55d6e8abe934a77f6ccc643a882a577cc0187f438c3c2e404
 EBUILD yt-dlp-9999.ebuild 2197 BLAKE2B 61f5b720a56c7d82289c8a056146410d4817137e3085215c913a6f765853ac7989587fb98fdcbd52fe2e729137f53a8923f0732ad59522954170102049dac973 SHA512 29f9b741292ddf8333a062827265e589f98d2b2f040b83458f6937846e3f070e577d2aeddca69684182cc176d1ef793e3fd287856ea2164007e6fb639eea209e
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild b/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild
new file mode 100644
index 000000000000..3de67e0bfb4a
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="
+	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${PN}
+
+LICENSE="Unlicense"
+SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with FEATURES=network-sandbox
+		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
+		# fails with FEATURES=distcc, bug #915614
+		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+	)
+
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}