diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2025-12-18 07:44:13 -0800 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2025-12-18 16:18:16 -0800 |
| commit | 1ba82bcd4c306a061092ee86a7a1cebb6fc77555 (patch) | |
| tree | ec3176607f865e0d883545cb02df629162142443 | |
| parent | textproc/moor: Update 2.9.5 => 2.9.6 (diff) | |
security/krb5*: Add CRYPTO radio button
Base MIT KRB5 is linked against OpenSSL to supply its crypto. This
was done to avoid symbol conflicts within ssh (i.e. a buildworld
failure). This now causes the port and base inconsistencies.
Add a crypto option to allow the user to select either builtin or
openssl crypto.
PR: 291695
| -rw-r--r-- | security/krb5-121/Makefile | 9 | ||||
| -rw-r--r-- | security/krb5-122/Makefile | 9 | ||||
| -rw-r--r-- | security/krb5-devel/Makefile | 9 |
3 files changed, 21 insertions, 6 deletions
diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile index 237691cdbc61..e5b2c56906d2 100644 --- a/security/krb5-121/Makefile +++ b/security/krb5-121/Makefile @@ -43,9 +43,10 @@ CPE_PRODUCT= kerberos FLAVORS= default ldap OPTIONS_DEFINE= EXAMPLES NLS DOCS DNS_FOR_REALM LDAP LMDB -OPTIONS_DEFAULT= DOCS READLINE -OPTIONS_RADIO= CMD_LINE_EDITING +OPTIONS_DEFAULT= DOCS READLINE BUILTIN +OPTIONS_RADIO= CMD_LINE_EDITING CRYPTO OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT LIBEDIT_BASE +OPTIONS_RADIO_CRYPTO= BUILTIN OPENSSL CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm @@ -64,6 +65,10 @@ LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +BUILTIN_DESC= Use crypto built into KRB5 +BUILTIN_CONFIGURE_ON= --with-crypto-impl=builtin +OPENSSL_DESC= Use OpenSSL crypto +OPENSSL_CONFIGURE_ON= --with-crypto-impl=openssl .if ${FLAVOR:U} == ldap OPTIONS_DEFAULT+= LDAP LMDB diff --git a/security/krb5-122/Makefile b/security/krb5-122/Makefile index de7531fc483a..2ae37b61fd34 100644 --- a/security/krb5-122/Makefile +++ b/security/krb5-122/Makefile @@ -42,9 +42,10 @@ CPE_PRODUCT= kerberos FLAVORS= default ldap OPTIONS_DEFINE= EXAMPLES NLS DOCS DNS_FOR_REALM LDAP LMDB -OPTIONS_DEFAULT= DOCS READLINE -OPTIONS_RADIO= CMD_LINE_EDITING +OPTIONS_DEFAULT= DOCS READLINE BUILTIN +OPTIONS_RADIO= CMD_LINE_EDITING CRYPTO OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT LIBEDIT_BASE +OPTIONS_RADIO_CRYPTO= BUILTIN OPENSSL CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm @@ -63,6 +64,10 @@ LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +BUILTIN_DESC= Use crypto built into KRB5 +BUILTIN_CONFIGURE_ON= --with-crypto-impl=builtin +OPENSSL_DESC= Use OpenSSL crypto +OPENSSL_CONFIGURE_ON= --with-crypto-impl=openssl .if ${FLAVOR:U} == ldap OPTIONS_DEFAULT+= LDAP LMDB diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 9da27a0c8b3e..b7f77986aee8 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -45,9 +45,10 @@ CPE_PRODUCT= kerberos FLAVORS= default ldap OPTIONS_DEFINE= EXAMPLES NLS DNS_FOR_REALM LDAP LMDB -OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE -OPTIONS_RADIO= CMD_LINE_EDITING +OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE BUILTIN +OPTIONS_RADIO= CMD_LINE_EDITING CRYPTO OPTIONS_RADIO_CMD_LINE_EDITING= READLINE LIBEDIT LIBEDIT_BASE +OPTIONS_RADIO_CRYPTO= BUILTIN OPENSSL CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm @@ -66,6 +67,10 @@ LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +BUILTIN_DESC= Use crypto built into KRB5 +BUILTIN_CONFIGURE_ON= --with-crypto-impl=builtin +OPENSSL_DESC= Use OpenSSL crypto +OPENSSL_CONFIGURE_ON= --with-crypto-impl=openssl .if ${FLAVOR:U} == ldap OPTIONS_DEFAULT+= LDAP LMDB |