Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/
Date: Wed, 16 Jan 2019 01:34:07
Message-Id: 1547602426.3b56f7b9d9af55e9718199e1e1a4bc2ea3168000.chutzpah@gentoo
1 commit: 3b56f7b9d9af55e9718199e1e1a4bc2ea3168000
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Wed Jan 16 01:33:46 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 16 01:33:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b56f7b9
7
8 net-misc/openssh: X509 patch already has CVE-2018-20685 fix in 7.9p1
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.55, Repoman-2.3.12
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 net-misc/openssh/openssh-7.9_p1-r2.ebuild | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/net-misc/openssh/openssh-7.9_p1-r2.ebuild b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
18 index 89010a6ace2..0b89a756c78 100644
19 --- a/net-misc/openssh/openssh-7.9_p1-r2.ebuild
20 +++ b/net-misc/openssh/openssh-7.9_p1-r2.ebuild
21 @@ -118,7 +118,7 @@ src_prepare() {
22 eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated into gsskex
23 eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
24 eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
25 - eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch
26 + use X509 || eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch
27
28 local PATCHSET_VERSION_MACROS=()