Fri Dec 1 11:01:05 2023 UTC (178d)
openssh: Query PLATFORM_SUPPORTS_FIDO2 for fido option default


(nia)
diff -r1.47 -r1.48 pkgsrc/security/openssh/options.mk
cvs diff -r1.47 -r1.48 pkgsrc/security/openssh/options.mk (expand / switch to unified diff)

--- pkgsrc/security/openssh/options.mk 2023/11/08 10:48:45 1.47
+++ pkgsrc/security/openssh/options.mk 2023/12/01 11:01:05 1.48
@@ -1,28 +1,24 @@ @@ -1,28 +1,24 @@
1# $NetBSD: options.mk,v 1.47 2023/11/08 10:48:45 nia Exp $ 1# $NetBSD: options.mk,v 1.48 2023/12/01 11:01:05 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openssh 3PKG_OPTIONS_VAR= PKG_OPTIONS.openssh
4PKG_SUPPORTED_OPTIONS= editline fido kerberos openssl pam legacymodsz 4PKG_SUPPORTED_OPTIONS= editline fido kerberos openssl pam legacymodsz
5PKG_SUGGESTED_OPTIONS= editline openssl 5PKG_SUGGESTED_OPTIONS= editline openssl
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# libfido2 is BROKEN_EXCEPT_ON_PLATFORM; lacking a facility to query 9.include "../../security/libfido2/platform.mk"
10# that list, open code it here. 10
11.if (${OPSYS} == "Darwin" && empty(MACHINE_ARCH:Mpowerpc*)) || \ 11.if ${PLATFORM_SUPPORTS_FIDO2:tl} != "no"
12 ${OPSYS} == "FreeBSD" || ${OPSYS} == "MidnightBSD" || \ 
13 ${OPSYS} == "Linux" || \ 
14 ${OPSYS} == "NetBSD" || \ 
15 ${OPSYS} == "OpenBSD" 
16PKG_SUGGESTED_OPTIONS+= fido 12PKG_SUGGESTED_OPTIONS+= fido
17.endif 13.endif
18 14
19.if ${OPSYS} == "NetBSD" 15.if ${OPSYS} == "NetBSD"
20PKG_SUGGESTED_OPTIONS+= pam 16PKG_SUGGESTED_OPTIONS+= pam
21.endif 17.endif
22 18
23.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
24 20
25.if !empty(PKG_OPTIONS:Mopenssl) 21.if !empty(PKG_OPTIONS:Mopenssl)
26.include "../../security/openssl/buildlink3.mk" 22.include "../../security/openssl/buildlink3.mk"
27CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} 23CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q}
28.else 24.else