From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED28415814C for ; Sun, 15 Oct 2023 22:04:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E57E32BC01B; Sun, 15 Oct 2023 22:04:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF7AE2BC01B for ; Sun, 15 Oct 2023 22:04:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25646335CCD for ; Sun, 15 Oct 2023 22:04:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DE4C1220 for ; Sun, 15 Oct 2023 22:04:39 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1697407292.0da7d6b21bbbdd735fcaae1f27ddd01c6b8d0f3e.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/files/curl-8.0.1-onion-resolution.patch X-VCS-Directories: net-misc/curl/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 0da7d6b21bbbdd735fcaae1f27ddd01c6b8d0f3e X-VCS-Branch: master Date: Sun, 15 Oct 2023 22:04:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e6b29b29-5cb8-488d-b237-36f36284869b X-Archives-Hash: bffae0a7ea416e873a455eb571719239 commit: 0da7d6b21bbbdd735fcaae1f27ddd01c6b8d0f3e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Oct 15 16:19:02 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Oct 15 22:01:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da7d6b2 net-misc/curl: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/33350 Signed-off-by: Conrad Kostecki gentoo.org> .../curl/files/curl-8.0.1-onion-resolution.patch | 158 --------------------- 1 file changed, 158 deletions(-) diff --git a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch b/net-misc/curl/files/curl-8.0.1-onion-resolution.patch deleted file mode 100644 index 65b486529c1f..000000000000 --- a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch +++ /dev/null @@ -1,158 +0,0 @@ -https://bugs.gentoo.org/887287 -https://github.com/curl/curl/pull/10705 - -From e2bbd1adc22ec5033e2292b780e1790db93c3cb4 Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Wed, 8 Mar 2023 02:16:45 +1100 -Subject: [PATCH] Refuse to resolve the .onion TLD. - -RFC 7686 states that: - -> Applications that do not implement the Tor -> protocol SHOULD generate an error upon the use of .onion and -> SHOULD NOT perform a DNS lookup. - -Let's do that. - -See curl/curl#543 -https://www.rfc-editor.org/rfc/rfc7686#section-2 ---- a/docs/KNOWN_BUGS -+++ b/docs/KNOWN_BUGS -@@ -80,7 +80,6 @@ problems may have been fixed or changed somewhat since this was written. - 10.3 FTPS over SOCKS - - 11. Internals -- 11.1 Curl leaks .onion hostnames in DNS - 11.2 error buffer not set if connection to multiple addresses fails - 11.4 HTTP test server 'connection-monitor' problems - 11.5 Connection information when using TCP Fast Open -@@ -525,14 +524,6 @@ problems may have been fixed or changed somewhat since this was written. - - 11. Internals - --11.1 Curl leaks .onion hostnames in DNS -- -- Curl sends DNS requests for hostnames with a .onion TLD. This leaks -- information about what the user is attempting to access, and violates this -- requirement of RFC7686: https://datatracker.ietf.org/doc/html/rfc7686 -- -- Issue: https://github.com/curl/curl/issues/543 -- - 11.2 error buffer not set if connection to multiple addresses fails - - If you ask libcurl to resolve a hostname like example.com to IPv6 addresses ---- a/lib/hostip.c -+++ b/lib/hostip.c -@@ -652,6 +652,14 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, - CURLcode result; - enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */ - struct connectdata *conn = data->conn; -+ /* We should intentionally error and not resolve .onion TLDs */ -+ size_t hostname_len = strlen(hostname); -+ if(hostname_len >= 7 && -+ (curl_strequal(&hostname[hostname_len-6], ".onion") || -+ curl_strequal(&hostname[hostname_len-7], ".onion."))) { -+ failf(data, "Not resolving .onion address (RFC 7686)"); -+ return CURLRESOLV_ERROR; -+ } - *entry = NULL; - #ifndef CURL_DISABLE_DOH - conn->bits.doh = FALSE; /* default is not */ ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -186,8 +186,8 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \ - test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \ - test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \ - test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \ --test1464 test1465 test1466 test1467 test1468 test1469 test1470 \ --\ -+test1464 test1465 test1466 test1467 test1468 test1469 test1470 test1471 \ -+test1472 \ - test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ - test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ - test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \ ---- /dev/null -+++ b/tests/data/test1471 -@@ -0,0 +1,39 @@ -+ -+ -+ -+Onion -+Tor -+FAILURE -+ -+ -+# -+# Server-side -+ -+ -+ -+# -+# Client-side -+ -+ -+none -+ -+ -+Fail to resolve .onion TLD -+ -+ -+red.onion -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+# Couldn't resolve host name -+ -+6 -+ -+ -+curl: (6) Not resolving .onion address (RFC 7686) -+ -+ -+ ---- /dev/null -+++ b/tests/data/test1472 -@@ -0,0 +1,39 @@ -+ -+ -+ -+Onion -+Tor -+FAILURE -+ -+ -+# -+# Server-side -+ -+ -+ -+# -+# Client-side -+ -+ -+none -+ -+ -+Fail to resolve .onion. TLD -+ -+ -+tasty.onion. -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+# Couldn't resolve host name -+ -+6 -+ -+ -+curl: (6) Not resolving .onion address (RFC 7686) -+ -+ -+ -