[pkgsrc/trunk]: pkgsrc/databases/openldap Update openldap to version 2.1.22.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eddbc0ab55f4
branches:  trunk
changeset: 461596:eddbc0ab55f4
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Sep 18 05:37:15 2003 +0000

description:
Update openldap to version 2.1.22.

    This release contains the following major enhancements:

        * Transactional backend
        * Improved Unicode handling
        * Improved DN handlng
        * Improved Referral handling
        * SASL authentication/authorization mapping
        * SASL in-directory storage of authentication secrets
        * Enhanced administrative limits/access controls
        * Meta backend (experimental)
        * Monitor backend (experimental)
        * Virtual "glue" backend (experimental)
        * LDAP C++ API
        * Updated LDAP C and TCL APIs
        * LDAPv3 extensions, including:
            - Enhanced Language Tag/Range Support
            - 'Who am i?' Extended Operation
            - 'Matched Values' Control
            - 'NOOP' Control

   plus lots of bug fixes.

Update (to 2.1.20) from Juan RP in PR pkg/21682 with some tidy up and
update to 2.1.22 by Marc Recht and me.

Also closes PR pkg/21217 by Jean-Luc Wasmer and PR pkg/20972 by Jeremy
Reed.

diffstat:

 databases/openldap/Makefile         |   39 +++++----
 databases/openldap/PLIST            |  132 ++++++++++++------------------------
 databases/openldap/buildlink2.mk    |   18 ++--
 databases/openldap/distinfo         |   11 +-
 databases/openldap/patches/patch-aa |   22 ------
 databases/openldap/patches/patch-ab |   42 -----------
 databases/openldap/patches/patch-ac |   13 +-
 databases/openldap/patches/patch-ad |  125 ----------------------------------
 8 files changed, 85 insertions(+), 317 deletions(-)

diffs (truncated from 645 to 300 lines):

diff -r 50fb0d2c1752 -r eddbc0ab55f4 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Thu Sep 18 04:17:12 2003 +0000
+++ b/databases/openldap/Makefile       Thu Sep 18 05:37:15 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2003/07/17 21:28:26 grant Exp $
+# $NetBSD: Makefile,v 1.57 2003/09/18 05:37:15 markd Exp $
 
-DISTNAME=      openldap-2.0.27
-PKGREVISION=   3
+DISTNAME=      openldap-2.1.22
 SVR4_PKGNAME=  oldap
 CATEGORIES=    databases
 MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -16,32 +15,34 @@
 USE_BUILDLINK2=                YES
 USE_PKGINSTALL=                YES
 USE_LIBTOOL=           YES
-LTCONFIG_OVERRIDE=     ${WRKSRC}/build/ltconfig
+LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 TEST_TARGET=           test
 
 # unfortunately, --enable-phonetic cannot be disabled by runtime configuration
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-dnssrv
-CONFIGURE_ARGS+=       --enable-cldap
+CONFIGURE_ARGS+=       --enable-ldap
 CONFIGURE_ARGS+=       --enable-passwd
-CONFIGURE_ARGS+=       --enable-shell
 CONFIGURE_ARGS+=       --enable-wrappers
 CONFIGURE_ARGS+=       --with-tls=openssl
 CONFIGURE_ARGS+=       --without-readline
+CONFIGURE_ARGS+=       --enable-ldbm
+CONFIGURE_ARGS+=       --enable-crypt
 
 PKG_SYSCONFSUBDIR=     openldap
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=       --localstatedir=/var/openldap
+CPPFLAGS+=             -I${BUILDLINK_PREFIX.db4}/include/db4
+
+BUILD_DEFS+=           USE_SASL USE_SASL2
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink2.mk"
-CPPFLAGS+=     -I${BUILDLINK_PREFIX.db}/include/db2
-LIBS=          -ldb2 -lpthread -lrt
-.endif
-
-.if defined(USE_SASL) && (${USE_SASL} == "YES")
+.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+CONFIGURE_ARGS+=       --with-cyrus-sasl
+CONFIGURE_ARGS+=       --enable-spasswd
+.elif defined(USE_SASL) && (${USE_SASL} == "YES")
 .include "../../security/cyrus-sasl/buildlink2.mk"
 CONFIGURE_ARGS+=       --with-cyrus-sasl
 CONFIGURE_ARGS+=       --enable-spasswd
@@ -60,14 +61,12 @@
 OWN_DIRS_PERMS=        /var/openldap/openldap-ldbm ${ROOT_USER} ${ROOT_GROUP} 0700
 OWN_DIRS_PERMS+=/var/openldap/openldap-slurp ${ROOT_USER} ${ROOT_GROUP} 0700
 
