Date: Tue, 15 Apr 2003 03:23:16 +0200 From: Oliver Eikemeier <eikemeier@fillmore-labs.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ume@FreeBSD.org Subject: ports/50962: [PATCH] update of port security/cyrus-sasl2 to 2.1.13 Message-ID: <E195FAK-00040K-2c@mx1.fillmore-labs.com> Resent-Message-ID: <200304150130.h3F1U8D5088457@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 50962 >Category: ports >Synopsis: [PATCH] update of port security/cyrus-sasl2 to 2.1.13 >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 Apr 14 18:30:08 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Oliver Eikemeier >Release: FreeBSD 4.8-STABLE i386 >Organization: Fillmore Labs - http://www.fillmore-labs.com >Environment: System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 14:21:01 CEST 2003 root@nuuk.fillmore-labs.com:/usr/obj/usr/src/sys/FILLMORE-LABS i386 >Description: - update of port security/cyrus-sasl2 to 2.1.13 - fixes for FreeBSD 5 (changed behaviour of 'expr') - ntlm module - support for db4 and db4.1 - support for OpenLDAP 2.1 >How-To-Repeat: >Fix: --- cyrus-sasl2.patch begins here --- diff -Nur cyrus-sasl2/Makefile.orig cyrus-sasl2/Makefile --- cyrus-sasl2/Makefile.orig Mon Mar 24 10:20:28 2003 +++ cyrus-sasl2/Makefile Tue Apr 15 02:47:56 2003 @@ -6,7 +6,7 @@ # PORTNAME= cyrus-sasl -PORTVERSION= 2.1.12 +PORTVERSION= 2.1.13 #PORTREVISION= 0 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -49,6 +49,7 @@ --mandir=${MANPREFIX}/man \ --enable-static \ --enable-login \ + --enable-ntlm \ --with-saslauthd \ --enable-auth-sasldb \ --with-rc4=openssl @@ -104,10 +105,10 @@ DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README DOC2= ONEWS TODO draft-burdis-cat-srp-sasl-06.txt \ - draft-ietf-cat-sasl-gssapi-05.txt draft-melnikov-rfc2831bis-02.txt \ + draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-00.txt \ + draft-ietf-sasl-plain-00.txt draft-ietf-sasl-rfc2831bis-00.txt \ draft-myers-saslrev-02.txt draft-nerenberg-sasl-crammd5-03.txt \ - draft-newman-sasl-c-api-00.txt draft-sasl-login.txt \ - draft-zeilenga-sasl-anon-01.txt draft-zeilenga-sasl-plain-01.txt \ + draft-newman-sasl-c-api-01.txt draft-sasl-login.txt \ rfc1321.txt rfc1939.txt rfc2104.txt rfc2195.txt rfc2222.txt \ rfc2243.txt rfc2245.txt rfc2289.txt rfc2444.txt rfc2595.txt \ rfc2831.txt rfc2945.txt rfc3174.txt server-plugin-flow.fig \ diff -Nur cyrus-sasl2/distinfo.orig cyrus-sasl2/distinfo --- cyrus-sasl2/distinfo.orig Tue Feb 11 06:09:55 2003 +++ cyrus-sasl2/distinfo Tue Apr 15 02:15:17 2003 @@ -1 +1 @@ -MD5 (cyrus-sasl-2.1.12.tar.gz) = 42cdb218959eb46c3ea70728c9da4385 +MD5 (cyrus-sasl-2.1.13.tar.gz) = 1114d59d970791932e96de8557472672 diff -Nur cyrus-sasl2/files/patch-aclocal.m4.orig cyrus-sasl2/files/patch-aclocal.m4 --- cyrus-sasl2/files/patch-aclocal.m4.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-aclocal.m4 Tue Apr 15 01:42:48 2003 @@ -0,0 +1,11 @@ +--- aclocal.m4.orig Mon Apr 14 20:07:47 2003 ++++ aclocal.m4 Tue Apr 15 01:39:33 2003 +@@ -1061,7 +1061,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; + dblib="berkeley"; break, dblib="no") diff -Nur cyrus-sasl2/files/patch-cmulocal::berkdb.m4.orig cyrus-sasl2/files/patch-cmulocal::berkdb.m4 --- cyrus-sasl2/files/patch-cmulocal::berkdb.m4.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-cmulocal::berkdb.m4 Tue Apr 15 01:41:53 2003 @@ -0,0 +1,11 @@ +--- cmulocal/berkdb.m4.orig Mon Mar 24 18:49:59 2003 ++++ cmulocal/berkdb.m4 Tue Apr 15 01:39:33 2003 +@@ -211,7 +211,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; + dblib="berkeley"; break, dblib="no") diff -Nur cyrus-sasl2/files/patch-config::ltmain.sh.orig cyrus-sasl2/files/patch-config::ltmain.sh --- cyrus-sasl2/files/patch-config::ltmain.sh.orig Sat Oct 12 01:16:26 2002 +++ cyrus-sasl2/files/patch-config::ltmain.sh Tue Apr 15 02:34:49 2003 @@ -1,7 +1,32 @@ -Index: config/ltmain.sh -diff -u config/ltmain.sh.orig config/ltmain.sh --- config/ltmain.sh.orig Tue Sep 3 23:59:40 2002 +++ config/ltmain.sh Sat Oct 12 08:03:59 2002 +@@ -1894,7 +1894,7 @@ + if test $? -eq 0 ; then + ldd_output=`ldd conftest` + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name="`expr X$i : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + libname=`eval \\$echo \"$libname_spec\"` +@@ -1919,7 +1919,7 @@ + # Error occured in the first compile. Let's try to salvage the situation: + # Compile a seperate program for each library. + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name="`expr X$i : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + $rm conftest +@@ -1959,7 +1959,7 @@ + set dummy $deplibs_check_method + file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`" + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name="`expr X$a_deplib : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + libname=`eval \\$echo \"$libname_spec\"` @@ -3391,8 +3391,8 @@ # Install the pseudo-library for information purposes. name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` diff -Nur cyrus-sasl2/files/patch-configure.orig cyrus-sasl2/files/patch-configure --- cyrus-sasl2/files/patch-configure.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-configure Tue Apr 15 01:42:25 2003 @@ -0,0 +1,20 @@ +--- configure.orig Mon Apr 14 20:07:48 2003 ++++ configure Tue Apr 15 01:39:33 2003 +@@ -2652,7 +2652,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 + echo "configure:2659: checking for db_create in -l$dbname" >&5 +@@ -3043,7 +3043,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 + echo "configure:3050: checking for db_create in -l$dbname" >&5 diff -Nur cyrus-sasl2/files/patch-saslauthd::Makefile.in.orig cyrus-sasl2/files/patch-saslauthd::Makefile.in --- cyrus-sasl2/files/patch-saslauthd::Makefile.in.orig Fri Aug 9 21:11:41 2002 +++ cyrus-sasl2/files/patch-saslauthd::Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -Index: saslauthd/Makefile.in -diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in ---- saslauthd/Makefile.in.orig Sat Aug 10 01:13:07 2002 -+++ saslauthd/Makefile.in Sat Aug 10 03:58:24 2002 -@@ -105,7 +105,7 @@ - - EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include getnameinfo.c getaddrinfo.c saslauthd-unix.c saslauthd-doors.c LDAP_SASLAUTHD - --INCLUDES = -I$(top_srcdir)/include -+INCLUDES = -I../include - DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff -Nur cyrus-sasl2/files/patch-saslauthd::aclocal.m4.orig cyrus-sasl2/files/patch-saslauthd::aclocal.m4 --- cyrus-sasl2/files/patch-saslauthd::aclocal.m4.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-saslauthd::aclocal.m4 Tue Apr 15 01:41:02 2003 @@ -0,0 +1,11 @@ +--- saslauthd/aclocal.m4.orig Mon Apr 14 20:07:50 2003 ++++ saslauthd/aclocal.m4 Tue Apr 15 01:39:33 2003 +@@ -1034,7 +1034,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; + dblib="berkeley"; break, dblib="no") diff -Nur cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh.orig cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh --- cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh Tue Apr 15 02:34:12 2003 @@ -0,0 +1,29 @@ +--- saslauthd/config/ltmain.sh.orig Tue Dec 4 03:06:57 2001 ++++ saslauthd/config/ltmain.sh Tue Apr 15 02:33:18 2003 +@@ -1861,7 +1861,7 @@ + if test $? -eq 0 ; then + ldd_output=`ldd conftest` + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name="`expr X$i : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + libname=`eval \\$echo \"$libname_spec\"` +@@ -1886,7 +1886,7 @@ + # Error occured in the first compile. Let's try to salvage the situation: + # Compile a seperate program for each library. + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name="`expr X$i : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + $rm conftest +@@ -1926,7 +1926,7 @@ + set dummy $deplibs_check_method + file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`" + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name="`expr X$a_deplib : 'X-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" ; then + libname=`eval \\$echo \"$libname_spec\"` diff -Nur cyrus-sasl2/files/patch-saslauthd::configure.orig cyrus-sasl2/files/patch-saslauthd::configure --- cyrus-sasl2/files/patch-saslauthd::configure.orig Thu Jan 1 01:00:00 1970 +++ cyrus-sasl2/files/patch-saslauthd::configure Tue Apr 15 01:40:31 2003 @@ -0,0 +1,20 @@ +--- saslauthd/configure.orig Mon Apr 14 20:07:50 2003 ++++ saslauthd/configure Tue Apr 15 01:39:33 2003 +@@ -3441,7 +3441,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 + echo "configure:3448: checking for db_create in -l$dbname" >&5 +@@ -3832,7 +3832,7 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + do + echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 + echo "configure:3839: checking for db_create in -l$dbname" >&5 diff -Nur cyrus-sasl2/pkg-plist.orig cyrus-sasl2/pkg-plist --- cyrus-sasl2/pkg-plist.orig Tue Feb 11 06:09:55 2003 +++ cyrus-sasl2/pkg-plist Tue Apr 15 02:43:31 2003 @@ -31,6 +31,9 @@ %%MYSQL%%lib/sasl2/libmysql.a %%MYSQL%%lib/sasl2/libmysql.so %%MYSQL%%lib/sasl2/libmysql.so.2 +lib/sasl2/libntlm.a +lib/sasl2/libntlm.so +lib/sasl2/libntlm.so.2 %%OTP%%lib/sasl2/libotp.a %%OTP%%lib/sasl2/libotp.so %%OTP%%lib/sasl2/libotp.so.2 @@ -55,13 +58,13 @@ %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-melnikov-rfc2831bis-02.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-00.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-00.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-00.txt %%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt %%PORTDOCS%%%%DOCSDIR%%/draft-nerenberg-sasl-crammd5-03.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-00.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt %%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-zeilenga-sasl-anon-01.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-zeilenga-sasl-plain-01.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt diff -Nur cyrus-sasl2/scripts/configure.sasl.orig cyrus-sasl2/scripts/configure.sasl --- cyrus-sasl2/scripts/configure.sasl.orig Mon Feb 24 03:56:36 2003 +++ cyrus-sasl2/scripts/configure.sasl Tue Apr 15 02:16:55 2003 @@ -8,7 +8,11 @@ tempfile=`mktemp -t checklist` if [ "${BATCH}" ]; then - if [ "${WITH_DB3}" ]; then + if [ "${WITH_DB41}" ]; then + OPTIONS="\"DB41\"" + elif [ "${WITH_DB4}" ]; then + OPTIONS="\"DB4\"" + elif [ "${WITH_DB3}" ]; then OPTIONS="\"DB3\"" else OPTIONS="\"NDBM\"" @@ -16,7 +20,9 @@ if [ "${WITH_MYSQL}" ]; then OPTIONS="${OPTIONS} \"MySQL\"" fi - if [ "${WITH_LDAP}" ]; then + if [ "${WITH_LDAP21}" ]; then + OPTIONS="${OPTIONS} \"OpenLDAP21\"" + elif [ "${WITH_LDAP}" ]; then OPTIONS="${OPTIONS} \"OpenLDAP\"" fi if [ "${OPTIONS}" != "x" ]; then @@ -24,10 +30,24 @@ set ${OPTIONS} fi else - if [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then + if [ "${WITH_DB41}" -o -f ${PREFIX}/lib/libdb41.so ] ; then + SET_DB41="ON" + SET_DB4="OFF" + SET_DB3="OFF" + SET_NDBM="OFF" + elif [ "${WITH_DB4}" -o -f ${PREFIX}/lib/libdb4.so ] ; then + SET_DB41="OFF" + SET_DB4="ON" + SET_DB3="OFF" + SET_NDBM="OFF" + elif [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then + SET_DB41="OFF" + SET_DB4="OFF" SET_DB3="ON" SET_NDBM="OFF" else + SET_DB41="OFF" + SET_DB4="OFF" SET_DB3="OFF" SET_NDBM="ON" fi @@ -36,9 +56,15 @@ else SET_MYSQL="OFF" fi - if [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then + if [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 \ + -a -f ${PREFIX}/bin/ldapwhoami ] ; then + SET_LDAP21="ON" + SET_LDAP="OFF" + elif [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then + SET_LDAP21="OFF" SET_LDAP="ON" else + SET_LDAP21="OFF" SET_LDAP="OFF" fi @@ -47,8 +73,11 @@ Please select desired options:" -1 -1 16 \ NDBM "ndbm DB" ${SET_NDBM} \ DB3 "Berkeley DB, revision 3" ${SET_DB3} \ +DB4 "Berkeley DB, revision 4" ${SET_DB4} \ +DB41 "Berkeley DB, revision 4.1" ${SET_DB41} \ MySQL "MySQL password Authentication" ${SET_MYSQL} \ -OpenLDAP "OpenLDAP 2.x password Authentication w/TLS" ${SET_LDAP} \ +OpenLDAP "OpenLDAP 2.0 password Authentication w/TLS" ${SET_LDAP} \ +OpenLDAP21 "OpenLDAP 2.1 password Authentication w/TLS" ${SET_LDAP21} \ SASLAUTHD "Use saslauthd for password Authentication" ON \ 2> $tempfile @@ -81,7 +110,7 @@ case $1 in \"NDBM\") if [ "${DBLIB}" ]; then - echo "ndbm and db3 are mutually exclusive." > /dev/stderr + echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc exit 1 fi @@ -89,9 +118,31 @@ echo "SASLDB_NAME= sasldb2.db" DBLIB=1 ;; + \"DB41\") + if [ "${DBLIB}" ]; then + echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr + rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc + exit 1 + fi + echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" + echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db41 --with-bdb-libdir=${PREFIX}/lib" + echo "SASLDB_NAME= sasldb2" + DBLIB=1 + ;; + \"DB4\") + if [ "${DBLIB}" ]; then + echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr + rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc + exit 1 + fi + echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" + echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db4 --with-bdb-libdir=${PREFIX}/lib" + echo "SASLDB_NAME= sasldb2" + DBLIB=1 + ;; \"DB3\") if [ "${DBLIB}" ]; then - echo "ndbm and db3 are mutually exclusive." > /dev/stderr + echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc exit 1 fi @@ -106,7 +157,23 @@ echo "PLIST_SUB+= MYSQL=\"\"" DEFMYSQL=1 ;; + \"OpenLDAP21\") + if [ "${OPENLDAP}" ]; then + echo "OpenLDAP 2.0 and 2.1 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}" + OPENLDAP=1 + ;; \"OpenLDAP\") + if [ "${OPENLDAP}" ]; then + echo "OpenLDAP 2.0 and 2.1 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}" --- cyrus-sasl2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E195FAK-00040K-2c>