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.

diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
index 41f49c8d28f5616a658e182f323e939ead3e5466..beebed51f8578b3c752b26d1f464ee5911c73635 100644 (file)
--- 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 7e645fd93784c42e808e6927ebcc9637a8b23f06..048f3190e6ef4b02f361b190f437c1160d57d935 100644 (file)
--- 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 a9a499ee7e5fd9e22b035364882feb022f06670b..45ed87d77f3133d78edac4ea65cdfd4bcb344364 100644 (file)
--- 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%.*}