Bug 189470

Summary:

[patch] Fix net/openldap24-server's SASL/GSSAPI support

Product:

Ports & Packages

Reporter:

Ryan Steinmetz <zi>

Component:

Individual Port(s)

Assignee:

Xin LI <delphij>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
file.diff	none

Description Ryan Steinmetz freebsd_committer

2014-05-08 13:40:00 UTC

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.

Fix: Patch attached with submission follows:

Comment 1 Edwin Groothuis freebsd_committer

2014-05-08 13:40:06 UTC

Responsible Changed
From-To: freebsd-ports-bugs->delphij

Over to maintainer (via the GNATS Auto Assign Tool)

Comment 2 dfilter service freebsd_committer

2014-05-29 19:52:16 UTC

Author: delphij
Date: Thu May 29 18:52:12 2014
New Revision: 355724
URL: http://svnweb.freebsd.org/changeset/ports/355724
QAT: https://qat.redports.org/buildarchive/r355724/

Log:
   - Add support to GSSAPI (implies SASL).
  
  PR:		ports/189470
  Submitted by:	zi

Modified:
  head/net/openldap24-server/Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Thu May 29 18:41:42 2014	(r355723)
+++ head/net/openldap24-server/Makefile	Thu May 29 18:52:12 2014	(r355724)
@@ -64,9 +64,10 @@ PORTREVISION_SERVER=	1
 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 @@ BROKEN=			You have 'USE_OPENLDAP' variab
 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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 Xin LI freebsd_committer

2014-05-29 19:52:22 UTC

State Changed
From-To: open->closed

Committed, thanks!