diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-23 00:54:01 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-23 00:54:01 +0000 |
| commit | defbebad0d311b0ce0694b17989a9f26cf000250 (patch) | |
| tree | f0f63116625e249bfa619945d1ec6460a4ccfe29 /net-misc/openssh/openssh-9.1_p1-r3.ebuild | |
| parent | b1f98aa670604171034e19240220430da70a7282 (diff) | |
gentoo auto-resync : 23:01:2023 - 00:54:01
Diffstat (limited to 'net-misc/openssh/openssh-9.1_p1-r3.ebuild')
| -rw-r--r-- | net-misc/openssh/openssh-9.1_p1-r3.ebuild | 7 |
1 files changed, 6 insertions, 1 deletions
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 |