gentoo auto-resync : 24:02:2025 - 19:24:56

16 files changed, 31 insertions, 603 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2dbe9ae5512f..3d5d91abd0df 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e1c6e9071a47..1fdc10355041 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,15 +1,5 @@
-AUX curl-8.11.0-cmdline-ech-docs.patch 1583 BLAKE2B 706d497ad6eaec7a57f52c0bd731e47fc715b884e643ea045420f66136703adb3465fd1406a4d6e2d5ed802ea8dce88d3c7391868d282390d3b9a5a985c69bda SHA512 45d821709029cb9c7d67f58e43262a927c7c79106c3a79f21f7b6c5b76233557028a403089d3490edb04fbe22cb92f266ff1f0df753d981148ca0c96b81baff7
-AUX curl-8.11.0-cookie-case-sensitive.patch 2426 BLAKE2B 75d8e6a1110efb13090f8001511d437984ff14152b5167e3d5341190c065ac859fdae3e8ddbe15ef3d48aa7f4316d9af9eb924ffd43dc85fa55ce789a0bd362a SHA512 49b1d0ee63af26110038035ae15504b5fe8a03d71578a03450cbefd6dd3bc44720f8870297cd9edd0f460c59d4ecd7bfb8501b641c47543d65156e500fed61d3
-AUX curl-8.11.0-curl-libssh-ipv6-brackets.patch 928 BLAKE2B 1f2abce6972b6040630c38459c90f5c14691358599133e3d46a423772b5d7b340d4c116cbfa145def72d9497de7dcd396290bb81a706f9fb6dddfcb810172ace SHA512 a2fb87795ee81f94926d5171bad3a49eba43283a9800a454b70d397ec0ec0ce48b685cb6b929e6b47f9b8d25f714ef3630ecf244283870a598452f0d5ed45ff2
-AUX curl-8.11.0-duphandle-init-netrc.patch 5422 BLAKE2B 6e2fe6e3e9995dcff165a1b28b117a0519cb1026fbb680577c8ac3b1c39b5f01fd5e57b78752a13bc7874b8d01294d3b5e5fd05ad59e5d31c78cb23603155c06 SHA512 2a5c07173906d0be330ced15fa039cf43bb3470a237ee2770c179f3df9eff5565fd8c0a7d3c6a752c0947b6673a4c16c6bcdb0decac4c02a8cd34b644f8f713c
-AUX curl-8.11.0-mbedtls-global-init.patch 1868 BLAKE2B 722959cd1f70d336f093ae83304bbb2800cc3d38eead28493955770e7e8f8e2f3d7cbf8eacfd6b8631b554768b618eb5278a3bd856d58d0e68e72864333c91c3 SHA512 316eb357b06a46484103f47c46a9103e80d5131463a17248ca1000f035e6c34acc73d78a73ab931d7a9710feacb859ff641bfac7912bda40b4d61536bf7b1208
-AUX curl-8.11.0-netrc-large-file.patch 719 BLAKE2B b7a838f76a6c6eba341bacb7826caf1c7ca73c57a3b60f8136b47b32e91bfe3b0663d47b3273095b8a93736ceda96833d25f106d82efbc7afe6315020bfca798 SHA512 ef0d4204e6ca7bee17ccebf20ea6873076a571819bcece058eae7e6c3a62bff431d6161aa4da0725ea1e8b278f121d682361f4df1fe4adc58a1375e611a510a8
-AUX curl-8.11.0-setopt-http_content_decoding.patch 691 BLAKE2B a812c178c0a3a4f5dc78fc576c9aef247de70eb32ab02b96e2e1e5b9428e6928c538e0a981ac98ae2f1428ae4c12bad767e1efc32a48a21ed99e0afc50180ec6 SHA512 9ef6fca7ae98bce6cee40ca5c25e7a22e937e0118bcee948e95cb8a8c5e6ca3f7e8b2327716cf7d55d976bfd6d30d57617d7da52ff971b82b22ff33878fa1d3e
 AUX curl-8.11.1-async-thread-close-eventfd.patch 1080 BLAKE2B fa1ff8ff20870c80a4c7dd0ef2ec116ce78a987b9659a77f513c44b6237f0b0b6bf48e547cefd6e157d85ee6113669bffe02e6f7321b19a8ffec12caa2d655f4 SHA512 a4662fbea884a05e151c0d100e012e9f1c1f8de53f70f20c9df6fc54ea9d293211475dd084bae32bf0508c7438971f921f6840cae4e9424589511dbe44584609
 AUX curl-8.12.0-multi.patch 5760 BLAKE2B 563bba68b61ab1f7cde20130b398e10fde4618b199d1db276d4c8864b1b68792ff6b209dce40311184fd73606a17f38a0cce263a3adea33d2881d3fa38b22911 SHA512 7e72c091e1aede53f3981df81972908c19d15925ad78f396b02e13a44ffd487bacddb4514d05609f0bae5d78c8a4ebcf648fed0076f28146ed3e4501ef97d960
