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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D03B5158090 for ; Thu, 19 May 2022 23:08:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12254E0916; Thu, 19 May 2022 23:08:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3197E0916 for ; Thu, 19 May 2022 23:08:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9358534164E for ; Thu, 19 May 2022 23:08:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFE6C430 for ; Thu, 19 May 2022 23:08:40 +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: <1653001713.f7dcc5db3065338bf5b1951ca897cb0042de2c8f.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch net-misc/openssh/openssh-9.0_p1-r1.ebuild net-misc/openssh/openssh-9.0_p1.ebuild X-VCS-Directories: net-misc/openssh/files/ net-misc/openssh/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: f7dcc5db3065338bf5b1951ca897cb0042de2c8f X-VCS-Branch: master Date: Thu, 19 May 2022 23:08:40 +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: 87ed8c42-8314-43de-a37a-cdca1da3374a X-Archives-Hash: 7c4166ff37ea2f5922200a677ec48071 commit: f7dcc5db3065338bf5b1951ca897cb0042de2c8f Author: Patrick McLean gentoo org> AuthorDate: Thu May 19 23:08:05 2022 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu May 19 23:08:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7dcc5db net-misc/openssh: Bump 9.0_p1 to fix random hangs with X509 Signed-off-by: Patrick McLean gentoo.org> .../files/openssh-9.0_p1-X509-uninitialized-delay.patch | 12 ++++++++++++ .../{openssh-9.0_p1.ebuild => openssh-9.0_p1-r1.ebuild} | 1 + 2 files changed, 13 insertions(+) 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 new file mode 100644 index 000000000000..2a83ed37d138 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.0_p1-X509-uninitialized-delay.patch @@ -0,0 +1,12 @@ +diff -ur a/auth2.c b/auth2.c +--- a/auth2.c 2022-05-19 15:59:32.875160028 -0700 ++++ b/auth2.c 2022-05-19 16:03:44.291594908 -0700 +@@ -226,7 +226,7 @@ + int digest_alg; + size_t len; + u_char *hash; +- double delay; ++ double delay = 0; + + digest_alg = ssh_digest_maxbytes(); + if (len = ssh_digest_bytes(digest_alg) > 0) { diff --git a/net-misc/openssh/openssh-9.0_p1.ebuild b/net-misc/openssh/openssh-9.0_p1-r1.ebuild similarity index 99% rename from net-misc/openssh/openssh-9.0_p1.ebuild rename to net-misc/openssh/openssh-9.0_p1-r1.ebuild index 13c0bb4fa5c5..9fc26e8968bf 100644 --- a/net-misc/openssh/openssh-9.0_p1.ebuild +++ b/net-misc/openssh/openssh-9.0_p1-r1.ebuild @@ -149,6 +149,7 @@ src_prepare() { popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch" # We need to patch package version or any X.509 sshd will reject our ssh client # with "userauth_pubkey: could not parse key: string is too large [preauth]"