commit: 1b2bcb67e18ff9150bc5c7e758bc2d6d72e75ba9 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Sun Jan 22 17:49:01 2023 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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
