| 1 |
commit: c4f141d88c8d955ecbe86554ef21892b0aec762a |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 26 18:46:29 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 26 18:47:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f141d8 |
| 7 |
|
| 8 |
net-misc/openssh: remove more X509 compat logic #603100#7 |
| 9 |
|
| 10 |
net-misc/openssh/openssh-7.4_p1.ebuild | 8 +++----- |
| 11 |
1 file changed, 3 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild |
| 14 |
index 616265a..110f1bf 100644 |
| 15 |
--- a/net-misc/openssh/openssh-7.4_p1.ebuild |
| 16 |
+++ b/net-misc/openssh/openssh-7.4_p1.ebuild |
| 17 |
@@ -113,11 +113,9 @@ src_prepare() { |
| 18 |
sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die |
| 19 |
|
| 20 |
if use X509 ; then |
| 21 |
- pushd .. >/dev/null |
| 22 |
- sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die |
| 23 |
- popd >/dev/null |
| 24 |
epatch "${WORKDIR}"/${X509_PATCH%.*} |
| 25 |
- save_version X509 |
| 26 |
+ # We no longer allow X509 to be used with anything else. |
| 27 |
+ #save_version X509 |
| 28 |
fi |
| 29 |
|
| 30 |
if use ldap ; then |
| 31 |
@@ -193,7 +191,7 @@ src_configure() { |
| 32 |
$(use_with libedit) |
| 33 |
$(use_with pam) |
| 34 |
$(use_with pie) |
| 35 |
- $(use_with sctp) |
| 36 |
+ $(use X509 || use_with sctp) |
| 37 |
$(use_with selinux) |
| 38 |
$(use_with skey) |
| 39 |
$(use_with ssh1) |
Archives