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 2CA3215800F for ; Sun, 22 Jan 2023 17:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F124DE07EE; Sun, 22 Jan 2023 17:50:59 +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 CA2DAE07EE for ; Sun, 22 Jan 2023 17:50:59 +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 91705340DFB for ; Sun, 22 Jan 2023 17:50:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEF874C8 for ; Sun, 22 Jan 2023 17:50:56 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1674409832.1b2bcb67e18ff9150bc5c7e758bc2d6d72e75ba9.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-9.1_p1-r3.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 1b2bcb67e18ff9150bc5c7e758bc2d6d72e75ba9 X-VCS-Branch: master Date: Sun, 22 Jan 2023 17:50:56 +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: 7738f251-4206-4f20-a150-19a84bf05320 X-Archives-Hash: 096086ab2cbd8c761d241757b8067194 commit: 1b2bcb67e18ff9150bc5c7e758bc2d6d72e75ba9 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jan 22 17:49:01 2023 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jan 22 17:50:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2bcb67 net-misc/openssh: avoid conflict between x509 patch and getentropy fix Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/891665 net-misc/openssh/openssh-9.1_p1-r3.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net-misc/openssh/openssh-9.1_p1-r3.ebuild b/net-misc/openssh/openssh-9.1_p1-r3.ebuild index dbbb727af2ea..a11418a8dea0 100644 --- a/net-misc/openssh/openssh-9.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-9.1_p1-r3.ebuild @@ -126,7 +126,7 @@ PATCHES=( "${FILESDIR}/${PN}-8.9_p1-allow-ppoll_time64.patch" #834019 "${FILESDIR}/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.1_p1-build-tests.patch" - "${DISTDIR}"/${PN}-9.1_p1-getentropy.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3487 + #"${DISTDIR}"/${PN}-9.1_p1-getentropy.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3487 # Conditionally applied below "${DISTDIR}"/${PN}-9.1_p1-sandbox-writev.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3512 ) @@ -168,6 +168,11 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + # openssh-9.1_p1: X509 patch includes a different fix for the getentropy bug + # will need removal in 9.2, because x509 will have to normalize onto + # upstream openssh fix. + use X509 || PATCHES+=( "${DISTDIR}/${PN}-9.1_p1-getentropy.patch" ) + eapply "${PATCHES[@]}" [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches