| 1 |
commit: 02381c768910f0ac57d397a8b199761cadac8616 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 24 08:02:00 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 24 08:05:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02381c76 |
| 7 |
|
| 8 |
net-misc/openssh: drop X509 glue #603610 |
| 9 |
|
| 10 |
Upstream X509 insists on stuffing their patchset full of unrelated crap |
| 11 |
and have no interest in fixing their misbehavior. Maintaining glue layers |
| 12 |
to work with other features (like sctp or hpn) is not worth our time. |
| 13 |
This is one step away from purging X509 entirely. |
| 14 |
|
| 15 |
net-misc/openssh/openssh-7.4_p1.ebuild | 11 ++--------- |
| 16 |
1 file changed, 2 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild |
| 19 |
index db314b2..616265a 100644 |
| 20 |
--- a/net-misc/openssh/openssh-7.4_p1.ebuild |
| 21 |
+++ b/net-misc/openssh/openssh-7.4_p1.ebuild |
| 22 |
@@ -32,7 +32,7 @@ REQUIRED_USE="ldns? ( ssl ) |
| 23 |
pie? ( !static ) |
| 24 |
ssh1? ( ssl ) |
| 25 |
static? ( !kerberos !pam ) |
| 26 |
- X509? ( !ldap ssl ) |
| 27 |
+ X509? ( !hpn !ldap !sctp ssl ) |
| 28 |
test? ( ssl )" |
| 29 |
|
| 30 |
LIB_DEPEND=" |
| 31 |
@@ -114,16 +114,9 @@ src_prepare() { |
| 32 |
|
| 33 |
if use X509 ; then |
| 34 |
pushd .. >/dev/null |
| 35 |
- if use hpn ; then |
| 36 |
- pushd ${HPN_PATCH%.*.*} >/dev/null |
| 37 |
- epatch "${FILESDIR}"/${P}-hpn-12-x509-9.2-glue.patch |
| 38 |
- popd >/dev/null |
| 39 |
- fi |
| 40 |
- epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch |
| 41 |
sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die |
| 42 |
popd >/dev/null |
| 43 |
epatch "${WORKDIR}"/${X509_PATCH%.*} |
| 44 |
- epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch |
| 45 |
save_version X509 |
| 46 |
fi |
| 47 |
|
| 48 |
@@ -134,7 +127,7 @@ src_prepare() { |
| 49 |
|
| 50 |
epatch "${FILESDIR}"/${PN}-7.4_p1-GSSAPI-dns.patch #165444 integrated into gsskex |
| 51 |
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch |
| 52 |
- epatch "${WORKDIR}"/${SCTP_PATCH%.*} |
| 53 |
+ use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} |
| 54 |
epatch "${FILESDIR}"/${P}-test-bashism.patch |
| 55 |
use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch |
Archives