Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2003 16:26:23 +0100 (CET)
From:      Christian Kratzer <ck@cksoft.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Christian Kratzer <ck@cksoft.de>
Subject:   ports/48635: Add support for openldap21 port
Message-ID:  <20030224152623.AD1CA44ABA@majakka.cksoft.de>

next in thread | raw e-mail | index | archive | help

>Number:         48635
>Category:       ports
>Synopsis:       Add support for openldap21 port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 24 07:30:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Christian Kratzer
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
CK Software GmbH
>Environment:
System: FreeBSD majakka.cksoft.de 4.7-STABLE FreeBSD 4.7-STABLE #1: Thu Dec 19 14:57:42 CET 2002 ck@majakka.cksoft.de:/usr/obj/usr/src/RELENG_4/src/sys/MAJAKKA i386

>Description:

This patch adds support for the new openldap21 port to cyrus-sasl2.
Allow users to select if to build against openldap 2.0 or openldap 2.1.

>How-To-Repeat:
>Fix:

--- cyrus-sasl2/scripts/configure.sasl.orig	Mon Feb 24 16:07:19 2003
+++ cyrus-sasl2/scripts/configure.sasl	Mon Feb 24 16:12:56 2003
@@ -48,7 +48,8 @@
 NDBM		"ndbm DB" ${SET_NDBM} \
 DB3		"Berkeley DB, revision 3" ${SET_DB3} \
 MySQL		"MySQL password Authentication" ${SET_MYSQL} \
-OpenLDAP	"OpenLDAP 2.x password Authentication w/TLS" ${SET_LDAP} \
+OpenLDAP20	"OpenLDAP 2.0 password Authentication w/TLS" OFF \
+OpenLDAP21	"OpenLDAP 2.1 password Authentication w/TLS" ${SET_LDAP} \
 SASLAUTHD       "Use saslauthd for password Authentication" ON \
 2> $tempfile
 
@@ -106,11 +107,27 @@
 			echo "PLIST_SUB+=	MYSQL=\"\""
 			DEFMYSQL=1
 			;;
-		\"OpenLDAP\")
+		\"OpenLDAP20\")
+			if [ "$OPENLDAP21" ]; then
+				echo "OpenLDAP20 and OpenLDAP21 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
 			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
-			OPENLDAP=1
+			OPENLDAP20=1
+			;;
+		\"OpenLDAP21\")
+			if [ "$OPENLDAP20" ]; then
+				echo "OpenLDAP20 and OpenLDAP21 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21"
+			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap21"
+			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
+			OPENLDAP21=1
 			;;
 		\"SASLAUTHD\")
 			echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;saslauthd;g\""



>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030224152623.AD1CA44ABA>