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@gentoo.org>

diff --git a/net-misc/openssh/openssh-7.9_p1-r2.ebuild b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
index 89010a6ace2511b9ff46e0ca2bf11603ac2edef1..0b89a756c78cee288b95e278e7b8dfe4386d9107 100644 (file)
--- 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=()