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.

8 files changed, 85 insertions, 317 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index c08e66b9333..fceb3af72d5 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -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 @@ CONFLICTS+=	ldapsdk-[0-9]*
 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
 
-.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+=		USE_SASL USE_SASL2
 
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink2.mk"
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
-LIBS=		-ldb2 -lpthread -lrt
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-.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=	/var/openldap
 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 @@ post-install:
 		${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 @@ post-install:
 .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 --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 0cbf3d751fc..57cbbf6dd34 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -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_attributetype2str.3
 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_msgfree.3
 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.3
 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_entries.3
 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
 man/man5/ldif.5
+man/man5/slapd-bdb.5
+man/man5/slapd-dnssrv.5
+man/man5/slapd-ldap.5
+man/man5/slapd-ldbm.5
+man/man5/slapd-meta.5
+man/man5/slapd-null.5
+man/man5/slapd-passwd.5
+man/man5/slapd-perl.5
+man/man5/slapd-shell.5
+man/man5/slapd-sql.5
+man/man5/slapd-tcl.5
+man/man5/slapd.access.5
 man/man5/slapd.conf.5
 man/man5/slapd.replog.5
-man/man5/ud.conf.5
-man/man8/fax500.8
-man/man8/go500.8
-man/man8/go500gw.8
-man/man8/in.xfingerd.8
-man/man8/mail500.8
-man/man8/rcpt500.8
 man/man8/slapadd.8
 man/man8/slapcat.8
 man/man8/slapd.8
@@ -251,22 +206,23 @@ sbin/slapcat
 sbin/slapindex
 sbin/slappasswd
 share/examples/openldap/ldap.conf
-share/examples/openldap/ldapfilter.conf
-share/examples/openldap/ldapsearchprefs.conf
-share/examples/openldap/ldaptemplates.conf
 share/examples/openldap/schema/corba.schema
 share/examples/openldap/schema/core.schema
 share/examples/openldap/schema/cosine.schema
 share/examples/openldap/schema/inetorgperson.schema
 share/examples/openldap/schema/java.schema
-share/examples/openldap/schema/krb5-kdc.schema
 share/examples/openldap/schema/misc.schema
 share/examples/openldap/schema/nis.schema
 share/examples/openldap/schema/openldap.schema
 share/examples/openldap/slapd.conf
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
+share/openldap/ucdata/case.dat
+share/openldap/ucdata/cmbcl.dat
+share/openldap/ucdata/comp.dat
+share/openldap/ucdata/ctype.dat
+share/openldap/ucdata/decomp.dat
+share/openldap/ucdata/kdecomp.dat
+share/openldap/ucdata/num.dat
+@dirrm share/openldap/ucdata
 @dirrm share/openldap
 @dirrm share/examples/openldap/schema
 @dirrm share/examples/openldap
diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk
index adc6d216e79..24d25510992 100644
--- a/databases/openldap/buildlink2.mk
+++ b/databases/openldap/buildlink2.mk
@@ -1,35 +1,35 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/05/08 12:30:37 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/09/18 05:37:15 markd Exp $
 
 .if !defined(OPENLDAP_BUILDLINK2_MK)
 OPENLDAP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		openldap
-BUILDLINK_DEPENDS.openldap?=	openldap>=2.0.27nb3
+BUILDLINK_DEPENDS.openldap?=	openldap>=2.1.22
 BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openldap=openldap
 BUILDLINK_PREFIX.openldap_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.openldap=	include/disptmpl.h
 BUILDLINK_FILES.openldap+=	include/lber.h
 BUILDLINK_FILES.openldap+=	include/lber_types.h
 BUILDLINK_FILES.openldap+=	include/ldap.h
 BUILDLINK_FILES.openldap+=	include/ldap_cdefs.h
 BUILDLINK_FILES.openldap+=	include/ldap_features.h
 BUILDLINK_FILES.openldap+=	include/ldap_schema.h
-BUILDLINK_FILES.openldap+=	include/srchpref.h
+BUILDLINK_FILES.openldap+=	include/ldap_utf8.h
 BUILDLINK_FILES.openldap+=	lib/liblber.*
 BUILDLINK_FILES.openldap+=	lib/libldap.*
+BUILDLINK_FILES.openldap+=	lib/libldap_r.*
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == SunOS
-.  include "../../databases/db/buildlink2.mk"
-.endif
-
-.if defined(USE_SASL) && (${USE_SASL} == "YES")
+.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
+.  include "../../security/cyrus-sasl2/buildlink2.mk"
+.elif defined(USE_SASL) && (${USE_SASL} == "YES")
 .  include "../../security/cyrus-sasl/buildlink2.mk"
 .endif
 
+.include "../../security/openssl/buildlink2.mk"
+
 BUILDLINK_TARGETS+=	openldap-buildlink
 
 openldap-buildlink: _BUILDLINK_USE
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 04e2914f606..f04be08968d 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.16 2003/01/29 22:05:33 kleink Exp $
+$NetBSD: distinfo,v 1.17 2003/09/18 05:37:15 markd Exp $
 
-SHA1 (openldap-2.0.27.tgz) = 6867890ed0a0a07d022290fa4b3429de50e1d0f3
-Size (openldap-2.0.27.tgz) = 1305050 bytes
-SHA1 (patch-aa) = 8577dfc802eda5e789aa7e66ff9bd9cbb1ca1777
-SHA1 (patch-ab) = f2b00ef942da01fda134ac37086f59d371efa152
-SHA1 (patch-ac) = 5398e8be071859c59062ec8735ada11799aa5dd9
-SHA1 (patch-ad) = 4b8495b8a3960ce3a42105819b77de900809ecf2
+SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
+Size (openldap-2.1.22.tgz) = 2033763 bytes
+SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
deleted file mode 100644
index b6cfef64002..00000000000
--- a/databases/openldap/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/10/25 16:19:35 tron Exp $
-
---- build/mod.mk.orig	Wed Oct  4 17:21:30 2000
-+++ build/mod.mk	Thu Oct 25 17:02:15 2001
-@@ -10,10 +10,14 @@
- LIBRARY = $(LIBBASE).la
- LIBSTAT = lib$(LIBBASE).a
- 
--LTFLAGS = --only-$(LINKAGE)
-+.if ($(LINKAGE) == static)
-+LTFLAGS = -static
-+.else
-+LTFLAGS =
-+.endif
- 
--COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
--LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -rpath $(moduledir) \
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(LTFLAGS) $(CFLAGS) $(MODDEFS) -c
-+LTLIBLINK = $(LIBTOOL) --mode=link $(CC) $(LTFLAGS) -rpath $(moduledir) \
- 	$(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
- 
- MKDEPFLAG = -l
diff --git a/databases/openldap/patches/patch-ab b/databases/openldap/patches/patch-ab
deleted file mode 100644
index c97107495f0..00000000000
--- a/databases/openldap/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/10/25 16:15:44 tron Exp $
-
---- build/lib-shared.mk.orig	Wed Oct 11 04:32:05 2000
-+++ build/lib-shared.mk	Thu Oct 25 16:12:57 2001
-@@ -7,7 +7,11 @@
- ## Makefile Template for Shared Libraries
- ##
- 
--NT_LTFLAGS = --only-$(LINKAGE)
-+.if ($(LINKAGE) == static)
-+NT_LTFLAGS = -static
-+.else
-+NT_LTFLAGS =
-+.endif
- LTFLAGS = $(@PLAT@_LTFLAGS) 
- 
- NT_DYN_LT_NO_UNDEF = -no-undefined
-@@ -32,19 +36,11 @@
- 
- $(LIBRARY):  version.lo
- 	$(LTLIBLINK) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
--	$(RM) ../$@
--	d=`$(PWD)`; d=`$(BASENAME) $$d`; cd ..; $(LN_S) $$d/$@ $@; \
--	t=`$(BASENAME) $@ .la`.a; $(RM) $$t; $(LN_S) $$d/.libs/$$t $$t
--	if test "$(LINK_BINS_DYNAMIC)" = "yes"; then \
--		d=`$(PWD)`; d=`$(BASENAME) $$d`; b=`$(BASENAME) $@ .la`; \
--		 cd .libs; t=`echo $$b*.$(DYN_EXT)`; (cd ../.. ; $(RM) $$t; \
--		 $(LN_S) $$d/.libs/$$t $$t); \
--		if test "$(DYN_EXT)" != dll; then \
--		    t=`echo $$b.$(DYN_EXT).?`; cd ../.. ; \
--		    $(RM) $$t; \
--		    $(LN_S) $$d/.libs/$$t $$t; \
--		fi \
--	fi
-+	@$(RM) ../$@
-+	@for ext in a so so.1.0; do \
-+	$(RM) ../`$(BASENAME) $@ .la`.$$ext;    \
-+	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.$$ext; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t); \
-+	done
- 
- Makefile: $(top_srcdir)/build/lib-shared.mk
- 
diff --git a/databases/openldap/patches/patch-ac b/databases/openldap/patches/patch-ac
index 1536493a961..ba822c0e80e 100644
--- a/databases/openldap/patches/patch-ac
+++ b/databases/openldap/patches/patch-ac
@@ -1,14 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2003/01/19 09:26:33 skrll Exp $
+$NetBSD: patch-ac,v 1.4 2003/09/18 05:37:18 markd Exp $
 
---- libraries/libldap_r/thr_posix.c.orig	Fri Jan  4 20:38:23 2002
-+++ libraries/libldap_r/thr_posix.c
-@@ -103,7 +103,9 @@ ldap_pvt_thread_create( ldap_pvt_thread_
+--- libraries/libldap_r/thr_posix.c.orig	2003-05-25 22:34:36.000000000 +0200
++++ libraries/libldap_r/thr_posix.c	2003-05-25 22:36:17.000000000 +0200
+@@ -110,8 +110,10 @@
  
  #if defined(LDAP_PVT_THREAD_STACK_SIZE) && LDAP_PVT_THREAD_STACK_SIZE > 0
  	/* this should be tunable */
 +#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
  	pthread_attr_setstacksize( &attr, LDAP_PVT_THREAD_STACK_SIZE );
-+#endif
  #endif
++#endif
  
- 	rtn = pthread_create( thread, &attr, start_routine, arg );
+ #if HAVE_PTHREADS > 5
+ 	detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;
diff --git a/databases/openldap/patches/patch-ad b/databases/openldap/patches/patch-ad
deleted file mode 100644
index b11c779fdc3..00000000000
--- a/databases/openldap/patches/patch-ad
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/01/29 22:05:34 kleink Exp $
-
---- libraries/liblutil/sha1.c.orig	2002-01-04 21:38:25.000000000 +0100
-+++ libraries/liblutil/sha1.c	2003-01-29 22:39:16.000000000 +0100
-@@ -41,13 +41,13 @@
-  * I got the idea of expanding during the round function from SSLeay
-  */
- #if BYTE_ORDER == LITTLE_ENDIAN
--# define blk0(i) (block[i] = (rol(block[i],24)&0xFF00FF00) \
--    |(rol(block[i],8)&0x00FF00FF))
-+# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-+    |(rol(block->l[i],8)&0x00FF00FF))
- #else
--# define blk0(i) block[i]
-+# define blk0(i) block->l[i]
- #endif
--#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
--    ^block[(i+2)&15]^block[i&15],1))
-+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-+    ^block->l[(i+2)&15]^block->l[i&15],1))
- 
- /*
-  * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
-@@ -58,6 +58,63 @@
- #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
- #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
- 
-+typedef union {
-+    u_char c[64];
-+    uint32 l[16];
-+} CHAR64LONG16;
-+
-+#ifdef __sparc_v9__
-+void do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *);
-+void do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *);
-+void do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *);
-+void do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *);
-+
-+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
-+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
-+#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
-+#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
-+#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
-+
-+void
-+do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
-+{
-+    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
-+    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
-+    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
-+    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
-+    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
-+}
-+
-+void
-+do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
-+{
-+    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
-+    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
-+    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
-+    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
-+    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
-+}
-+
-+void
-+do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
-+{
-+    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
-+    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
-+    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
-+    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
-+    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
-+}
-+
-+void
-+do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
-+{
-+    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
-+    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
-+    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
-+    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
-+    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
-+}
-+#endif
- 
- /*
-  * Hash a single 512-bit block. This is the core of the algorithm.
-@@ -66,12 +123,14 @@
- lutil_SHA1Transform( uint32 *state, const unsigned char *buffer )
- {
-     uint32 a, b, c, d, e;
-+    CHAR64LONG16 *block;
- 
- #ifdef SHA1HANDSOFF
--    uint32 block[16];
-+    CHAR64LONG16 workspace;
-+    block = &workspace;
-     (void)AC_MEMCPY(block, buffer, 64);
- #else
--    uint32 *block = (u_int32 *) buffer;
-+    block = (CHAR64LONG16 *) (void *) buffer;
- #endif
- 
-     /* Copy context->state[] to working vars */
-@@ -81,6 +140,12 @@
-     d = state[3];
-     e = state[4];
- 
-+#ifdef __sparc_v9__
-+    do_R01(&a, &b, &c, &d, &e, block);
-+    do_R2(&a, &b, &c, &d, &e, block);
-+    do_R3(&a, &b, &c, &d, &e, block);
-+    do_R4(&a, &b, &c, &d, &e, block);
-+#else
-     /* 4 rounds of 20 operations each. Loop unrolled. */
-     R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-     R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-@@ -102,6 +167,7 @@
-     R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-     R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-     R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-+#endif
- 
-     /* Add the working vars back into context.state[] */
-     state[0] += a;