Date: Fri, 21 Oct 2022 17:26:21 GMT
From: Xin LI <delphij@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject: git: e1ea7c7eeda2 - 2022Q4 - net/openldap26-{server,client}: fix proper usage of FETCH/GSSAPI options
Message-ID: <202210211726.29LHQLen055488@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q4 has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1ea7c7eeda200ffdf04846fe2dd35104d900a63 commit e1ea7c7eeda200ffdf04846fe2dd35104d900a63 Author: Michael Osipov <michael.osipov@siemens.com> AuthorDate: 2022-10-14 16:54:06 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2022-10-21 17:25:57 +0000 net/openldap26-{server,client}: fix proper usage of FETCH/GSSAPI options * FETCH_DESC is not present with client * FETCH applies to *both* client and server since both slapd and client tools use ldif_parse_line2() via libldap which can use libfetch * GSSAPI is also required for the client as well since ldap*(1) commands can be used to connect and authenticate to directory servers like Active Directory and OpenLDAP with Kerberos via SASL GSSAPI mechanism PR: ports/267056 (cherry picked from commit de29d5bd2acda093fe3a5472df80c7cbd5a7b794) --- net/openldap26-server/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 471db2373595..c9f459b996e7 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -50,13 +50,18 @@ PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 0.200 -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= DEBUG FETCH GSSAPI OPTIONS_DEFAULT+= DEBUG -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+= DOCS FETCH +FETCH_DESC= Enable fetch(3) support +GSSAPI_DESC= With GSSAPI support FETCH_CONFIGURE_WITH= fetch + +GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi + +.if defined(CLIENT_ONLY) +OPTIONS_DEFINE+= DOCS .else OPTIONS_GROUP= BKNDS OVLYS BKNDS_DESC= OpenLDAP backends @@ -102,7 +107,6 @@ OPTIONS_GROUP_OVLYS+= TRANSLUCENT OPTIONS_GROUP_OVLYS+= UNIQUE OPTIONS_GROUP_OVLYS+= VALSORT -OPTIONS_DEFINE+= GSSAPI OPTIONS_DEFINE+= DYNACL ACI OPTIONS_DEFINE+= RLOOKUPS SLP SLAPI OPTIONS_DEFINE+= PBKDF2 @@ -119,8 +123,6 @@ OPTIONS_SUB= yes ACI_DESC= Per-object ACI (experimental) ARGON2_DESC= Argon2 password hashing module DYNACL_DESC= Run-time loadable ACL (experimental) -FETCH_DESC= Enable fetch(3) support -GSSAPI_DESC= With GSSAPI support LLOADD_DESC= Enable load balancer OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental) RLOOKUPS_DESC= With reverse lookups of client hostnames @@ -193,7 +195,6 @@ DNSSRV_CONFIGURE_ENABLE= dnssrv=mod DYNACL_CONFIGURE_ENABLE= dynacl DYNGROUP_CONFIGURE_ENABLE= dyngroup=mod DYNLIST_CONFIGURE_ENABLE= dynlist=mod -GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi HOMEDIR_CONFIGURE_ENABLE= homedir=mod LLOADD_CONFIGURE_ENABLE= balancer=mod LLOADD_LIB_DEPENDS= libevent.so:devel/libevent
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210211726.29LHQLen055488>