commit: 3b56f7b9d9af55e9718199e1e1a4bc2ea3168000
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Jan 16 01:33:46 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 01:33:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b56f7b9
net-misc/openssh: X509 patch already has CVE-2018-20685 fix in 7.9p1
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/openssh/openssh-7.9_p1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/openssh/openssh-7.9_p1-r2.ebuild
b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
index 89010a6ace2..0b89a756c78 100644
--- a/net-misc/openssh/openssh-7.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
@@ -118,7 +118,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated
into gsskex
eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
- eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch
+ use X509 || eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch
local PATCHSET_VERSION_MACROS=()
