From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4287E139085 for ; Sat, 24 Dec 2016 08:05:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DED121C012; Sat, 24 Dec 2016 08:05:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39B3E21C012 for ; Sat, 24 Dec 2016 08:05:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20C9E3411D7 for ; Sat, 24 Dec 2016 08:05:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 731E79D8 for ; Sat, 24 Dec 2016 08:05:21 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1482566707.02381c768910f0ac57d397a8b199761cadac8616.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-7.4_p1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 02381c768910f0ac57d397a8b199761cadac8616 X-VCS-Branch: master Date: Sat, 24 Dec 2016 08:05:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 68bfd5f4-7e41-4b25-920d-684435e9f4ff X-Archives-Hash: b641938f2eafecdc0a0cf7a85f849f60 commit: 02381c768910f0ac57d397a8b199761cadac8616 Author: Mike Frysinger gentoo org> AuthorDate: Sat Dec 24 08:02:00 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Dec 24 08:05:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02381c76 net-misc/openssh: drop X509 glue #603610 Upstream X509 insists on stuffing their patchset full of unrelated crap and have no interest in fixing their misbehavior. Maintaining glue layers to work with other features (like sctp or hpn) is not worth our time. This is one step away from purging X509 entirely. net-misc/openssh/openssh-7.4_p1.ebuild | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild index db314b2..616265a 100644 --- a/net-misc/openssh/openssh-7.4_p1.ebuild +++ b/net-misc/openssh/openssh-7.4_p1.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE="ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) - X509? ( !ldap ssl ) + X509? ( !hpn !ldap !sctp ssl ) test? ( ssl )" LIB_DEPEND=" @@ -114,16 +114,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - if use hpn ; then - pushd ${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${P}-hpn-12-x509-9.2-glue.patch - popd >/dev/null - fi - epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} - epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch save_version X509 fi @@ -134,7 +127,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-7.4_p1-GSSAPI-dns.patch #165444 integrated into gsskex epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - epatch "${WORKDIR}"/${SCTP_PATCH%.*} + use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} epatch "${FILESDIR}"/${P}-test-bashism.patch use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch