Module Name: src
Committed By: christos
Date: Tue Mar 3 00:43:21 UTC 2020
Modified Files:
src/crypto/external/bsd/openssh: Makefile
src/crypto/external/bsd/openssh/libexec/ssh-sk-helper: Makefile
Log Message:
Enable ssh-sk-helper
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/Makefile
diff -u src/crypto/external/bsd/openssh/Makefile:1.2 src/crypto/external/bsd/openssh/Makefile:1.3
--- src/crypto/external/bsd/openssh/Makefile:1.2 Wed Feb 26 19:24:38 2020
+++ src/crypto/external/bsd/openssh/Makefile Mon Mar 2 19:43:20 2020
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2020/02/27 00:24:38 christos Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/03 00:43:20 christos Exp $
-SUBDIR= lib .WAIT bin # libexec
+SUBDIR= lib .WAIT bin libexec
.include <bsd.subdir.mk>
Index: src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
diff -u src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.1 src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.2
--- src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.1 Wed Feb 26 19:24:41 2020
+++ src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile Mon Mar 2 19:43:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/02/27 00:24:41 christos Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/03 00:43:20 christos Exp $
BINDIR= /usr/libexec
@@ -6,7 +6,7 @@ PROG= ssh-sk-helper
SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c
MAN= ssh-sk-helper.8
-LDADD+=-lfido2 -lusbhid
-DPADD+=${LIBFIDO2} ${LIBUSBHID}
+LDADD+=-lfido2 -lcbor -lusbhid
+DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
.include <bsd.prog.mk>
