From: Patrick McLean <chutzpah@gentoo.org>
Date: Sun, 16 Feb 2020 05:54:28 +0000 (-0800)
Subject: net-misc/openssh-8.2_p1-r1: revbump, add "security-key" USE flag
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b8b66fe50c20b425cfcfdcf741c41e30152ab394;p=gentoo.git

net-misc/openssh-8.2_p1-r1: revbump, add "security-key" USE flag

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---

diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index 7613265c18a1..c5d93d8392a9 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -29,6 +29,7 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and
     <flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
     <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
     <flag name="livecd">Enable root password logins for live-cd environment.</flag>
+	<flag name="security-key">Include builtin U2F/FIDO support</flag>
     <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
     <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
     <flag name="X509">Adds support for X.509 certificate authentication</flag>
diff --git a/net-misc/openssh/openssh-8.2_p1.ebuild b/net-misc/openssh/openssh-8.2_p1-r1.ebuild
similarity index 98%
rename from net-misc/openssh/openssh-8.2_p1.ebuild
rename to net-misc/openssh/openssh-8.2_p1-r1.ebuild
index 5923c13816ef..2d64815e3fe9 100644
--- a/net-misc/openssh/openssh-8.2_p1.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r1.ebuild
@@ -33,7 +33,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
 
 RESTRICT="!test? ( test )"
 
@@ -54,6 +54,7 @@ LIB_DEPEND="
 	)
 	libedit? ( dev-libs/libedit:=[static-libs(+)] )
 	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( dev-libs/libfido2:=[static-libs(+)] )
 	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
 	ssl? (
 		!libressl? (
@@ -295,6 +296,7 @@ src_configure() {
 		$(use_with pam)
 		$(use_with pie)
 		$(use_with selinux)
+		$(use_with security-key security-key-builtin)
 		$(use_with ssl openssl)
 		$(use_with ssl md5-passwords)
 		$(use_with ssl ssl-engine)