-AUX curl-8.8.0-install-manpage.patch 659 BLAKE2B 44a303863fb826d0fca139c8a9091ce1e9ed461f3ee1545b4c3fb9a03dae2f707622b61d4f34345bafcccab751f989972eead676de5a784b5af138a1cc0e467c SHA512 0d5acfb2cf32b3855a29e01cacc5b3f06014832ca0adfa554938b3b06658dd63a4bac75932b4476b856f4c9adb096217bbb549b1a81a4a012f8b668cb9420079
-AUX curl-8.8.0-mbedtls.patch 1686 BLAKE2B 6bafbfcf8c418e0507dc910aafe8667c3a71c535fa13f329ef67087edb4f6dcbe70113f752baf8a9ac6c72424045a3111b4e21992c84c7d2cd66684cfaa0ad0f SHA512 07ae1a42da92a200bbc72d911ecbf83b93df2a2be6022605842fc08bc870e466b19b6dc78298039027266155a5c9fcc81f05107fdbdfba4cfac4ddaad4d2a586
-AUX curl-8.8.0-multi_wait-timeout.patch 2732 BLAKE2B ae2f40f6dcec16761d959fe5eeaff531ff3ac2c2cd26d676261ecac406653c3d560941455f6d46dd1552f20429582173e45f05865cbdd009c28f21de6a98a458 SHA512 1fbb5506ce1b87c90ea2d029adb9eaccb9930203c8aa0c119666cbee6fc1fc190423f02592bb2620ca3fa1b60822fc704bbc6f671152e877b2383173260acb04
 AUX curl-8.9.1-sigpipe.patch 773 BLAKE2B 7ef3bbd4ca9558621b4f1ea5cb9847705cd6331b7f3d5d2a950642d090c789b802c0ff4f96ff2805b9e1dfe807b14daaee223dbcb2ff1426458dadb3e71d1e79 SHA512 55e55da046425e9a60064ff79ec3f8ab37a10275210f46cfb10ad29e9a29cb137a28ba6a0effa90bfc46d687aab929565b97bfa7549ac8a202746e332d1fa6ed
 AUX curl-prefix-2.patch 1075 BLAKE2B 657ac450c9d50a08f62be72dc9d1bc68c494dcc0c8153f1a89d5cb50d240aa6bcd56b48242ed3ea1352da5cd5d98b8c6daaff6fdcc672a95a0233db1f8d27bdd SHA512 91a531291426477a68108dcc40656e6a56caabfda26f351d4b7cdb39e66f500ffd532f2417a81c5a789ea624b4f6325aa8006155292910612e54ab3d9daa3620
 AUX curl-prefix-3.patch 1068 BLAKE2B dbaf21f38874a308557997d6a3a7a1f9fdb817b22d9846b4d6bd2bae413b7177650f20f17b10bfcc4a6747a89470dc2672ce79ba67d08fc92ebbbba353ba6c3a SHA512 c10a0062564be885f36e7c37bb58f3aa59c387369b9aae6342f818d4671e31cec99fd9ddda3577f03d1f8e87b926b8d75b006ca543f41a264e8595af79242b62
