git: 1d57423b4c0f - stable/15 - Only build secure/libexec/ssh-sk-helper if MK_USB == no

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Sun, 01 Nov 2026 05:06:39 UTC
The branch stable/15 has been updated by ngie:

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

commit 1d57423b4c0f76aadf746a2e3080a499feafc7e9
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-07-22 19:33:44 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-11-01 05:06:35 +0000

    Only build secure/libexec/ssh-sk-helper if MK_USB == no
    
    The ssh-sk-helper utility only functions if/when MK_USB == yes.
    Installing it on systems where MK_USB == no doesn't make sense.
    
    Differential Revision:  https://reviews.freebsd.org/D58246
    
    (cherry picked from commit 4db3872aabc33088cf180599c5eaa23b6f58e6d1)
---
 secure/libexec/Makefile                  | 4 +++-
 secure/libexec/ssh-sk-helper/Makefile    | 5 +----
 tools/build/mk/OptionalObsoleteFiles.inc | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 7f239ccc7fee..6f74d3699912 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -2,8 +2,10 @@
 
 SUBDIR=
 .if ${MK_OPENSSH} != "no"
-SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper ssh-sk-helper sshd-session
+SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper sshd-session
 SUBDIR+=sshd-auth
+
+SUBDIR.${MK_USB}+=	ssh-sk-helper
 .endif
 
 SUBDIR.${MK_TESTS}+= tests
diff --git a/secure/libexec/ssh-sk-helper/Makefile b/secure/libexec/ssh-sk-helper/Makefile
index 837599df80b0..4b708e898dd3 100644
--- a/secure/libexec/ssh-sk-helper/Makefile
+++ b/secure/libexec/ssh-sk-helper/Makefile
@@ -6,10 +6,7 @@ SRCS=	ssh-sk-helper.c ssh-sk.c sk-usbhid.c ssherr-nolibcrypto.c
 MAN=	ssh-sk-helper.8
 CFLAGS+=-I${SRCTOP}/contrib/libfido2/src
 
-LIBADD=	ssh crypto z
-.if ${MK_USB} != "no"
-LIBADD+= fido2 cbor
-.endif
+LIBADD=	ssh crypto z fido2 cbor
 
 .include <bsd.prog.mk>
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6245b6e9f444..c42c4c9272df 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -8882,6 +8882,7 @@ OLD_LIBS+=usr/lib/libusbhid.so.4
 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
+OLD_FILES+=usr/libexec/ssh-sk-helper
 OLD_FILES+=usr/sbin/uathload
 OLD_FILES+=usr/sbin/uhsoctl
 OLD_FILES+=usr/sbin/usbconfig
@@ -9156,6 +9157,7 @@ OLD_FILES+=usr/share/man/man4/uslcom.4.gz
 OLD_FILES+=usr/share/man/man4/uvisor.4.gz
 OLD_FILES+=usr/share/man/man4/uvscom.4.gz
 OLD_FILES+=usr/share/man/man4/zyd.4.gz
+OLD_FILES+=usr/share/man/man8/ssh-sk-helper.8.gz
 OLD_FILES+=usr/share/man/man8/uathload.8.gz
 OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
 OLD_FILES+=usr/share/man/man8/usbdump.8.gz