net-misc/openssh: Previous fix in 7.9_p1 broke patch

Fixes: d9479289f3cd4833538cc7c89fdc65a05685b439
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

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 c07ad0414ef510605361b7ce223e8471ff53f611..78b75453274066905d4a8bfc8b498d18b7f1ea8c 100644 (file)
--- 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 @@
        }