| 1 |
commit: f7dcc5db3065338bf5b1951ca897cb0042de2c8f |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 19 23:08:05 2022 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 19 23:08:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7dcc5db |
| 7 |
|
| 8 |
net-misc/openssh: Bump 9.0_p1 to fix random hangs with X509 |
| 9 |
|
| 10 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/openssh-9.0_p1-X509-uninitialized-delay.patch | 12 ++++++++++++ |
| 13 |
.../{openssh-9.0_p1.ebuild => openssh-9.0_p1-r1.ebuild} | 1 + |
| 14 |
2 files changed, 13 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..2a83ed37d138 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch |
| 21 |
@@ -0,0 +1,12 @@ |
| 22 |
+diff -ur a/auth2.c b/auth2.c |
| 23 |
+--- a/auth2.c 2022-05-19 15:59:32.875160028 -0700 |
| 24 |
++++ b/auth2.c 2022-05-19 16:03:44.291594908 -0700 |
| 25 |
+@@ -226,7 +226,7 @@ |
| 26 |
+ int digest_alg; |
| 27 |
+ size_t len; |
| 28 |
+ u_char *hash; |
| 29 |
+- double delay; |
| 30 |
++ double delay = 0; |
| 31 |
+ |
| 32 |
+ digest_alg = ssh_digest_maxbytes(); |
| 33 |
+ if (len = ssh_digest_bytes(digest_alg) > 0) { |
| 34 |
|
| 35 |
diff --git a/net-misc/openssh/openssh-9.0_p1.ebuild b/net-misc/openssh/openssh-9.0_p1-r1.ebuild |
| 36 |
similarity index 99% |
| 37 |
rename from net-misc/openssh/openssh-9.0_p1.ebuild |
| 38 |
rename to net-misc/openssh/openssh-9.0_p1-r1.ebuild |
| 39 |
index 13c0bb4fa5c5..9fc26e8968bf 100644 |
| 40 |
--- a/net-misc/openssh/openssh-9.0_p1.ebuild |
| 41 |
+++ b/net-misc/openssh/openssh-9.0_p1-r1.ebuild |
| 42 |
@@ -149,6 +149,7 @@ src_prepare() { |
| 43 |
popd &>/dev/null || die |
| 44 |
|
| 45 |
eapply "${WORKDIR}"/${X509_PATCH%.*} |
| 46 |
+ eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch" |
| 47 |
|
| 48 |
# We need to patch package version or any X.509 sshd will reject our ssh client |
| 49 |
# with "userauth_pubkey: could not parse key: string is too large [preauth]" |
Archives