summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2019-01-15 17:33:46 -0800
committerPatrick McLean <chutzpah@gentoo.org>2019-01-15 17:33:46 -0800
commit3b56f7b9d9af55e9718199e1e1a4bc2ea3168000 (patch)
tree3d558ed1316e0e0b10b78d0bf6b033192297c70d /net-misc/openssh
parentgnome-base/gnome-light: bump to 3.26.2 (diff)
downloadgentoo-3b56f7b9d9af55e9718199e1e1a4bc2ea3168000.tar.gz
gentoo-3b56f7b9d9af55e9718199e1e1a4bc2ea3168000.tar.bz2
gentoo-3b56f7b9d9af55e9718199e1e1a4bc2ea3168000.zip
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>
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/openssh-7.9_p1-r2.ebuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/net-misc/openssh/openssh-7.9_p1-r2.ebuild b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
index 89010a6ace25..0b89a756c78c 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=()