Update "openldap" package to version 2.0.17. Major changes since version

1.2.13:
- LDAPv3 support
    + RFC 2251-2256
    + Language Tags (RFC 2596)
    + SASL (RFC2829)
    + TLS (RFC2830) and SSL (ldaps://)
    + named references
    + DNS SRV location
- IPv6 support
- LDAP over IPC support
- Updated C API
- LDIFv1 (RFC2849)
- Enhanced Standalone LDAP Server:
    + Updated Access Control System
    + Thread Pooling
    + DNS SRV referral backend (experimental)
    + LDAP backend (experimental)
    + SQL backend (experimental)
    + Better tools

This fixes PR pkg/14339 by Hauke Fath.

5 files changed, 168 insertions, 63 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index c6438e48d45..12619ce2099 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2001/10/18 15:20:07 veego Exp $
-#
+# $NetBSD: Makefile,v 1.28 2001/10/25 16:15:44 tron Exp $
 
-DISTNAME=	openldap-1.2.13
+DISTNAME=	openldap-2.0.17
 SVR4_PKGNAME=	oldap
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -39,8 +38,7 @@ CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
 LIBS=		-ldb2 -lpthread -lrt
 .endif
 
-PLIST_SRC=	${PKGDIR}/PLIST.common
-PLIST_SRC+=	${PKGDIR}/PLIST.${LOWER_OPSYS}
+PLIST_SRC=	${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS}
 
 post-configure:
 	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 21cb95534dd..548c93b2aba 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/10/01 16:42:30 kleink Exp $
+$NetBSD: distinfo,v 1.5 2001/10/25 16:15:44 tron Exp $
 
-SHA1 (openldap-1.2.13.tgz) = 61b2d199754db08e9bef5a3dace443acfc9d3ce2
-Size (openldap-1.2.13.tgz) = 1034063 bytes
-SHA1 (patch-ab) = 74043106a6d933ff627eff5c079f50b9bfc9eef5
+SHA1 (openldap-2.0.17.tgz) = 92643e2b66b1f8480dde21508d16241c78b42e3c
+Size (openldap-2.0.17.tgz) = 1555457 bytes
+SHA1 (patch-aa) = 8577dfc802eda5e789aa7e66ff9bd9cbb1ca1777
+SHA1 (patch-ab) = f2b00ef942da01fda134ac37086f59d371efa152
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
new file mode 100644
index 00000000000..b6cfef64002
--- /dev/null
+++ b/databases/openldap/patches/patch-aa
@@ -0,0 +1,22 @@
+$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
index 3d0a533d5e7..c97107495f0 100644
--- a/databases/openldap/patches/patch-ab
+++ b/databases/openldap/patches/patch-ab
@@ -1,20 +1,42 @@
-$NetBSD: patch-ab,v 1.2 1999/09/10 10:41:41 hwr Exp $
+$NetBSD: patch-ab,v 1.3 2001/10/25 16:15:44 tron Exp $
 
---- build/lib-shared.mk.orig	Fri Jul 23 17:31:32 1999
-+++ build/lib-shared.mk	Fri Sep 10 12:19:58 1999
-@@ -16,9 +16,11 @@
+--- 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) -rpath $(libdir) -o $@ $(OBJS) version.lo
--	$(RM) ../$@;	\
--	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
--	$(RM) ../`$(BASENAME) $@ .la`.a;	\
--	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
+ 	$(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
-+
++	done
  
  Makefile: $(top_srcdir)/build/lib-shared.mk
+ 
diff --git a/databases/openldap/pkg/PLIST.common b/databases/openldap/pkg/PLIST.common
index a8cefdf784c..280c4a5882f 100644
--- a/databases/openldap/pkg/PLIST.common
+++ b/databases/openldap/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2001/01/04 15:10:24 agc Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2001/10/25 16:15:44 tron Exp $
 bin/ud
 bin/ldapsearch
 bin/ldapmodify
@@ -9,13 +9,18 @@ bin/ldapadd
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
-lib/liblber.so.1
-lib/liblber.so.1.0
+lib/liblber.so.2
+lib/liblber.so.2.11
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
-lib/libldap.so.1
-lib/libldap.so.1.0
+lib/libldap.so.2
+lib/libldap.so.2.11
+lib/libldap_r.a
+lib/libldap_r.la
+lib/libldap_r.so
+lib/libldap_r.so.2
+lib/libldap_r.so.2.11
 man/man1/ldapadd.1
 man/man1/ldapdelete.1
 man/man1/ldapmodify.1
@@ -24,11 +29,6 @@ man/man1/ldappasswd.1
 man/man1/ldapsearch.1
 man/man1/ud.1
 man/man3/ldap.3
-man/man3/cldap.3
-man/man3/cldap_close.3
-man/man3/cldap_open.3
-man/man3/cldap_search_s.3
-man/man3/cldap_setretryinfo.3
 man/man3/lber-decode.3
 man/man3/lber-encode.3
 man/man3/ldap_abandon.3
@@ -45,7 +45,6 @@ man/man3/ldap_kerberos_bind1_s.3
 man/man3/ldap_kerberos_bind2.3
 man/man3/ldap_kerberos_bind2_s.3
 man/man3/ldap_unbind_s.3
-man/man3/ldap_set_rebind_proc.3
 man/man3/ldap_cache.3
 man/man3/ldap_enable_cache.3
 man/man3/ldap_disable_cache.3
@@ -54,14 +53,7 @@ man/man3/ldap_flush_cache.3
 man/man3/ldap_uncache_entry.3
 man/man3/ldap_uncache_request.3
 man/man3/ldap_set_cache_options.3
-man/man3/ldap_charset.3
-man/man3/ldap_set_string_translators.3
 man/man3/ld_errno.3
-man/man3/ldap_enable_translation.3
-man/man3/ldap_translate_from_t61.3
-man/man3/ldap_translate_to_t61.3
-man/man3/ldap_t61_to_8859.3
-man/man3/ldap_8859_to_t61.3
 man/man3/ldap_compare.3
 man/man3/ldap_compare_s.3
 man/man3/ldap_delete.3
@@ -99,9 +91,7 @@ man/man3/ldap_friendly_name.3
 man/man3/ldap_free_friendlymap.3
 man/man3/ldap_get_dn.3
 man/man3/ldap_explode_dn.3
-man/man3/ldap_explode_dns.3
 man/man3/ldap_dn2ufn.3
-man/man3/ldap_is_dns_dn.3
 man/man3/ldap_get_values.3
 man/man3/ldap_get_values_len.3
 man/man3/ldap_value_free.3
@@ -154,6 +144,68 @@ man/man3/ldap_free_urldesc.3
 man/man3/ldap_url_search.3
 man/man3/ldap_url_search_s.3
 man/man3/ldap_url_search_st.3
+man/man3/ber_scanf.3
+man/man3/ber_get_next.3
+man/man3/ber_flush.3
+man/man3/ber_skip_tag.3
+man/man3/ber_peek_tag.3
+man/man3/ber_get_int.3
+man/man3/ber_get_stringa.3
+man/man3/ber_get_stringb.3
+man/man3/ber_get_null.3
+man/man3/ber_get_enum.3
+man/man3/ber_get_boolean.3
+man/man3/ber_get_bitstring.3
+man/man3/ber_first_element.3
+man/man3/ber_next_element.3
+man/man3/ber_alloc_t.3
+man/man3/ber_printf.3
+man/man3/ber_put_int.3
+man/man3/ber_put_ostring.3
+man/man3/ber_put_string.3
+man/man3/ber_put_null.3
+man/man3/ber_put_enum.3
+man/man3/ber_start_set.3
+man/man3/ber_put_seq.3
+man/man3/ber_put_set.3
+man/man3/lber-memory.3
+man/man3/lber-types.3
+man/man3/ldap_abandon_ext.3
+man/man3/ldap_add_ext.3
+man/man3/ldap_add_ext_s.3
+man/man3/ldap_sasl_bind.3
+man/man3/ldap_sasl_bind_s.3
+man/man3/ldap_unbind_ext.3
+man/man3/ldap_unbind_ext_s.3
+man/man3/ldap_compare_ext.3
+man/man3/ldap_compare_ext_s.3
+man/man3/ldap_delete_ext.3
+man/man3/ldap_delete_ext_s.3
+man/man3/ldap_explode_rdn.3
+man/man3/ldap_modify_ext.3
+man/man3/ldap_modify_ext_s.3
+man/man3/ldap_msgtype.3
+man/man3/ldap_msgid.3
+man/man3/ldap_schema.3
+man/man3/ldap_str2syntax.3
+man/man3/ldap_syntax2str.3
+man/man3/ldap_syntax2name.3
+man/man3/ldap_syntax_free.3
+man/man3/ldap_str2matchingrule.3
+man/man3/ldap_matchingrule2str.3
+man/man3/ldap_matchingrule2name.3
+man/man3/ldap_matchingrule_free.3
+man/man3/ldap_str2attributetype.3
+man/man3/ldap_attributetype2str.3
+man/man3/ldap_attributetype2name.3
+man/man3/ldap_attributetype_free.3
+man/man3/ldap_str2objectclass.3
+man/man3/ldap_objectclass2str.3
+man/man3/ldap_objectclass2name.3
+man/man3/ldap_objectclass_free.3
+man/man3/ldap_scherr2str.3
+man/man3/ldap_search_ext.3
+man/man3/ldap_search_ext_s.3
 man/man5/ldap.conf.5
 man/man5/ldapfilter.conf.5
 man/man5/ldapfriendly.5
@@ -163,23 +215,17 @@ man/man5/ldif.5
 man/man5/slapd.conf.5
 man/man5/slapd.replog.5
 man/man5/ud.conf.5
-man/man8/centipede.8
-man/man8/chlog2replog.8
-man/man8/edb2ldif.8
 man/man8/go500.8
 man/man8/go500gw.8
+man/man8/slapd.8
 man/man8/in.xfingerd.8
-man/man8/ldapd.8
-man/man8/ldbmcat.8
-man/man8/ldif.8
-man/man8/ldif2ldbm.8
-man/man8/ldif2index.8
-man/man8/ldif2id2entry.8
-man/man8/ldif2id2children.8
 man/man8/mail500.8
 man/man8/fax500.8
 man/man8/rcpt500.8
-man/man8/slapd.8
+man/man8/slapadd.8
+man/man8/slapcat.8
+man/man8/slapindex.8
+man/man8/slappasswd.8
 man/man8/slurpd.8
 etc/openldap/ldap.conf.default
 @exec [ -f %B/ldap.conf ] || cp %D/%F %B/ldap.conf
@@ -191,32 +237,48 @@ etc/openldap/ldapsearchprefs.conf.default
 @exec [ -f %B/ldapsearchprefs.conf ] || cp %D/%F %B/ldapsearchprefs.conf
 etc/openldap/slapd.conf.default
 @exec [ -f %B/slapd.conf ] || cp %D/%F %B/slapd.conf
-etc/openldap/slapd.at.conf.default
-@exec [ -f %B/slapd.at.conf ] || cp %D/%F %B/slapd.at.conf
-etc/openldap/slapd.oc.conf.default
-@exec [ -f %B/slapd.oc.conf ] || cp %D/%F %B/slapd.oc.conf
+etc/openldap/schema/corba.schema.default
+@exec [ -f %B/etc/openldap/schema/corba.schema ] || cp %D/%F %B/etc/openldap/schema/corba.schema
+etc/openldap/schema/core.schema.default
+@exec [ -f %B/etc/openldap/schema/core.schema ] || cp %D/%F %B/etc/openldap/schema/core.schema
+etc/openldap/schema/cosine.schema.default
+@exec [ -f %B/etc/openldap/schema/cosine.schema ] || cp %D/%F %B/etc/openldap/schema/cosine.schema
+etc/openldap/schema/inetorgperson.schema.default
+@exec [ -f %B/etc/openldap/schema/inetorgperson.schema ] || cp %D/%F %B/etc/openldap/schema/inetorgperson.schema
+etc/openldap/schema/java.schema.default
+@exec [ -f %B/etc/openldap/schema/java.schema ] || cp %D/%F %B/etc/openldap/schema/java.schema
+etc/openldap/schema/krb5-kdc.schema.default
+@exec [ -f %B/etc/openldap/schema/krb5-kdc.schema ] || cp %D/%F %B/etc/openldap/schema/krb5-kdc.schema
+etc/openldap/schema/misc.schema.default
+@exec [ -f %B/etc/openldap/schema/misc.schema ] || cp %D/%F %B/etc/openldap/schema/misc.schema
+etc/openldap/schema/nadf.schema.default
+@exec [ -f %B/etc/openldap/schema/nadf.schema ] || cp %D/%F %B/etc/openldap/schema/nadf.schema
+etc/openldap/schema/nis.schema.default
+@exec [ -f %B/etc/openldap/schema/nis.schema ] || cp %D/%F %B/etc/openldap/schema/nis.schema
+etc/openldap/schema/openldap.schema.default
+@exec [ -f %B/etc/openldap/schema/openldap.schema ] || cp %D/%F %B/etc/openldap/schema/openldap.schema
 include/ldap.h
 include/lber.h
+include/lber_types.h
 include/ldap_cdefs.h
+include/ldap_features.h
+include/ldap_schema.h
 include/disptmpl.h
 include/srchpref.h
 libexec/in.xfingerd
 libexec/go500
 libexec/go500gw
 libexec/mail500
+libexec/maildap
 libexec/rp500
 libexec/fax500
 libexec/xrpcomp
 libexec/rcpt500
 libexec/slapd
-sbin/ldif2ldbm
-sbin/ldif2index
-sbin/ldbmcat
-sbin/ldif2id2entry
-sbin/ldif2id2children
-sbin/ldif
-sbin/centipede
-sbin/ldbmtest
+sbin/slapadd
+sbin/slapcat
+sbin/slapindex
+sbin/slappasswd
 share/openldap/ldapfriendly
 share/openldap/go500gw.help
 share/openldap/rcpt500.help