-CNFS=          ldap.conf ldapfilter.conf ldaptemplates.conf            \
-               ldapsearchprefs.conf
+CNFS=          ldap.conf
 CNFS_PERMS=    slapd.conf
 SUPPS=         schema/corba.schema schema/core.schema                  \
                schema/cosine.schema schema/inetorgperson.schema        \
-               schema/java.schema schema/krb5-kdc.schema               \
-               schema/misc.schema schema/nis.schema                    \
-               schema/openldap.schema
+               schema/java.schema schema/misc.schema                   \
+               schema/nis.schema schema/openldap.schema
 
 CONF_FILES=            # empty
 CONF_FILES_PERMS=      # empty
@@ -96,6 +95,7 @@
                ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;            \
        done
 
+.include "../../databases/db4/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
@@ -103,6 +103,9 @@
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=       --with-threads
 PLIST_SRC=             ${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
+.else
+#--without-threads is recommended with back-shell
+CONFIGURE_ARGS+=       --without-threads --enable-shell
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 50fb0d2c1752 -r eddbc0ab55f4 databases/openldap/PLIST
--- a/databases/openldap/PLIST  Thu Sep 18 04:17:12 2003 +0000
+++ b/databases/openldap/PLIST  Thu Sep 18 05:37:15 2003 +0000
@@ -1,52 +1,44 @@
-@comment $NetBSD: PLIST,v 1.8 2002/09/23 10:06:58 kleink Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/09/18 05:37:15 markd Exp $
 bin/ldapadd
+bin/ldapcompare
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
-bin/ud
+bin/ldapwhoami
 etc/rc.d/slapd
-include/disptmpl.h
 include/lber.h
 include/lber_types.h
 include/ldap.h
 include/ldap_cdefs.h
 include/ldap_features.h
 include/ldap_schema.h
-include/srchpref.h
+include/ldap_utf8.h
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/liblber.so.2
-lib/liblber.so.2.17
+lib/liblber.so.2.122
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap.so.2
-lib/libldap.so.2.17
+lib/libldap.so.2.122
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
 lib/libldap_r.so.2
-lib/libldap_r.so.2.17
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
+lib/libldap_r.so.2.122
 libexec/slapd
-libexec/xrpcomp
 man/man1/ldapadd.1
+man/man1/ldapcompare.1
 man/man1/ldapdelete.1
 man/man1/ldapmodify.1
 man/man1/ldapmodrdn.1
 man/man1/ldappasswd.1
 man/man1/ldapsearch.1
-man/man1/ud.1
+man/man1/ldapwhoami.1
 man/man3/ber_alloc_t.3
 man/man3/ber_first_element.3
 man/man3/ber_flush.3
@@ -88,60 +80,38 @@
 man/man3/ldap_attributetype_free.3
 man/man3/ldap_bind.3
 man/man3/ldap_bind_s.3
-man/man3/ldap_build_filter.3
-man/man3/ldap_cache.3
 man/man3/ldap_compare.3
 man/man3/ldap_compare_ext.3
 man/man3/ldap_compare_ext_s.3
 man/man3/ldap_compare_s.3
 man/man3/ldap_count_entries.3
+man/man3/ldap_count_messages.3
+man/man3/ldap_count_references.3
 man/man3/ldap_count_values.3
 man/man3/ldap_count_values_len.3
+man/man3/ldap_dcedn2dn.3
 man/man3/ldap_delete.3
 man/man3/ldap_delete_ext.3
 man/man3/ldap_delete_ext_s.3
 man/man3/ldap_delete_s.3
-man/man3/ldap_destroy_cache.3
-man/man3/ldap_disable_cache.3
-man/man3/ldap_disptmpl.3
+man/man3/ldap_dn2ad_canonical.3
+man/man3/ldap_dn2dcedn.3
+man/man3/ldap_dn2str.3
 man/man3/ldap_dn2ufn.3
-man/man3/ldap_enable_cache.3
-man/man3/ldap_entry2html.3
-man/man3/ldap_entry2html_search.3
-man/man3/ldap_entry2text.3
-man/man3/ldap_entry2text_search.3
 man/man3/ldap_err2string.3
 man/man3/ldap_errlist.3
 man/man3/ldap_error.3
 man/man3/ldap_explode_dn.3
 man/man3/ldap_explode_rdn.3
 man/man3/ldap_first_attribute.3
-man/man3/ldap_first_disptmpl.3
 man/man3/ldap_first_entry.3
-man/man3/ldap_first_searchobj.3
-man/man3/ldap_first_tmplcol.3
-man/man3/ldap_first_tmplrow.3
-man/man3/ldap_flush_cache.3
-man/man3/ldap_free_friendlymap.3
-man/man3/ldap_free_searchprefs.3
-man/man3/ldap_free_templates.3
+man/man3/ldap_first_message.3
+man/man3/ldap_first_reference.3
 man/man3/ldap_free_urldesc.3
-man/man3/ldap_friendly.3
-man/man3/ldap_friendly_name.3
 man/man3/ldap_get_dn.3
 man/man3/ldap_get_values.3
 man/man3/ldap_get_values_len.3
-man/man3/ldap_getfilter.3
-man/man3/ldap_getfilter_free.3
-man/man3/ldap_getfirstfilter.3
-man/man3/ldap_getnextfilter.3
 man/man3/ldap_init.3
-man/man3/ldap_init_getfilter.3
-man/man3/ldap_init_getfilter_buf.3
-man/man3/ldap_init_searchprefs.3
-man/man3/ldap_init_searchprefs_buf.3
-man/man3/ldap_init_templates.3
-man/man3/ldap_init_templates_buf.3
 man/man3/ldap_is_ldap_url.3
 man/man3/ldap_kerberos_bind1.3
 man/man3/ldap_kerberos_bind1_s.3
@@ -164,16 +134,17 @@
 man/man3/ldap_msgid.3
 man/man3/ldap_msgtype.3
 man/man3/ldap_next_attribute.3
-man/man3/ldap_next_disptmpl.3
 man/man3/ldap_next_entry.3
-man/man3/ldap_next_searchobj.3
-man/man3/ldap_next_tmplcol.3
-man/man3/ldap_next_tmplrow.3
+man/man3/ldap_next_message.3
+man/man3/ldap_next_reference.3
 man/man3/ldap_objectclass2name.3
 man/man3/ldap_objectclass2str.3
 man/man3/ldap_objectclass_free.3
-man/man3/ldap_oc2template.3
 man/man3/ldap_open.3
+man/man3/ldap_parse_extended_result.3
+man/man3/ldap_parse_reference.3
+man/man3/ldap_parse_result.3
+man/man3/ldap_parse_sasl_bind_result.3
 man/man3/ldap_perror.3
 man/man3/ldap_result.3
 man/man3/ldap_result2error.3
@@ -186,9 +157,6 @@
 man/man3/ldap_search_ext_s.3
 man/man3/ldap_search_s.3
 man/man3/ldap_search_st.3
-man/man3/ldap_searchprefs.3
-man/man3/ldap_set_cache_options.3
-man/man3/ldap_setfilteraffixes.3
 man/man3/ldap_simple_bind.3
 man/man3/ldap_simple_bind_s.3
 man/man3/ldap_sort.3
@@ -196,50 +164,37 @@
 man/man3/ldap_sort_strcasecmp.3
 man/man3/ldap_sort_values.3
 man/man3/ldap_str2attributetype.3
+man/man3/ldap_str2dn.3
 man/man3/ldap_str2matchingrule.3
 man/man3/ldap_str2objectclass.3
 man/man3/ldap_str2syntax.3
 man/man3/ldap_syntax2name.3
 man/man3/ldap_syntax2str.3
 man/man3/ldap_syntax_free.3
-man/man3/ldap_tmplattrs.3
-man/man3/ldap_ufn.3
-man/man3/ldap_ufn_search_c.3
-man/man3/ldap_ufn_search_ct.3
-man/man3/ldap_ufn_search_s.3
-man/man3/ldap_ufn_setfilter.3
-man/man3/ldap_ufn_setprefix.3
-man/man3/ldap_ufn_timeout.3
 man/man3/ldap_unbind.3
 man/man3/ldap_unbind_ext.3
 man/man3/ldap_unbind_ext_s.3
 man/man3/ldap_unbind_s.3
-man/man3/ldap_uncache_entry.3
-man/man3/ldap_uncache_request.3
 man/man3/ldap_url.3
 man/man3/ldap_url_parse.3
-man/man3/ldap_url_search.3
-man/man3/ldap_url_search_s.3
-man/man3/ldap_url_search_st.3
-man/man3/ldap_vals2html.3
-man/man3/ldap_vals2text.3
 man/man3/ldap_value_free.3
 man/man3/ldap_value_free_len.3
 man/man5/ldap.conf.5
-man/man5/ldapfilter.conf.5
-man/man5/ldapfriendly.5
-man/man5/ldapsearchprefs.conf.5
-man/man5/ldaptemplates.conf.5