diff --git a/net-misc/curl/files/curl-8.11.0-cmdline-ech-docs.patch b/net-misc/curl/files/curl-8.11.0-cmdline-ech-docs.patch
deleted file mode 100644
index e6cd10937b06..000000000000
--- a/net-misc/curl/files/curl-8.11.0-cmdline-ech-docs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://github.com/curl/curl/commit/f4ee7bafda8d451255e935a3c585220dd3cf58c4
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 7 Nov 2024 23:21:14 +0100
-Subject: [PATCH] cmdline/ech.md: formatting cleanups
-
-Reported-by: Samuel Henrique
-Fixes #15506
-Closes #15517
---- a/docs/cmdline-opts/ech.md
-+++ b/docs/cmdline-opts/ech.md
-@@ -20,35 +20,33 @@ Specifies how to do ECH (Encrypted Client Hello).
- 
- The values allowed for \<config\> can be:
- 
--## "false" (default)
-+## `false`
- 
--Do not attempt ECH
-+Do not attempt ECH. The is the default.
- 
--## "grease"
-+## `grease`
- 
- Send a GREASE ECH extension
- 
--## "true"
-+## `true`
- 
- Attempt ECH if possible, but do not fail if ECH is not attempted.
- (The connection fails if ECH is attempted but fails.)
- 
--## "hard"
-+## `hard`
- 
--Attempt ECH and fail if that is not possible.
--ECH only works with TLS 1.3 and also requires using
--DoH or providing an ECHConfigList on the command line.
-+Attempt ECH and fail if that is not possible. ECH only works with TLS 1.3 and
-+also requires using DoH or providing an ECHConfigList on the command line.
- 
--## "ecl:<b64val>"
-+## `ecl:<b64val>`
- 
- A base64 encoded ECHConfigList that is used for ECH.
- 
--## "pn:<name>"
-+## `pn:<name>`
- 
--A name to use to over-ride the `public_name` field of an ECHConfigList
--(only available with OpenSSL TLS support)
-+A name to use to over-ride the `public_name` field of an ECHConfigList (only
-+available with OpenSSL TLS support)
- 
--## Errors
-+##
- 
--Most errors cause error
--*CURLE_ECH_REQUIRED* (101).
-+Most ECH related errors cause error *CURLE_ECH_REQUIRED* (101).
diff --git a/net-misc/curl/files/curl-8.11.0-cookie-case-sensitive.patch b/net-misc/curl/files/curl-8.11.0-cookie-case-sensitive.patch
deleted file mode 100644
index d906aab7e909..000000000000
--- a/net-misc/curl/files/curl-8.11.0-cookie-case-sensitive.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/curl/curl/commit/9919149aef67014150e2a1c75a7aa2c79204e30d
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Wed, 6 Nov 2024 11:26:25 +0100
-Subject: [PATCH] cookie: treat cookie name case sensitively
-
-Extend test 31 to verify
-
-Reported-by: delogicsreal on github
-Fixes #15492
-Closes #15493
---- a/lib/cookie.c
-+++ b/lib/cookie.c
-@@ -989,7 +989,7 @@ replace_existing(struct Curl_easy *data,
-   size_t myhash = cookiehash(co->domain);
-   for(n = Curl_llist_head(&ci->cookielist[myhash]); n; n = Curl_node_next(n)) {
-     struct Cookie *clist = Curl_node_elem(n);
--    if(strcasecompare(clist->name, co->name)) {
-+    if(!strcmp(clist->name, co->name)) {
-       /* the names are identical */
-       bool matching_domains = FALSE;
- 
-@@ -1029,7 +1029,7 @@ replace_existing(struct Curl_easy *data,
-       }
-     }
- 
--    if(!replace_n && strcasecompare(clist->name, co->name)) {
-+    if(!replace_n && !strcmp(clist->name, co->name)) {
-       /* the names are identical */
- 
-       if(clist->domain && co->domain) {
---- a/tests/data/test31
-+++ b/tests/data/test31
-@@ -26,6 +26,7 @@ Set-Cookie: blankdomain=sure; domain=; path=/
- %if !hyper
- Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure

- Set-Cookie:ismatch=this  ; domain=test31.curl; path=/silly/

-+Set-Cookie:ISMATCH=this  ; domain=test31.curl; path=/silly/

- Set-Cookie: overwrite=this  ; domain=test31.curl; path=/overwrite/

- Set-Cookie: overwrite=this2  ; domain=test31.curl; path=/overwrite

- Set-Cookie: sec1value=secure1  ; domain=test31.curl; path=/secure1/ ; secure

-@@ -75,6 +76,7 @@ Set-Cookie: securewithspace=after    ; secure =
- %else
- Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure

- Set-Cookie: ismatch=this  ; domain=test31.curl; path=/silly/

-+Set-Cookie:ISMATCH=this  ; domain=test31.curl; path=/silly/

- Set-Cookie: overwrite=this  ; domain=test31.curl; path=/overwrite/

- Set-Cookie: overwrite=this2  ; domain=test31.curl; path=/overwrite

- Set-Cookie: sec1value=secure1  ; domain=test31.curl; path=/secure1/ ; secure

-@@ -181,6 +183,7 @@ test31.curl	FALSE	/we/want/	FALSE	2118138987	nodomain	value
- #HttpOnly_.test31.curl	TRUE	/p2/	FALSE	0	httpo2	value2
- #HttpOnly_.test31.curl	TRUE	/p1/	FALSE	0	httpo1	value1
- .test31.curl	TRUE	/overwrite	FALSE	0	overwrite	this2
-+.test31.curl	TRUE	/silly/	FALSE	0	ISMATCH	this
- .test31.curl	TRUE	/silly/	FALSE	0	ismatch	this
- test31.curl	FALSE	/	FALSE	0	blankdomain	sure
- </file>
diff --git a/net-misc/curl/files/curl-8.11.0-curl-libssh-ipv6-brackets.patch b/net-misc/curl/files/curl-8.11.0-curl-libssh-ipv6-brackets.patch
deleted file mode 100644
index 6e1ecc0dd097..000000000000
--- a/net-misc/curl/files/curl-8.11.0-curl-libssh-ipv6-brackets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/curl/curl/commit/93c65c00e52c4c8cdc09b2d9194ce63763c7349e
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Fri, 8 Nov 2024 16:31:41 +0100
-Subject: [PATCH] libssh: when using IPv6 numerical address, add brackets
-
-Reported-by: henrikjehgmti on github
-Fixes #15522
-Closes #15524
---- a/lib/vssh/libssh.c
-+++ b/lib/vssh/libssh.c
-@@ -2191,7 +2191,14 @@ static CURLcode myssh_connect(struct Curl_easy *data, bool *done)
-     return CURLE_FAILED_INIT;
-   }
- 
--  rc = ssh_options_set(ssh->ssh_session, SSH_OPTIONS_HOST, conn->host.name);
-+  if(conn->bits.ipv6_ip) {
-+    char ipv6[MAX_IPADR_LEN];
-+    msnprintf(ipv6, sizeof(ipv6), "[%s]", conn->host.name);
-+    rc = ssh_options_set(ssh->ssh_session, SSH_OPTIONS_HOST, ipv6);
-+  }
-+  else
-+    rc = ssh_options_set(ssh->ssh_session, SSH_OPTIONS_HOST, conn->host.name);
-+
-   if(rc != SSH_OK) {
-     failf(data, "Could not set remote host");
-     return CURLE_FAILED_INIT;
diff --git a/net-misc/curl/files/curl-8.11.0-duphandle-init-netrc.patch b/net-misc/curl/files/curl-8.11.0-duphandle-init-netrc.patch
deleted file mode 100644
index 4a3e82a477fe..000000000000
--- a/net-misc/curl/files/curl-8.11.0-duphandle-init-netrc.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 7 Nov 2024 08:52:38 +0100
-Subject: [PATCH] duphandle: also init netrc
-
-The netrc init was only done in the Curl_open, meaning that a duplicated
-handle would not get inited properly.
-
-Added test 2309 to verify. It does netrc auth with a duplicated handle.
-
-Regression from 3b43a05e000aa8f65bda513f733a
-
-Reported-by: tranzystorekk on github
-Fixes #15496
-Closes #15503
---- a/lib/easy.c
-+++ b/lib/easy.c
-@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d)
-     goto fail;
- 
-   Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER);
-+  Curl_netrc_init(&outcurl->state.netrc);
- 
-   /* the connection pool is setup on demand */
-   outcurl->state.lastconnect_id = -1;
---- a/tests/data/Makefile.am
-+++ b/tests/data/Makefile.am
-@@ -255,7 +255,7 @@ test2100 \
- test2200 test2201 test2202 test2203 test2204 test2205 \
- \
- test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \
--test2308 \
-+test2308 test2309 \
- \
- test2400 test2401 test2402 test2403 test2404 test2405 test2406 \
- \
---- /dev/null
-+++ b/tests/data/test2309
-@@ -0,0 +1,66 @@
-+<testcase>
-+<info>
-+<keywords>
-+netrc
-+HTTP
-+</keywords>
-+</info>
-+#
-+# Server-side
-+<reply>
-+<data crlf="yes" nocheck="yes">
-+HTTP/1.1 200 OK
-+Date: Tue, 09 Nov 2010 14:49:00 GMT
-+Server: test-server/fake
-+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-+ETag: "21025-dc7-39462498"
-+Accept-Ranges: bytes
-+Content-Length: 6
-+Connection: close
-+Content-Type: text/html
-+Funny-head: yesyes
-+
-+-foo-
-+</data>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+http
-+</server>
-+<features>
-+proxy
-+</features>
-+
-+# Reproducing issue 15496
-+<name>
-+HTTP with .netrc using duped easy handle
-+</name>
-+<tool>
-+lib%TESTNUMBER
-+</tool>
-+<command>
-+http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
-+</command>
-+<file name="%LOGDIR/netrc%TESTNUMBER" >
-+
-+machine github.com
-+
-+login daniel
-+password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1
-+</file>
-+</client>
-+
-+<verify>
-+<protocol>
-+GET http://github.com/ HTTP/1.1

-+Host: github.com

-+Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%

-+Accept: */*

-+Proxy-Connection: Keep-Alive

-+

-+</protocol>
-+</verify>
-+</testcase>
---- a/tests/libtest/Makefile.inc
-+++ b/tests/libtest/Makefile.inc
-@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
-  lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \
-  lib1960 lib1964 \
-  lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \
-- lib2301 lib2302 lib2304 lib2305 lib2306         lib2308 \
-+ lib2301 lib2302 lib2304 lib2305 lib2306         lib2308 lib2309 \
-  lib2402 lib2404 lib2405 \
-  lib2502 \
-  lib3010 lib3025 lib3026 lib3027 \
-@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS)
- lib2308_SOURCES = lib2308.c $(SUPPORTFILES)
- lib2308_LDADD = $(TESTUTIL_LIBS)
- 
-+lib2309_SOURCES = lib2309.c $(SUPPORTFILES)
-+lib2309_LDADD = $(TESTUTIL_LIBS)
-+
- lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
- lib2402_LDADD = $(TESTUTIL_LIBS)
- 
---- /dev/null
-+++ b/tests/libtest/lib2309.c
-@@ -0,0 +1,66 @@
-+/***************************************************************************
-+ *                                  _   _ ____  _
-+ *  Project                     ___| | | |  _ \| |
-+ *                             / __| | | | |_) | |
-+ *                            | (__| |_| |  _ <| |___
-+ *                             \___|\___/|_| \_\_____|
-+ *
-+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-+ *
-+ * This software is licensed as described in the file COPYING, which
-+ * you should have received as part of this distribution. The terms
-+ * are also available at https://curl.se/docs/copyright.html.
-+ *
-+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
-+ * copies of the Software, and permit persons to whom the Software is
-+ * furnished to do so, under the terms of the COPYING file.
-+ *
-+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-+ * KIND, either express or implied.
-+ *
-+ * SPDX-License-Identifier: curl
-+ *
-+ ***************************************************************************/
-+
-+#include "test.h"
-+#include "testtrace.h"
-+
-+#include <curl/curl.h>
-+
-+static size_t cb_ignore(char *buffer, size_t size, size_t nmemb, void *userp)
-+{
-+  (void)buffer;
-+  (void)size;
-+  (void)nmemb;
-+  (void)userp;
-+  return CURL_WRITEFUNC_ERROR;
-+}
-+
-+CURLcode test(char *URL)
-+{
-+  CURL *curl;
-+  CURL *curldupe;
-+  CURLcode res = CURLE_OK;
-+
-+  global_init(CURL_GLOBAL_ALL);
-+  curl = curl_easy_init();
-+  if(curl) {
-+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_ignore);
-+    curl_easy_setopt(curl, CURLOPT_URL, URL);
-+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-+    curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3);
-+    curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED);
-+    curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2);
-+
-+    curldupe = curl_easy_duphandle(curl);
-+    if(curldupe) {
-+      res = curl_easy_perform(curldupe);
-+      printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR);
-+      fflush(stdout);
-+      curl_easy_cleanup(curldupe);
-+    }
-+    curl_easy_cleanup(curl);
-+  }
-+  curl_global_cleanup();
-+  return CURLE_OK;
-+}
diff --git a/net-misc/curl/files/curl-8.11.0-mbedtls-global-init.patch b/net-misc/curl/files/curl-8.11.0-mbedtls-global-init.patch
deleted file mode 100644
index 2c60da8ca6cd..000000000000
--- a/net-misc/curl/files/curl-8.11.0-mbedtls-global-init.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/curl/curl/commit/bcf8a848818ca0ca8d292c51c0ddeb93fa17fe62
-From: Stefan Eissing <stefan@eissing.org>
-Date: Thu, 7 Nov 2024 10:26:03 +0100
-Subject: [PATCH] mbedtls: call psa_crypt_init() in global init
-
-Run mbedtls' psa_crypt_init() in the general global init, optionally
-protected by mbedtls locks when available.
-
-CI: when building mbedtls, enabled thread safety
-
-Reported-by: wxiaoguang on github
-Fixes #15500
-Closes #15505
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -54,7 +54,7 @@
- #  ifdef MBEDTLS_DEBUG
- #    include <mbedtls/debug.h>
- #  endif
--#endif
-+#endif /* MBEDTLS_VERSION_MAJOR >= 2 */
- 
- #include "cipher_suite.h"
- #include "strcase.h"
-@@ -122,7 +122,7 @@ struct mbed_ssl_backend_data {
- #define HAS_SESSION_TICKETS
- #endif
- 
--#if defined(THREADING_SUPPORT)
-+#ifdef THREADING_SUPPORT
- static mbedtls_entropy_context ts_entropy;
- 
- static int entropy_init_initialized = 0;
-@@ -585,16 +585,6 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
-     return CURLE_NOT_BUILT_IN;
-   }
- 
--#ifdef TLS13_SUPPORT
--  ret = psa_crypto_init();
--  if(ret != PSA_SUCCESS) {
--    mbedtls_strerror(ret, errorbuf, sizeof(errorbuf));
--    failf(data, "mbedTLS psa_crypto_init returned (-0x%04X) %s",
--          -ret, errorbuf);
--    return CURLE_SSL_CONNECT_ERROR;
--  }
--#endif /* TLS13_SUPPORT */
--
- #ifdef THREADING_SUPPORT
-   mbedtls_ctr_drbg_init(&backend->ctr_drbg);
- 
-@@ -1571,6 +1561,20 @@ static int mbedtls_init(void)
- #ifdef THREADING_SUPPORT
-   entropy_init_mutex(&ts_entropy);
- #endif
-+#ifdef TLS13_SUPPORT
-+  {
-+    int ret;
-+#ifdef THREADING_SUPPORT
-+    Curl_mbedtlsthreadlock_lock_function(0);
-+#endif
-+    ret = psa_crypto_init();
-+#ifdef THREADING_SUPPORT
-+    Curl_mbedtlsthreadlock_unlock_function(0);
-+#endif
-+    if(ret != PSA_SUCCESS)
-+      return 0;
-+  }
-+#endif /* TLS13_SUPPORT */
-   return 1;
- }
- 
diff --git a/net-misc/curl/files/curl-8.11.0-netrc-large-file.patch b/net-misc/curl/files/curl-8.11.0-netrc-large-file.patch
deleted file mode 100644
index ba0e45140640..000000000000
--- a/net-misc/curl/files/curl-8.11.0-netrc-large-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 7 Nov 2024 17:03:54 +0100
-Subject: [PATCH] netrc: support large file, longer lines, longer tokens
-
-Regression from 3b43a05e000aa8f6 (shipped in 8.11.0)
-
-Reported-by: Moritz
-Fixes #15513
-Closes #15514
---- a/lib/netrc.c
-+++ b/lib/netrc.c
-@@ -58,9 +58,9 @@ enum found_state {
- #define NETRC_FAILED -1
- #define NETRC_SUCCESS 0
- 
--#define MAX_NETRC_LINE 4096
--#define MAX_NETRC_FILE (64*1024)
--#define MAX_NETRC_TOKEN 128
-+#define MAX_NETRC_LINE 16384
-+#define MAX_NETRC_FILE (128*1024)
-+#define MAX_NETRC_TOKEN 4096
- 
- static CURLcode file2memory(const char *filename, struct dynbuf *filebuf)
- {
diff --git a/net-misc/curl/files/curl-8.11.0-setopt-http_content_decoding.patch b/net-misc/curl/files/curl-8.11.0-setopt-http_content_decoding.patch
deleted file mode 100644
index 68621e85ba00..000000000000
--- a/net-misc/curl/files/curl-8.11.0-setopt-http_content_decoding.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/curl/curl/commit/878bc429f26c27294787dc59d7b53345d9edc5aa
-From: Jesus Malo Poyatos <jmalopoy@opentext.com>
-Date: Thu, 7 Nov 2024 14:00:53 +0100
-Subject: [PATCH] setopt: fix CURLOPT_HTTP_CONTENT_DECODING
-
-Regression from 30da1f5974d34841b30c4f (shipped in 8.11.0)
-
-Fixes #15511
-Closes #15510
---- a/lib/setopt.c
-+++ b/lib/setopt.c
-@@ -1146,7 +1146,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
-     /*
-      * raw data passed to the application when content encoding is used
-      */
--    data->set.http_ce_skip = enabled;
-+    data->set.http_ce_skip = !enabled; /* reversed */
-     break;
- 
- #if !defined(CURL_DISABLE_FTP) || defined(USE_SSH)
diff --git a/net-misc/curl/files/curl-8.8.0-install-manpage.patch b/net-misc/curl/files/curl-8.8.0-install-manpage.patch
deleted file mode 100644
index f58ddae1c302..000000000000
--- a/net-misc/curl/files/curl-8.8.0-install-manpage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/curl/curl/pull/13741
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Wed, 22 May 2024 08:43:43 +0200
-Subject: [PATCH] docs/Makefile.am: make curl-config.1 install
-
-on "make install" like it should
----
- docs/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 83f5b0c461cc0f..e9ef6284860555 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -28,6 +28,7 @@ if BUILD_DOCS
- # if we disable man page building, ignore these
- MK_CA_DOCS = mk-ca-bundle.1
- CURLCONF_DOCS = curl-config.1
-+man_MANS = curl-config.1
- endif
- 
- CURLPAGES = curl-config.md mk-ca-bundle.md
diff --git a/net-misc/curl/files/curl-8.8.0-mbedtls.patch b/net-misc/curl/files/curl-8.8.0-mbedtls.patch
deleted file mode 100644
index 8fa4d6ef7cfe..000000000000
--- a/net-misc/curl/files/curl-8.8.0-mbedtls.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/curl/curl/pull/13749
-From: Stefan Eissing <stefan@eissing.org>
-Date: Wed, 22 May 2024 14:44:56 +0200
-Subject: [PATCH] mbedtls, check version for cipher id
-
-- mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have
-  been added in mbedtls 3.2.0. Check for that version.
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data)
-     (struct mbed_ssl_backend_data *)connssl->backend;
-   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
-   const mbedtls_x509_crt *peercert;
--  char cipher_str[64];
--  uint16_t cipher_id;
- #ifndef CURL_DISABLE_PROXY
-   const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)?
-     data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]:
-@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data)
-     return CURLE_SSL_CONNECT_ERROR;
-   }
- 
--  cipher_id = (uint16_t)
--              mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl);
--  mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true);
--  infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str);
--
-+#if MBEDTLS_VERSION_NUMBER >= 0x03020000
-+  {
-+    char cipher_str[64];
-+    uint16_t cipher_id;
-+    cipher_id = (uint16_t)
-+                mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl);
-+    mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true);
-+    infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str);
-+  }
-+#else
-+  infof(data, "mbedTLS: Handshake complete");
-+#endif
-   ret = mbedtls_ssl_get_verify_result(&backend->ssl);
- 
-   if(!conn_config->verifyhost)
diff --git a/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch b/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch
deleted file mode 100644
index 38d8c1bd3f20..000000000000
--- a/net-misc/curl/files/curl-8.8.0-multi_wait-timeout.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/curl/curl/pull/13825
-From: Stefan Eissing <stefan@eissing.org>
-Date: Wed, 29 May 2024 17:13:34 +0200
-Subject: [PATCH] fix multi_wait() timeout handling
-
-- determine the actual poll timeout *after* all sockets
-  have been collected. Protocols and connection filters may
-  install new timeouts during collection.
-- add debug logging to test1533 where the mistake was noticed
-- refs #13782
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1366,13 +1366,6 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
-   if(timeout_ms < 0)
-     return CURLM_BAD_FUNCTION_ARGUMENT;
- 
--  /* If the internally desired timeout is actually shorter than requested from
--     the outside, then use the shorter time! But only if the internal timer
--     is actually larger than -1! */
--  (void)multi_timeout(multi, &timeout_internal);
--  if((timeout_internal >= 0) && (timeout_internal < (long)timeout_ms))
--    timeout_ms = (int)timeout_internal;
--
-   memset(ufds, 0, ufds_len * sizeof(struct pollfd));
-   memset(&ps, 0, sizeof(ps));
- 
-@@ -1476,6 +1469,14 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
- #endif
- #endif
- 
-+  /* We check the internal timeout *AFTER* we collected all sockets to
-+   * poll. Collecting the sockets may install new timers by protocols
-+   * and connection filters.
-+   * Use the shorter one of the internal and the caller requested timeout. */
-+  (void)multi_timeout(multi, &timeout_internal);
-+  if((timeout_internal >= 0) && (timeout_internal < (long)timeout_ms))
-+    timeout_ms = (int)timeout_internal;
-+
- #if defined(ENABLE_WAKEUP) && defined(USE_WINSOCK)
-   if(nfds || use_wakeup) {
- #else
---- a/tests/libtest/Makefile.inc
-+++ b/tests/libtest/Makefile.inc
-@@ -487,7 +487,7 @@ lib1551_SOURCES = lib1551.c $(SUPPORTFILES)
- lib1552_SOURCES = lib1552.c $(SUPPORTFILES) $(TESTUTIL)
- lib1552_LDADD = $(TESTUTIL_LIBS)
- 
--lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TESTUTIL)
-+lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TSTTRACE) $(TESTUTIL)
- lib1553_LDADD = $(TESTUTIL_LIBS)
- 
- lib1554_SOURCES = lib1554.c $(SUPPORTFILES)
---- a/tests/libtest/lib1553.c
-+++ b/tests/libtest/lib1553.c
-@@ -24,6 +24,7 @@
- #include "test.h"
- 
- #include "testutil.h"
-+#include "testtrace.h"
- #include "warnless.h"
- #include "memdebug.h"
- 
-@@ -74,6 +75,12 @@ CURLcode test(char *URL)
-   easy_setopt(curls, CURLOPT_XFERINFOFUNCTION, xferinfo);
-   easy_setopt(curls, CURLOPT_NOPROGRESS, 1L);
- 
-+  libtest_debug_config.nohex = 1;
-+  libtest_debug_config.tracetime = 1;
-+  test_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config);
-+  easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
-+  easy_setopt(curls, CURLOPT_VERBOSE, 1L);
-+
-   multi_add_handle(multi, curls);
- 
-   multi_perform(multi, &still_running);
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 0c0052e1f7e5..cb0fc2fbe5f9 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -6,5 +6,5 @@ DIST rclone-v1.69.1-vendor.tar.gz 13831747 BLAKE2B 327c38cf386232b40963c89158c28
 DIST rclone-v1.69.1.tar.gz 16906745 BLAKE2B 2b701cacd169c1519a5e67199fa7c7b5938137b7baab1db276b70e4ac7c0e303e8ef1870a691a0534b399b89eff3a6f4d8d7930f1a3bebd175be1e47e4e9a8b8 SHA512 355a2295b0478de84475889663d7e7fb818f840c983e812e67de205eed725f1b2f00d667e66c0cec82a18af363dd7986a0f2cdd0ace4a2c81ffe167457238d3a
 EBUILD rclone-1.68.2.ebuild 1487 BLAKE2B 21104447d8e177eb4726b1c24fcae4ab0c02df4a3d58eb056a78974af2d6f52e61026b9c17a53e69e54d24139499e49da193ff8c1697cc8d583235342d497bd9 SHA512 7b59212116381fbdc61cc9afac06df05d90249875a44a2983c2e0f409f7b7e9eea5b0d3f6e0b54b5142bb5d6735f0139589a71b7c8f62b8403af7d8904718c27
 EBUILD rclone-1.69.0.ebuild 1490 BLAKE2B 3f2c5986a6bdc98222b201e97167e490a4f2a33b1f573a183a9e6c88dfe33f1203c7a6fb3c61ebf6baeeef86753e262086b7d0403432fea1fe9faf0355ee1f9c SHA512 98822b8564cd5ae7a47a55a5f49f1755883bbd21130807e3a5ed06fea47425485a653d3046dac1e55415f7899e5a45f4590ec0f1ac37605e8654277915f0eb18
