net-misc/openssh: remove more X509 compat logic #603100#7

diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild
index 616265af0be74c4fd433ca8f7d8da4e9055328d0..110f1bfb470084bf43593136e466732c8c41ee4b 100644 (file)
--- 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)