Page MenuHomeFreeBSD
Files F163345405

D58246.id182015.diff
No OneTemporary
Actions

D58246.id182015.diff
View Options

diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
--- 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
--- a/secure/libexec/ssh-sk-helper/Makefile
+++ b/secure/libexec/ssh-sk-helper/Makefile
@@ -6,10 +6,7 @@
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
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -8858,6 +8858,7 @@
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
@@ -9132,6 +9133,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 8:39 AM (1 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35389618
Default Alt Text
D58246.id182015.diff (1 KB)

Event Timeline