-EBUILD rclone-1.69.1.ebuild 1683 BLAKE2B 2d7dd63c31d3ab358fdca560949936bd8a49bbec9d234aa0ee6c6997618fad933dd7d45c56386b0945952aa998a0d304013f7bd5690b9709ccfaf36fd0933298 SHA512 7efa0bc0ab7136384953aff2cdcbb9fa784613037b62f8bb287cd9379b2a8ede3e8dd590934292891995c929c267ca2a52ebc1b341aabbcc75ca6691013c30a5
+EBUILD rclone-1.69.1.ebuild 1674 BLAKE2B 3e2c3b010e0fea8d80303055a391e43e0339d7969d32b6e9421fd489a70a5782c867a55e5cee0404e0639db9e088d30a4cbbc903c5a7dc82f46aec712988663b SHA512 182a4e85f76598f79dba722606bf5f1a534a126d3ce266baeabaf90b188168761678a66079fe40ab6fff694f60bbd5444973cb26e4dba5eb2edacd1c7967c46a
 MISC metadata.xml 546 BLAKE2B 810399fdf5969d7862199e98fe8382c65e87b1d7a7af5e0aa7f1c8c1351d4794781c8076879983c429f62ff74c870943583d00878596683349e01fbea8285b26 SHA512 9f8c26b6fc993c91c0f3033d1e33ccedd2a173697e6660fa6d27955b522b7764ff2d2bfa0706d4222001606b60e432486e1e11e72534f5d5d60f01be0dc4309f
