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 66A7715808D for ; Wed, 20 Apr 2022 20:15:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54BE3E0845; Wed, 20 Apr 2022 20:15:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E42E7E0845 for ; Wed, 20 Apr 2022 20:14:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 768EF3416E5 for ; Wed, 20 Apr 2022 20:14:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0AE2355 for ; Wed, 20 Apr 2022 20:14:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650485679.021483c2d2bf73557d74ce0b90aafffe366e02b4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/, net-misc/curl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-7.82.0-r1.ebuild net-misc/curl/curl-7.82.0-r2.ebuild net-misc/curl/files/curl-7.82.0-certs-processing.patch X-VCS-Directories: net-misc/curl/files/ net-misc/curl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 021483c2d2bf73557d74ce0b90aafffe366e02b4 X-VCS-Branch: master Date: Wed, 20 Apr 2022 20:14:55 +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: f6f88e4a-7407-4eb0-9adb-42de36e88593 X-Archives-Hash: 66818b37f23ec26b37d148ff8b7f460b commit: 021483c2d2bf73557d74ce0b90aafffe366e02b4 Author: Karlson2k (Evgeny Grin) narod ru> AuthorDate: Wed Apr 20 19:35:31 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 20 20:14:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021483c2 net-misc/curl: fixed "out of memory error" in 7.82.0 Closes: https://bugs.gentoo.org/836629 Signed-off-by: Karlson2k (Evgeny Grin) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/25133 Signed-off-by: Sam James gentoo.org> ...curl-7.82.0-r1.ebuild => curl-7.82.0-r2.ebuild} | 1 + .../curl/files/curl-7.82.0-certs-processing.patch | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/net-misc/curl/curl-7.82.0-r1.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild similarity index 99% rename from net-misc/curl/curl-7.82.0-r1.ebuild rename to net-misc/curl/curl-7.82.0-r2.ebuild index 9b955edd99ac..1697033eb0d2 100644 --- a/net-misc/curl/curl-7.82.0-r1.ebuild +++ b/net-misc/curl/curl-7.82.0-r2.ebuild @@ -93,6 +93,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-7.30.0-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-certs-processing.patch ) src_prepare() { diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch new file mode 100644 index 000000000000..a62c1df20b30 --- /dev/null +++ b/net-misc/curl/files/curl-7.82.0-certs-processing.patch @@ -0,0 +1,27 @@ +https://github.com/curl/curl/issues/8559 +https://bugs.gentoo.org/836629 + +From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 8 Mar 2022 13:38:13 +0100 +Subject: [PATCH] openssl: fix CN check error code + +Due to a missing 'else' this returns error too easily. + +Regressed in: d15692ebb + +Reported-by: Kristoffer Gleditsch +Fixes #8559 +Closes #8560 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, + memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); + peer_CN[peerlen] = '\0'; + } +- result = CURLE_OUT_OF_MEMORY; ++ else ++ result = CURLE_OUT_OF_MEMORY; + } + } + else /* not a UTF8 name */