git: a098111a28ed - main - secure: Add ssh-sk-client to all consumers of libssh

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Tue, 22 Apr 2025 02:07:50 UTC 
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=a098111a28ed59e1ab1101ad09913f0235ebd28f

commit a098111a28ed59e1ab1101ad09913f0235ebd28f
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-04-22 02:05:28 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-04-22 02:05:28 +0000

    secure: Add ssh-sk-client to all consumers of libssh
    
    These all failed to link with ld.bfd used by GCC due to
    Fssh_sshsk_sign being an unresolved symbol.
    
    Fixes:          65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere")
---
 secure/libexec/sftp-server/Makefile | 2 +-
 secure/usr.bin/scp/Makefile         | 2 +-
 secure/usr.bin/sftp/Makefile        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 0673e1e5613e..20f2d4639511 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -2,7 +2,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	sftp-server
-SRCS=	sftp-common.c sftp-server.c sftp-server-main.c
+SRCS=	sftp-common.c sftp-server.c sftp-server-main.c $(SKSRCS)
 MAN=	sftp-server.8
 
 LIBADD=	ssh
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 8d38d815d3fb..ba9c1472936f 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -2,7 +2,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	scp
-SRCS=	scp.c progressmeter.c $(SFTP_CLIENT_SRCS)
+SRCS=	scp.c progressmeter.c $(SFTP_CLIENT_SRCS) $(SKSRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index cc13a86794c5..3f6fbeef695c 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,7 +2,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	sftp
-SRCS=	sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS)
+SRCS=	sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS) $(SKSRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh edit