Mon Nov 6 10:21:09 2023 UTC ()
openssh: Use OPSYSVARS.


(jperkin)
diff -r1.42 -r1.43 pkgsrc/security/openssh/options.mk
cvs diff -r1.42 -r1.43 pkgsrc/security/openssh/options.mk (switch to unified diff)

--- pkgsrc/security/openssh/options.mk 2023/11/06 10:11:34 1.42
+++ pkgsrc/security/openssh/options.mk 2023/11/06 10:21:09 1.43
@@ -1,63 +1,57 @@ @@ -1,63 +1,57 @@
1# $NetBSD: options.mk,v 1.42 2023/11/06 10:11:34 wiz Exp $ 1# $NetBSD: options.mk,v 1.43 2023/11/06 10:21:09 jperkin 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" 7PKG_SUGGESTED_OPTIONS.Darwin+= fido
8 8PKG_SUGGESTED_OPTIONS.NetBSD+= fido pam
9.if ${OPSYS} == "NetBSD" 
10PKG_SUGGESTED_OPTIONS+= fido pam 
11.endif 
12.if ${OPSYS} == "Darwin" 
13PKG_SUGGESTED_OPTIONS+= fido 
14.endif 
15 9
16.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
17 11
18.if !empty(PKG_OPTIONS:Mopenssl) 12.if !empty(PKG_OPTIONS:Mopenssl)
19.include "../../security/openssl/buildlink3.mk" 13.include "../../security/openssl/buildlink3.mk"
20CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} 14CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q}
21.else 15.else
22CONFIGURE_ARGS+= --without-openssl 16CONFIGURE_ARGS+= --without-openssl
23.endif 17.endif
24 18
25.if !empty(PKG_OPTIONS:Mkerberos) 19.if !empty(PKG_OPTIONS:Mkerberos)
26. include "../../mk/krb5.buildlink3.mk" 20. include "../../mk/krb5.buildlink3.mk"
27CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} 21CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE}
28. if ${KRB5_TYPE} == "mit-krb5" 22. if ${KRB5_TYPE} == "mit-krb5"
29CONFIGURE_ENV+= ac_cv_search_k_hasafs=no 23CONFIGURE_ENV+= ac_cv_search_k_hasafs=no
30. endif 24. endif
31.endif 25.endif
32 26
33.if !empty(PKG_OPTIONS:Mlegacymodsz) 27.if !empty(PKG_OPTIONS:Mlegacymodsz)
34CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768" 28CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768"
35.endif 29.endif
36 30
37#.if !empty(PKG_OPTIONS:Mhpn-patch) 31#.if !empty(PKG_OPTIONS:Mhpn-patch)
38#PATCHFILES= openssh-7.1p1-hpn-20150822.diff.bz2 32#PATCHFILES= openssh-7.1p1-hpn-20150822.diff.bz2
39#PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/openssh/ 33#PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/openssh/
40#PATCH_DIST_STRIP= -p1 34#PATCH_DIST_STRIP= -p1
41#.endif 35#.endif
42 36
43PLIST_VARS+= pam 37PLIST_VARS+= pam
44 38
45.if !empty(PKG_OPTIONS:Mpam) 39.if !empty(PKG_OPTIONS:Mpam)
46.include "../../mk/pam.buildlink3.mk" 40.include "../../mk/pam.buildlink3.mk"
47CONFIGURE_ARGS+= --with-pam 41CONFIGURE_ARGS+= --with-pam
48MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam 42MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam
49MESSAGE_SUBST+= EGDIR=${EGDIR} 43MESSAGE_SUBST+= EGDIR=${EGDIR}
50. if ${OPSYS} == "Linux" 44. if ${OPSYS} == "Linux"
51PLIST.pam= yes 45PLIST.pam= yes
52. endif 46. endif
53.endif 47.endif
54 48
55.if !empty(PKG_OPTIONS:Meditline) 49.if !empty(PKG_OPTIONS:Meditline)
56.include "../../devel/editline/buildlink3.mk" 50.include "../../devel/editline/buildlink3.mk"
57CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editline} 51CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editline}
58.endif 52.endif
59 53
60.if !empty(PKG_OPTIONS:Mfido) 54.if !empty(PKG_OPTIONS:Mfido)
61.include "../../security/libfido2/buildlink3.mk" 55.include "../../security/libfido2/buildlink3.mk"
62CONFIGURE_ARGS+= --with-security-key-builtin 56CONFIGURE_ARGS+= --with-security-key-builtin
63.endif 57.endif