diff --git a/net-misc/rclone/rclone-1.69.1.ebuild b/net-misc/rclone/rclone-1.69.1.ebuild
index bbc13c2acf76..803430bad21f 100644
--- a/net-misc/rclone/rclone-1.69.1.ebuild
+++ b/net-misc/rclone/rclone-1.69.1.ebuild
@@ -68,7 +68,7 @@ src_install() {
 
 	newbashcomp "${PN}.bash" "${PN}"
 	newzshcomp "${PN}.zsh" "_${PN}"
-	newfishcomp "${PN}.fish" "${PN}"
+	dofishcomp "${PN}.fish"
 
 	doman "${PN}.1"
 	einstalldocs
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index a5a7394ab385..9b8f8df653e7 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,3 +1,5 @@
+DIST sipsak-0.9.8.1.tar.gz 202545 BLAKE2B a3f8d8361f4bf52fbcd01d95512cd3850f831b3d2e08eea78fd24805e3d15f7e8a424d73518fdf2c86f4756087a2e13f5bab33b0aae0f79d45a4daa0f9b5c69e SHA512 8313d1176e6f3cab78dada33fbf8d3c7c6e6434671dd6a7402d1433bbec50f53e2bf98496d8ac1b8021586f19940c32dbdd15e93ff7ed88ee1b690a037b46ab8
 DIST sipsak-0.9.8.tar.gz 202482 BLAKE2B 26ea0fc196d598f6ef111b0c511484db0ca23b4ea8e2febe957b578a5eb0e2351dcc1d5848bdcda4a01f6962d1cd97c80dcf58203fcb82e19eb7f475f8a7ee56 SHA512 1cd4c8e69f5c8cae83c524f73ef53eb139127ff3652eb1407542883c4c3593df9d61207e10198705e064b42da72c210fb6a88c087a83c3b13bbb6d9d8bfab20c
+EBUILD sipsak-0.9.8.1.ebuild 613 BLAKE2B 63c2f6172bb60e7df06e6d795b801bc8d539eb02455aa3ac0c7be7d8ee40791a87fee36ff3dbb31a4a6b76c464b010cb5e5cdbaa1d10f0ac2ebd9e5fe07ba41d SHA512 9931f359866673ebde22c443e8cd007bc694fa2c28bd49fe3fd3b42fdcb9ecf7af8b12d932af713fd6c10b4dccb5bc9d6eb460318a2caef9de4703b5e1e0fe19
 EBUILD sipsak-0.9.8.ebuild 612 BLAKE2B 10b70d70266a0df520a64790064701353c504ab2b23c98196ee83c7de0a86501060aa4a1c00a07f23a097beb9eda776557955e29bccd77277e5ea67aece51766 SHA512 fa5c394c1ae92f649a4fcfd0cdd07e5ee615726be95a966a71bb7b05b1f77862565c40b7891a927af26d5e0e6de973735d3691453b5082a2e5d1f24626fac248
 MISC metadata.xml 312 BLAKE2B e68cdc36f45f7fda00a73d8b489cb736be6d92da923e7a625c95afe1556ee96b83cf0b53193f52d0e59026eb8f66d872d85b088e60c93ff09fd1879c9d82dd8b SHA512 d29c41e4940b94644968f7857f69290e4e4beae9f4e236fc0babfad6c59798408e0ddde9d329de3d69bed2e02c7329dd142c4ed3b7d6894e25941797036adfe4
diff --git a/net-misc/sipsak/sipsak-0.9.8.1.ebuild b/net-misc/sipsak/sipsak-0.9.8.1.ebuild
new file mode 100644
index 000000000000..6341f2ea1d6e
--- /dev/null
+++ b/net-misc/sipsak/sipsak-0.9.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Small command line tool for testing SIP applications and devices"
+HOMEPAGE="https://github.com/nils-ohlmeier/sipsak"
+SRC_URI="https://github.com/nils-ohlmeier/sipsak/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-dns/c-ares
+	net-libs/gnutls:="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_configure() {
+	append-cflags -std=gnu89 -fcommon
+	econf
+}