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 E90D2138334 for ; Fri, 26 Oct 2018 18:35:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF3D2E0953; Fri, 26 Oct 2018 18:35:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C59C8E0953 for ; Fri, 26 Oct 2018 18:35:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9C459335C47 for ; Fri, 26 Oct 2018 18:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06A663DD for ; Fri, 26 Oct 2018 18:35:34 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1540578907.1b0868a46a94ecf8697e19f5761067c72ba9b355.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 1b0868a46a94ecf8697e19f5761067c72ba9b355 X-VCS-Branch: master Date: Fri, 26 Oct 2018 18:35:34 +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-Archives-Salt: e039ed17-560f-4bf9-be8b-e8bb6dfd5a6f X-Archives-Hash: de06e6f134749439b358d545ac5eaf67 commit: 1b0868a46a94ecf8697e19f5761067c72ba9b355 Author: Patrick McLean sony com> AuthorDate: Fri Oct 26 18:34:55 2018 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Oct 26 18:35:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0868a4 net-misc/openssh: Previous fix in 7.9_p1 broke patch Fixes: d9479289f3cd4833538cc7c89fdc65a05685b439 Signed-off-by: Patrick McLean gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch b/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch index c07ad0414ef..78b75453274 100644 --- a/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch +++ b/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch @@ -27,22 +27,6 @@ #ifdef __linux__ cipher_threads = sysconf(_SC_NPROCESSORS_ONLN) / 2; #endif /*__linux__*/ -@@ -505,11 +503,12 @@ - if (cipher_threads < 2) - cipher_threads = 2; - -- /* assure that we aren't trying to create more threads than we have in the struct */ -- /* cipher_threads is half the total of allowable threads hence the odd looking math here */ -+ /* assure that we aren't trying to create more threads */ -+ /* than we have in the struct. cipher_threads is half the */ -+ /* total of allowable threads hence the odd looking math here */ - if (cipher_threads * 2 > MAX_THREADS) - cipher_threads = MAX_THREADS / 2; -- -+ - /* set the number of keystream queues */ - numkq = cipher_threads * 2; - @@ -551,16 +550,16 @@ }