[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/

[Mike Frysinger]

commit:     d90c920dbd83c1ec22f068623e15e4c421d11ba3
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 17:00:05 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 17:00:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90c920d

net-misc/openssh: make hpn-x509 glue patch application more robust #564380

Rather than encode the full name of the hpn patchset in the glue patch,
apply it from the hpn patchset dir.

 net-misc/openssh/openssh-7.1_p1-r1.ebuild | 2 ++
 net-misc/openssh/openssh-7.1_p1-r2.ebuild | 4 +++-
 net-misc/openssh/openssh-7.1_p1.ebuild    | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild 
b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
index 41f49c8..beebed5 100644
--- a/net-misc/openssh/openssh-7.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
@@ -116,7 +116,9 @@ 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
                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-r2.ebuild 
b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
index 7e645fd..048f319 100644
--- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils user flag-o-matic multilib autotools pam systemd 
versionator
 # and _p? releases.
 PARCH=${P/_}
 
-HPN_PATCH="${PN}-7.1p1-hpnssh14v9.tar.xz"
+HPN_PATCH="${PARCH}-hpnssh14v9.tar.xz"
 LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz"
 X509_VER="8.6" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz"
 
@@ -116,7 +116,9 @@ 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
                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.ebuild 
b/net-misc/openssh/openssh-7.1_p1.ebuild
index a9a499e..45ed87d 100644
--- a/net-misc/openssh/openssh-7.1_p1.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1.ebuild
@@ -113,7 +113,9 @@ 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
                epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
                popd >/dev/null
                epatch "${WORKDIR}"/${X509_PATCH%.*}