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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 331A113835A for ; Sat, 1 May 2021 18:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C086E0D38; Sat, 1 May 2021 18:07:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03BC3E0D35 for ; Sat, 1 May 2021 18:07:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4071633BF55 for ; Sat, 1 May 2021 18:07:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A939D743 for ; Sat, 1 May 2021 18:07:12 +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: <1619892385.3d46d30cf22ea864b81089bcbfd70d26dbcbc18f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/httperf/files/, app-benchmarks/httperf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild X-VCS-Directories: app-benchmarks/httperf/ app-benchmarks/httperf/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3d46d30cf22ea864b81089bcbfd70d26dbcbc18f X-VCS-Branch: master Date: Sat, 1 May 2021 18:07:12 +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: 746830a5-2b01-4eb6-9125-1c83f39c474c X-Archives-Hash: 4fe7376ec19ebfe89593fd2ffe31f238 commit: 3d46d30cf22ea864b81089bcbfd70d26dbcbc18f Author: Sam James gentoo org> AuthorDate: Sat May 1 17:35:18 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 1 18:06:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d46d30c app-benchmarks/httperf: drop obsolete LibreSSL patch Signed-off-by: Sam James gentoo.org> .../files/httperf-0.9.1_p20181111-libressl.patch | 49 ---------------------- .../httperf/httperf-0.9.1_p20181111-r1.ebuild | 2 - 2 files changed, 51 deletions(-) diff --git a/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch b/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch deleted file mode 100644 index e1c0c90fac0..00000000000 --- a/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1c4277eb9288c719b009aacb4bd71ca543f51cbd Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Mon, 3 Jun 2019 16:18:21 +0300 -Subject: [PATCH] Use correct ifdefs for checking TLS 1.3 - -TLS 1.3 is not ready yet in LibreSSL. Also there is a theoretical -possibility of OpenSSL >=1.1.1 built without TLS 1.3 support - -Upstream-Status: Submitted -[https://github.com/httperf/httperf/pull/66] -Signed-off-by: Stefan Strogin ---- - src/httperf.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/httperf.c b/src/httperf.c -index af6f568..5dbba07 100755 ---- a/src/httperf.c -+++ b/src/httperf.c -@@ -687,7 +687,7 @@ main(int argc, char **argv) - param.ssl_protocol = 5; - else if (strcasecmp (optarg, "TLSv1.2") == 0 || strcasecmp (optarg, "TLSv1_2") == 0) - param.ssl_protocol = 6; --#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) -+#ifdef TLS1_3_VERSION - else if (strcasecmp (optarg, "TLSv1.3") == 0 || strcasecmp (optarg, "TLSv1_3") == 0) - param.ssl_protocol = 7; - #endif -@@ -1104,7 +1104,7 @@ main(int argc, char **argv) - SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1); break; - #endif - --#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) -+#ifdef TLS1_3_VERSION - /* 7/TLSv1.3 */ - case 7: - ssl_ctx = SSL_CTX_new (TLS_client_method ()); -@@ -1329,7 +1329,7 @@ main(int argc, char **argv) - case 4: printf (" --ssl-protocol=TLSv1.0"); break; - case 5: printf (" --ssl-protocol=TLSv1.1"); break; - case 6: printf (" --ssl-protocol=TLSv1.2"); break; --#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) -+#ifdef TLS1_3_VERSION - case 7: printf (" --ssl-protocol=TLSv1.3"); break; - #endif - } --- -2.21.0 - diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild index 7172926e8f5..082a178bf83 100644 --- a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild +++ b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild @@ -23,8 +23,6 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${COMMIT}" -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) - src_prepare() { default eautoreconf