summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-10-29 13:00:05 -0400
committerMike Frysinger <vapier@gentoo.org>2015-10-29 13:00:38 -0400
commitd90c920dbd83c1ec22f068623e15e4c421d11ba3 (patch)
tree6a9f26a43ad0bf74ebc8d137b2ba55b35ad586a1 /net-misc
parentdev-qt/qtgui: remove unused local USE description (diff)
downloadgentoo-d90c920dbd83c1ec22f068623e15e4c421d11ba3.tar.gz
gentoo-d90c920dbd83c1ec22f068623e15e4c421d11ba3.tar.bz2
gentoo-d90c920dbd83c1ec22f068623e15e4c421d11ba3.zip
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.
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/openssh-7.1_p1-r1.ebuild2
-rw-r--r--net-misc/openssh/openssh-7.1_p1-r2.ebuild4
-rw-r--r--net-misc/openssh/openssh-7.1_p1.ebuild2
3 files changed, 7 insertions, 1 deletions
diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
index 41f49c8d28f5..beebed51f857 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 7e645fd93784..048f3190e6ef 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 a9a499ee7e5f..45ed87d77f31 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%.*}