From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 16 09:40:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3D341065704 for ; Tue, 16 Jun 2009 09:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 35C998FC1F for ; Tue, 16 Jun 2009 09:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5G9e26x063091 for ; Tue, 16 Jun 2009 09:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5G9e2Fl063090; Tue, 16 Jun 2009 09:40:02 GMT (envelope-from gnats) Resent-Date: Tue, 16 Jun 2009 09:40:02 GMT Resent-Message-Id: <200906160940.n5G9e2Fl063090@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, Christian Ullrich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18B3D106564A for ; Tue, 16 Jun 2009 09:31:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id DFE798FC1C for ; Tue, 16 Jun 2009 09:31:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5G9Vig1061260 for ; Tue, 16 Jun 2009 09:31:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n5G9Vij9061259; Tue, 16 Jun 2009 09:31:44 GMT (envelope-from nobody) Message-Id: <200906160931.n5G9Vij9061259@www.freebsd.org> Date: Tue, 16 Jun 2009 09:31:44 GMT From: Christian Ullrich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/135622: net/openldap2[34]-client: PKGNAME does not accurately reflect WITH_SASL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 09:40:02 -0000 >Number: 135622 >Category: ports >Synopsis: net/openldap2[34]-client: PKGNAME does not accurately reflect WITH_SASL >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jun 16 09:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Christian Ullrich >Release: 7.2 >Organization: >Environment: >Description: There is a pair of slave ports for both version 2.3 and 2.4 of OpenLDAP, net/openldap*-{sasl-,}client, which build the client part of OpenLDAP either with or without SASL support, by defining either WITH_SASL or WITHOUT_SASL. The master, net/openldap*-server, determines the PKGNAME for the client builds based on whether WITH_SASL is defined. On the other hand, whether to actually build in SASL is decided as (WITH_SASL && !WITHOUT_SASL). This logic must also be used for the PKGNAME: Until now, building net/openldap*-client WITH_SASL=yes will result in an openldap24-sasl-client package compiled without SASL support. >How-To-Repeat: make -C /usr/ports/net/openldap24-client BATCH=yes WITH_SASL=yes install ldd /usr/local/bin/ldapsearch | grep sasl >Fix: While it may be a better solution to verify in the slave ports that only one of the knobs is in use, this patch at least fixes the PKGNAMEs. --- net/openldap24-server/Makefile.orig 2009-06-16 11:19:10.000000000 +0200 +++ net/openldap24-server/Makefile 2009-06-16 11:19:22.000000000 +0200 @@ -95,7 +95,7 @@ .include .if defined(CLIENT_ONLY) -.if defined(WITH_SASL) +.if defined(WITH_SASL) && !defined(WITHOUT_SASL) PKGNAMESUFFIX= -sasl-client COMMENT= Open source LDAP client implementation with SASL2 support CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ --- net/openldap23-server/Makefile.orig 2009-06-16 11:28:16.000000000 +0200 +++ net/openldap23-server/Makefile 2009-06-16 11:28:24.000000000 +0200 @@ -83,7 +83,7 @@ .include .if defined(CLIENT_ONLY) -.if defined(WITH_SASL) +.if defined(WITH_SASL) && !defined(WITHOUT_SASL) PKGNAMESUFFIX= -sasl-client COMMENT= Open source LDAP client implementation with SASL2 support CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ >Release-Note: >Audit-Trail: >Unformatted: