Date: Thu, 8 May 2014 12:31:34 GMT From: Ryan Steinmetz <zi@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189470: [patch] Fix net/openldap24-server's SASL/GSSAPI support Message-ID: <201405081231.s48CVYAD097421@cgiserv.freebsd.org> Resent-Message-ID: <201405081240.s48Ce0w6046544@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189470
>Category: ports
>Synopsis: [patch] Fix net/openldap24-server's SASL/GSSAPI support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 08 12:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Ryan Steinmetz
>Release: 9.2-RELEASE
>Organization:
>Environment:
>Description:
Since security/cyrus-sasl2 had its GSSAPI plugin moved into security/cyrus-sasl2-gssapi, you can install OpenLDAP (with SASL support) and not end up with GSSAPI support.
Prior to the cyrus-sasl2 change, this worked as expected.
The attached patch will add GSSAPI as a valid OPTION and bring in the cyrus-sasl2-gssapi plugin as a result.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 353287)
+++ Makefile (working copy)
@@ -64,9 +64,10 @@
OPENLDAP_SHLIB_MAJOR= 8
OPENLDAP_MAJOR= ${DISTVERSION:R}
-OPTIONS_DEFINE= FETCH
+OPTIONS_DEFINE= FETCH GSSAPI
-FETCH_DESC= Enable fetch(3) support
+FETCH_DESC= Enable fetch(3) support
+GSSAPI_DESC= With GSSAPI support (implies SASL support)
.if !defined(CLIENT_ONLY)
OPTIONS_DEFINE+= DYNACL ACI BDB MDB DNSSRV PASSWD PERL RELAY SHELL
@@ -144,10 +145,17 @@
USE_OPENLDAP= yes
WANT_OPENLDAP_VER= 24
+.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL)
+PORT_OPTIONS+= SASL
+.endif
+
.if ${PORT_OPTIONS:MSASL}
WANT_OPENLDAP_SASL= yes
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.*
PKGNAMESUFFIX= -sasl-server
+.if ${PORT_OPTIONS:MGSSAPI}
+RUN_DEPENDS+= cyrus-sasl-gssapi>0:${PORTSDIR}/security/cyrus-sasl2-gssapi
+.endif
.else
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405081231.s48CVYAD097421>