From 0818ee330bf4c3085e51bbbee537ebaee6d14858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 25 Feb 2020 15:54:30 +0100
Subject: [PATCH] openssh: move openssh-sk-helper into subpkg.

The libfido2 dependency is only needed for clients who want to use it.
---
 srcpkgs/openssh-sk-helper   |  1 +
 srcpkgs/openssh/INSTALL.msg |  1 +
 srcpkgs/openssh/template    | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/openssh-sk-helper

diff --git a/srcpkgs/openssh-sk-helper b/srcpkgs/openssh-sk-helper
new file mode 120000
index 00000000000..dc275a7a7e1
--- /dev/null
+++ b/srcpkgs/openssh-sk-helper
@@ -0,0 +1 @@
+openssh
\ No newline at end of file
diff --git a/srcpkgs/openssh/INSTALL.msg b/srcpkgs/openssh/INSTALL.msg
index be9370562a3..0143e089f1a 100644
--- a/srcpkgs/openssh/INSTALL.msg
+++ b/srcpkgs/openssh/INSTALL.msg
@@ -1,3 +1,4 @@
 CAUTION: After updating from OpenSSH <=8.1 to OpenSSH 8.2, the existing sshd
 will not allow new connections.  **Restart OpenSSH immediately** after this
 update to ensure you still can log in!
+Install 'openssh-sk-helper' to use FIDO authenticators on the client.
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 0c7cf0de2ff..579045b5730 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.2p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -19,7 +19,7 @@ makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
  $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
@@ -32,6 +32,10 @@ build_options="fido2 gssapi ldns ssl"
 build_options_default="fido2 ldns ssl"
 desc_option_fido2="Enable support for FIDO2 USB tokens"
 
+if [ "$build_option_fido2" ]; then
+	subpackages+=" openssh-sk-helper"
+fi
+
 CFLAGS="-Wno-format-truncation -Wno-stringop-truncation"
 
 case $XBPS_TARGET_MACHINE in
@@ -64,3 +68,12 @@ post_install() {
 	vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
 	vsv sshd
 }
+
+openssh-sk-helper_package() {
+	short_desc+=" - client support for FIDO authenticators"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/libexec/ssh-sk-helper
+		vmove usr/share/man/man8/ssh-sk-helper.8
+	}
+}