Update openldap packages to OpenLDAP 2.4.7 (forced update for db4-4.6.x

support, reported via PR pkg/37745 ).

OpenLDAP 2.4.x brings a lot of new features, including multi-master support,
dynamic configuration and schema changes, automatic reverse group membership,
significant performance improvements, etc.  One of the most noticeable changes
for administrators though is the removal if the slurpd daemon (in favour of
the sync replication mechanism).  Users of slurpd replication should migrate
to sync replication before upgrading to OpenLDAP 2.4.x.

3 files changed, 43 insertions, 9 deletions

diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index df2c40fddd2..de846198ab3 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/01/04 11:42:30 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/13 17:15:17 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Lightweight Directory Access Protocol libraries and client programs
@@ -8,7 +8,6 @@ CONFLICTS+=		openldap<2.3.23nb1
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFIGURE_ARGS+=	--disable-slapd
-CONFIGURE_ARGS+=	--disable-slurpd
 
 #BUILD_DIRS=		include libraries clients
 
diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST
index ca6976ec465..290697f73ba 100644
--- a/databases/openldap-client/PLIST
+++ b/databases/openldap-client/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/01/13 17:15:17 ghen Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
+bin/ldapexop
 bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
@@ -64,6 +65,7 @@ man/man3/ber_str2bv.3
 man/man3/lber-decode.3
 man/man3/lber-encode.3
 man/man3/lber-memory.3
+man/man3/lber-sockbuf.3
 man/man3/lber-types.3
 man/man3/ld_errno.3
 man/man3/ldap.3
@@ -82,6 +84,13 @@ 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_control_create.3
+man/man3/ldap_control_dup.3
+man/man3/ldap_control_find.3
+man/man3/ldap_control_free.3
+man/man3/ldap_controls.3
+man/man3/ldap_controls_dup.3
+man/man3/ldap_controls_free.3
 man/man3/ldap_count_entries.3
 man/man3/ldap_count_messages.3
 man/man3/ldap_count_references.3
@@ -101,19 +110,30 @@ 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_extended_operation.3
+man/man3/ldap_extended_operation_s.3
 man/man3/ldap_first_attribute.3
 man/man3/ldap_first_entry.3
 man/man3/ldap_first_message.3
 man/man3/ldap_first_reference.3
 man/man3/ldap_free_urldesc.3
 man/man3/ldap_get_dn.3
+man/man3/ldap_get_option.3
 man/man3/ldap_get_values.3
 man/man3/ldap_get_values_len.3
 man/man3/ldap_init.3
+man/man3/ldap_initialize.3
+man/man3/ldap_install_tls.3
 man/man3/ldap_is_ldap_url.3
 man/man3/ldap_matchingrule2name.3
 man/man3/ldap_matchingrule2str.3
 man/man3/ldap_matchingrule_free.3
+man/man3/ldap_memalloc.3
+man/man3/ldap_memcalloc.3
+man/man3/ldap_memfree.3
+man/man3/ldap_memory.3
+man/man3/ldap_memrealloc.3
+man/man3/ldap_memvfree.3
 man/man3/ldap_modify.3
 man/man3/ldap_modify_ext.3
 man/man3/ldap_modify_ext_s.3
@@ -138,7 +158,11 @@ 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_parse_sort_control.3
+man/man3/ldap_parse_vlv_control.3
 man/man3/ldap_perror.3
+man/man3/ldap_rename.3
+man/man3/ldap_rename_s.3
 man/man3/ldap_result.3
 man/man3/ldap_result2error.3
 man/man3/ldap_sasl_bind.3
@@ -150,20 +174,28 @@ 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_set_option.3
+man/man3/ldap_set_rebind_proc.3
 man/man3/ldap_simple_bind.3
 man/man3/ldap_simple_bind_s.3
 man/man3/ldap_sort.3
 man/man3/ldap_sort_entries.3
 man/man3/ldap_sort_strcasecmp.3
 man/man3/ldap_sort_values.3
+man/man3/ldap_start_tls.3
+man/man3/ldap_start_tls_s.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_strdup.3
+man/man3/ldap_sync.3
 man/man3/ldap_syntax2name.3
 man/man3/ldap_syntax2str.3
 man/man3/ldap_syntax_free.3
+man/man3/ldap_tls.3
+man/man3/ldap_tls_inplace.3
 man/man3/ldap_unbind.3
 man/man3/ldap_unbind_ext.3
 man/man3/ldap_unbind_ext_s.3
@@ -175,6 +207,7 @@ man/man3/ldap_value_free_len.3
 man/man5/ldap.conf.5
 man/man5/ldif.5
 man/man5/slapd-bdb.5
+man/man5/slapd-config.5
 man/man5/slapd-dnssrv.5
 man/man5/slapd-hdb.5
 man/man5/slapd-ldap.5
@@ -188,16 +221,19 @@ man/man5/slapd-perl.5
 man/man5/slapd-relay.5
 man/man5/slapd-shell.5
 man/man5/slapd-sql.5
-man/man5/slapd-tcl.5
 man/man5/slapd.access.5
+man/man5/slapd.backends.5
 man/man5/slapd.conf.5
+man/man5/slapd.overlays.5
 man/man5/slapd.plugin.5
-man/man5/slapd.replog.5
 man/man5/slapo-accesslog.5
 man/man5/slapo-auditlog.5
 man/man5/slapo-chain.5
+man/man5/slapo-constraint.5
+man/man5/slapo-dds.5
+man/man5/slapo-dyngroup.5
 man/man5/slapo-dynlist.5
-man/man5/slapo-lastmod.5
+man/man5/slapo-memberof.5
 man/man5/slapo-pcache.5
 man/man5/slapo-ppolicy.5
 man/man5/slapo-refint.5
@@ -216,6 +252,5 @@ man/man8/slapdn.8
 man/man8/slapindex.8
 man/man8/slappasswd.8
 man/man8/slaptest.8
-man/man8/slurpd.8
 share/examples/openldap/ldap.conf
 @dirrm share/examples/openldap
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk
index f3bf196db85..d9dae63a2f5 100644
--- a/databases/openldap-client/buildlink3.mk
+++ b/databases/openldap-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/05/30 08:54:28 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2008/01/13 17:15:17 ghen Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=		${OPENLDAP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=			openldap-client
 BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openldap-client
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.openldap-client+=	openldap-client>=2.3.11nb2
+BUILDLINK_API_DEPENDS.openldap-client+=	openldap-client>=2.4.6
 BUILDLINK_PKGSRCDIR.openldap-client?=	../../databases/openldap-client
 
 # Export the deprecated API from the openldap-2.2.x releases.