| 1 |
commit: d90c920dbd83c1ec22f068623e15e4c421d11ba3 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 29 17:00:05 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 17:00:38 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90c920d |
| 7 |
|
| 8 |
net-misc/openssh: make hpn-x509 glue patch application more robust #564380 |
| 9 |
|
| 10 |
Rather than encode the full name of the hpn patchset in the glue patch, |
| 11 |
apply it from the hpn patchset dir. |
| 12 |
|
| 13 |
net-misc/openssh/openssh-7.1_p1-r1.ebuild | 2 ++ |
| 14 |
net-misc/openssh/openssh-7.1_p1-r2.ebuild | 4 +++- |
| 15 |
net-misc/openssh/openssh-7.1_p1.ebuild | 2 ++ |
| 16 |
3 files changed, 7 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild |
| 19 |
index 41f49c8..beebed5 100644 |
| 20 |
--- a/net-misc/openssh/openssh-7.1_p1-r1.ebuild |
| 21 |
+++ b/net-misc/openssh/openssh-7.1_p1-r1.ebuild |
| 22 |
@@ -116,7 +116,9 @@ src_prepare() { |
| 23 |
|
| 24 |
if use X509 ; then |
| 25 |
pushd .. >/dev/null |
| 26 |
+ pushd ${HPN_PATCH%.*.*} >/dev/null |
| 27 |
epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch |
| 28 |
+ popd >/dev/null |
| 29 |
epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch |
| 30 |
popd >/dev/null |
| 31 |
epatch "${WORKDIR}"/${X509_PATCH%.*} |
| 32 |
|
| 33 |
diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild |
| 34 |
index 7e645fd..048f319 100644 |
| 35 |
--- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild |
| 36 |
+++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild |
| 37 |
@@ -9,7 +9,7 @@ inherit eutils user flag-o-matic multilib autotools pam systemd versionator |
| 38 |
# and _p? releases. |
| 39 |
PARCH=${P/_} |
| 40 |
|
| 41 |
-HPN_PATCH="${PN}-7.1p1-hpnssh14v9.tar.xz" |
| 42 |
+HPN_PATCH="${PARCH}-hpnssh14v9.tar.xz" |
| 43 |
LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz" |
| 44 |
X509_VER="8.6" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz" |
| 45 |
|
| 46 |
@@ -116,7 +116,9 @@ src_prepare() { |
| 47 |
|
| 48 |
if use X509 ; then |
| 49 |
pushd .. >/dev/null |
| 50 |
+ pushd ${HPN_PATCH%.*.*} >/dev/null |
| 51 |
epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch |
| 52 |
+ popd >/dev/null |
| 53 |
epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch |
| 54 |
popd >/dev/null |
| 55 |
epatch "${WORKDIR}"/${X509_PATCH%.*} |
| 56 |
|
| 57 |
diff --git a/net-misc/openssh/openssh-7.1_p1.ebuild b/net-misc/openssh/openssh-7.1_p1.ebuild |
| 58 |
index a9a499e..45ed87d 100644 |
| 59 |
--- a/net-misc/openssh/openssh-7.1_p1.ebuild |
| 60 |
+++ b/net-misc/openssh/openssh-7.1_p1.ebuild |
| 61 |
@@ -113,7 +113,9 @@ src_prepare() { |
| 62 |
|
| 63 |
if use X509 ; then |
| 64 |
pushd .. >/dev/null |
| 65 |
+ pushd ${HPN_PATCH%.*.*} >/dev/null |
| 66 |
epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch |
| 67 |
+ popd >/dev/null |
| 68 |
epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch |
| 69 |
popd >/dev/null |
| 70 |
epatch "${WORKDIR}"/${X509_PATCH%.*} |
Archives