diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-01-14 15:23:46 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-14 15:59:31 -0500 |
| commit | 7d47c8fd0679cdda919da4931076ac74a43338a5 (patch) | |
| tree | 0aa654e316749b34e3daad7004e1a3abb2683073 /net-misc/openssh | |
| parent | games-board/sirius: Fix format-security. Bug #539102 (diff) | |
| download | gentoo-7d47c8fd0679cdda919da4931076ac74a43338a5.tar.gz gentoo-7d47c8fd0679cdda919da4931076ac74a43338a5.tar.bz2 gentoo-7d47c8fd0679cdda919da4931076ac74a43338a5.zip | |
net-misc/openssh: fix patch failures when USE="-hpn X509"
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-7.1_p1-r2.ebuild | 8 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.1_p1-r3.ebuild | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild index 584f3848d12d..40ee3c8aa5ef 100644 --- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild @@ -116,9 +116,11 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - pushd ${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch - popd >/dev/null + if use hpn ; then + pushd ${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null + fi epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/openssh/openssh-7.1_p1-r3.ebuild b/net-misc/openssh/openssh-7.1_p1-r3.ebuild index 69c064d05189..07f0e7fcf6d6 100644 --- a/net-misc/openssh/openssh-7.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r3.ebuild @@ -115,9 +115,11 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - pushd ${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch - popd >/dev/null + if use hpn ; then + pushd ${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null + fi epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} |