wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-03 19:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openssh: move openssh-sk-helper into subpkg.

Browse source 
The libfido2 dependency is only needed for clients who want to use it.
This commit is contained in:
Leah Neukirchen 2020-02-25 15:54:30 +01:00 • committed by Juan RP
parent 6fc26e7aad
commit 0818ee330b
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/openssh-sk-helper Symbolic link
View file

@ -0,0 +1 @@
openssh

1
srcpkgs/openssh/INSTALL.msg
View file

@ -1,3 +1,4 @@
CAUTION: After updating from OpenSSH <=8.1 to OpenSSH 8.2, the existing sshd CAUTION: After updating from OpenSSH <=8.1 to OpenSSH 8.2, the existing sshd
will not allow new connections. **Restart OpenSSH immediately** after this will not allow new connections. **Restart OpenSSH immediately** after this
update to ensure you still can log in! update to ensure you still can log in!
Install 'openssh-sk-helper' to use FIDO authenticators on the client.

17
srcpkgs/openssh/template
View file

@ -1,7 +1,7 @@
# Template file for 'openssh' # Template file for 'openssh'
pkgname=openssh pkgname=openssh
version=8.2p1 version=8.2p1
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --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 gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
$(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')" $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
short_desc="OpenSSH free Secure Shell (SSH) client and server implementation" 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" license="BSD-2-Clause, ISC"
homepage="https://www.openssh.com" homepage="https://www.openssh.com"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz" 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" build_options_default="fido2 ldns ssl"
desc_option_fido2="Enable support for FIDO2 USB tokens" 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" CFLAGS="-Wno-format-truncation -Wno-stringop-truncation"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
@ -64,3 +68,12 @@ post_install() {
vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
vsv 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
}
}