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 D156B139085 for ; Mon, 26 Dec 2016 18:47:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4353CE0C1D; Mon, 26 Dec 2016 18:47:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1DEBFE0C1D for ; Mon, 26 Dec 2016 18:47:55 +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 C5C77340EE1 for ; Mon, 26 Dec 2016 18:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AC6124C3 for ; Mon, 26 Dec 2016 18:47:52 +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: <1482778064.c4f141d88c8d955ecbe86554ef21892b0aec762a.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: c4f141d88c8d955ecbe86554ef21892b0aec762a X-VCS-Branch: master Date: Mon, 26 Dec 2016 18:47:52 +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: c885c8bd-1617-46cf-8a90-764d1759f0aa X-Archives-Hash: bc53ceb68d8719a79f312e51874fb4b9 commit: c4f141d88c8d955ecbe86554ef21892b0aec762a Author: Mike Frysinger gentoo org> AuthorDate: Mon Dec 26 18:46:29 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Dec 26 18:47:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f141d8 net-misc/openssh: remove more X509 compat logic #603100#7 net-misc/openssh/openssh-7.4_p1.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild index 616265a..110f1bf 100644 --- a/net-misc/openssh/openssh-7.4_p1.ebuild +++ b/net-misc/openssh/openssh-7.4_p1.ebuild @@ -113,11 +113,9 @@ src_prepare() { sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die if use X509 ; then - pushd .. >/dev/null - sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die - popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} - save_version X509 + # We no longer allow X509 to be used with anything else. + #save_version X509 fi if use ldap ; then @@ -193,7 +191,7 @@ src_configure() { $(use_with libedit) $(use_with pam) $(use_with pie) - $(use_with sctp) + $(use X509 || use_with sctp) $(use_with selinux) $(use_with skey) $(use_with ssh1)