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.

4 files changed, 14 insertions, 19 deletions

diff --git a/databases/openldap-server/DESCR b/databases/openldap-server/DESCR
index fed46859f9d..c0f769f5f73 100644
--- a/databases/openldap-server/DESCR
+++ b/databases/openldap-server/DESCR
@@ -2,4 +2,3 @@ OpenLDAP is an open source implementation of the Lightweight Directory Access
 Protocol.  This package includes:
 
 * slapd - stand-alone LDAP daemon (server)
-* slurpd - stand-alone LDAP update replication daemon
diff --git a/databases/openldap-server/MESSAGE b/databases/openldap-server/MESSAGE
index c20319ef011..4cb10394c2d 100644
--- a/databases/openldap-server/MESSAGE
+++ b/databases/openldap-server/MESSAGE
@@ -1,13 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
+$NetBSD: MESSAGE,v 1.2 2008/01/13 17:15:18 ghen Exp $
 
-Note to users who have been running slapd and/or slurpd as root before:
+Note to users who have been running slapd as root before:
 
-As both slapd and slurpd now run unprivileged by default (as ${SLAPD_USER}:${LDAP_GROUP}
-and ${SLURPD_USER}:${LDAP_GROUP}, respectively), you'll have to adapt some permissions:
+As slapd now runs unprivileged by default (as ${SLAPD_USER}:${LDAP_GROUP},
+you'll have to adapt some permissions:
 
   ${CHOWN} -R ${SLAPD_USER}:${LDAP_GROUP} ${OPENLDAP_VARDIR}/openldap-data/*
-  ${CHOWN} -R ${SLURPD_USER}:${LDAP_GROUP} ${OPENLDAP_VARDIR}/openldap-slurp/*
   ${CHOWN} :${LDAP_GROUP} ${OPENLDAP_ETCDIR}/slapd.conf
   ${CHMOD} 640 ${OPENLDAP_ETCDIR}/slapd.conf
 
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index ce75756b76f..3084f48b3ba 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/01/04 11:42:30 ghen Exp $
+# $NetBSD: Makefile,v 1.11 2008/01/13 17:15:18 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		Lightweight Directory Access Protocol server suite
@@ -27,9 +27,6 @@ CONFIGURE_ARGS+=	--enable-shell
 # slapd (stackable) overlays
 CONFIGURE_ARGS+=	--enable-overlays
 
-# slurpd options
-CONFIGURE_ARGS+=	--enable-slurpd
-
 BUILD_DIRS=		include libraries servers
 TEST_DIRS=		tests
 INSTALL_DIRS=		servers
@@ -37,17 +34,15 @@ INSTALL_DIRS=		servers
 BUILD_DEFS+=		OPENLDAP_ETCDIR OPENLDAP_VARDIR
 
 PKG_GROUPS=		${LDAP_GROUP}
-PKG_USERS=		${SLAPD_USER}:${LDAP_GROUP} ${SLURPD_USER}:${LDAP_GROUP}
+PKG_USERS=		${SLAPD_USER}:${LDAP_GROUP}
 
 OPENLDAP_FILEPERMS=	${ROOT_USER} ${LDAP_GROUP} 0640
 SLAPD_DIRPERMS=		${SLAPD_USER} ${LDAP_GROUP} 0700
-SLURPD_DIRPERMS=	${SLURPD_USER} ${LDAP_GROUP} 0770
 RUN_DIRPERMS=		${ROOT_USER} ${LDAP_GROUP} 0775
 
 MAKE_DIRS=		${OPENLDAP_ETCDIR}/schema
 OWN_DIRS+=		${OPENLDAP_VARDIR}
 OWN_DIRS_PERMS=		${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
-OWN_DIRS_PERMS+=	${OPENLDAP_VARDIR}/openldap-slurp ${SLURPD_DIRPERMS}
 OWN_DIRS_PERMS+=	${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
 
 CNFS=			${CNFS_SCHEMAS_cmd:sh}
@@ -57,14 +52,12 @@ CNFS_PERMS=		slapd.conf
 
 DB_CONFIG=		DB_CONFIG
 
-RCD_SCRIPTS=		slapd slurpd
+RCD_SCRIPTS=		slapd
 
 FILES_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
 FILES_SUBST+=		SLAPD_USER=${SLAPD_USER}
-FILES_SUBST+=		SLURPD_USER=${SLURPD_USER}
 
 MESSAGE_SUBST+=		SLAPD_USER=${SLAPD_USER:Q}
-MESSAGE_SUBST+=		SLURPD_USER=${SLURPD_USER:Q}
 MESSAGE_SUBST+=		LDAP_GROUP=${LDAP_GROUP:Q}
 MESSAGE_SUBST+=		OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q}
 MESSAGE_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST
index c04b720a7d5..84fa944726d 100644
--- a/databases/openldap-server/PLIST
+++ b/databases/openldap-server/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/01/13 17:15:18 ghen Exp $
 libexec/slapd
-libexec/slurpd
 sbin/slapacl
 sbin/slapadd
 sbin/slapauth
@@ -11,19 +10,24 @@ sbin/slappasswd
 sbin/slaptest
 share/examples/openldap/DB_CONFIG
 share/examples/openldap/schema/README
+share/examples/openldap/schema/collective.schema
 share/examples/openldap/schema/corba.schema
 share/examples/openldap/schema/core.ldif
 share/examples/openldap/schema/core.schema
+share/examples/openldap/schema/cosine.ldif
 share/examples/openldap/schema/cosine.schema
+share/examples/openldap/schema/duaconf.schema
 share/examples/openldap/schema/dyngroup.schema
+share/examples/openldap/schema/inetorgperson.ldif
 share/examples/openldap/schema/inetorgperson.schema
 share/examples/openldap/schema/java.schema
 share/examples/openldap/schema/misc.schema
+share/examples/openldap/schema/nadf.schema
+share/examples/openldap/schema/nis.ldif
 share/examples/openldap/schema/nis.schema
 share/examples/openldap/schema/openldap.ldif
 share/examples/openldap/schema/openldap.schema
 share/examples/openldap/schema/ppolicy.schema
 share/examples/openldap/slapd.conf
 share/examples/rc.d/slapd
-share/examples/rc.d/slurpd
 @dirrm share/examples/openldap/schema