commit: 1b0868a46a94ecf8697e19f5761067c72ba9b355
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Oct 26 18:34:55 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> 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 <chutzpah <AT> 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 @@
}
