From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 8 12:40:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AC3DFD for ; Thu, 8 May 2014 12:40:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 08140A8B for ; Thu, 8 May 2014 12:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s48Ce0Ln046545 for ; Thu, 8 May 2014 12:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s48Ce0w6046544; Thu, 8 May 2014 12:40:00 GMT (envelope-from gnats) Resent-Date: Thu, 8 May 2014 12:40:00 GMT Resent-Message-Id: <201405081240.s48Ce0w6046544@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ryan Steinmetz Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADB79CE4 for ; Thu, 8 May 2014 12:31:34 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BB83A37 for ; Thu, 8 May 2014 12:31:34 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s48CVYEf097434 for ; Thu, 8 May 2014 12:31:34 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s48CVYAD097421; Thu, 8 May 2014 12:31:34 GMT (envelope-from nobody) Message-Id: <201405081231.s48CVYAD097421@cgiserv.freebsd.org> Date: Thu, 8 May 2014 12:31:34 GMT From: Ryan Steinmetz To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189470: [patch] Fix net/openldap24-server's SASL/GSSAPI support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2014 12:40:01 -0000 >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: