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.

11 files changed, 66 insertions, 133 deletions

diff --git a/databases/openldap/DESCR b/databases/openldap/DESCR
index 7dcd75c3d2f..4b4c91698d3 100644
--- a/databases/openldap/DESCR
+++ b/databases/openldap/DESCR
@@ -2,7 +2,6 @@ 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
 * libraries implementing the LDAP protocol
 * utilities, tools, and sample clients
 * administration guide
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f5559bdaec6..a829d9b210b 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.124 2008/01/05 18:03:43 ghen Exp $
+# $NetBSD: Makefile,v 1.125 2008/01/13 17:15:16 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.3.39
+OPENLDAP_VERSION=	2.4.7
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 44fefa3d5cc..284d909b826 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2008/01/04 11:42:29 ghen Exp $
+# $NetBSD: Makefile.common,v 1.14 2008/01/13 17:15:16 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.3.39
+DISTNAME=		openldap-2.4.7
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=		http://www.openldap.org/software/download/OpenLDAP/openldap-release/
@@ -41,11 +41,10 @@ OPENLDAP_MODULEDIR=	${PREFIX}/lib/openldap
 OPENLDAP_VARDIR?=	${VARBASE}/openldap
 
 SLAPD_USER?=		slapd
-SLURPD_USER?=		slurpd
 LDAP_GROUP?=		ldap
 
 PKG_GROUPS_VARS+=	LDAP_GROUP
-PKG_USERS_VARS+=	SLAPD_USER SLURPD_USER
+PKG_USERS_VARS+=	SLAPD_USER
 
 # the internal avl_* prototypes conflict with those in <sys/avl.h> which
 # is included by another system header file on Solaris, so subst them.
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 5cea59fb274..3fc67922532 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.60 2007/11/18 21:45:11 ghen Exp $
+$NetBSD: distinfo,v 1.61 2008/01/13 17:15:16 ghen Exp $
 
-SHA1 (openldap-2.3.39.tgz) = e87e60b1269f51d753d88df9b51745a66730a5d4
-RMD160 (openldap-2.3.39.tgz) = cd6f652dc68786ca7d2b9f1b2d389e22ec17e3a0
-Size (openldap-2.3.39.tgz) = 3807707 bytes
+SHA1 (openldap-2.4.7.tgz) = e12d96327980abbe07c9187f3fd238c47098943a
+RMD160 (openldap-2.4.7.tgz) = 22942db03c278c941de8f00a99f251d378b34bd8
+Size (openldap-2.4.7.tgz) = 4217144 bytes
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
 SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
-SHA1 (patch-ah) = a4978e4981f79768b1840f4cc2b57d9bd6696412
+SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47
 SHA1 (patch-aj) = 6425a7bf08fa35861d0ea71d893836e177b0b29a
-SHA1 (patch-ak) = 80685a7b46ded94722ea91c2842db424572d6513
 SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-ba) = 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77
 SHA1 (patch-bb) = 5014662e475e4b9f51d444f01ce45fdeb5f36951
-SHA1 (patch-bd) = 27281d5057fd82631600ef2e43ceee4cb918a674
-SHA1 (patch-be) = ffe85c7127fa42e4d5f06bfe9dd6cbb9b91850c4
-SHA1 (patch-bf) = caace2398744b236712247fa0927f34673c64994
-SHA1 (patch-bh) = ec0d59bfebe2b010dd24344b6b95106d35d329e2
+SHA1 (patch-bd) = e26f7964a71c9b6df216984860acaa22b5a4ba04
+SHA1 (patch-be) = fb828f59b4ff21009c24be94a18c01276feab0b5
+SHA1 (patch-bf) = b4876c573d1176f7ea4b8feb77ea7d05e8238467
+SHA1 (patch-bh) = f8660750454c80e7520ed27f1a2e39ecfd266997
diff --git a/databases/openldap/files/slurpd.sh b/databases/openldap/files/slurpd.sh
deleted file mode 100644
index bc658409861..00000000000
--- a/databases/openldap/files/slurpd.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: slurpd.sh,v 1.4 2006/05/31 18:17:49 ghen Exp $
-#
-# OpenLDAP LDAP database replication daemon
-#
-# PROVIDE: slurpd
-# REQUIRE: slapd
-
-. /etc/rc.subr
-
-name="slurpd"
-rcvar=${name}
-command="@PREFIX@/libexec/${name}"
-required_files="@OPENLDAP_ETCDIR@/slapd.conf"
-required_vars="slapd"
-slurpd_user="@SLURPD_USER@"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/databases/openldap/patches/patch-ah b/databases/openldap/patches/patch-ah
index 91924fff8e8..a75fb2a2d3c 100644
--- a/databases/openldap/patches/patch-ah
+++ b/databases/openldap/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.6 2006/08/06 09:14:47 taca Exp $
+$NetBSD: patch-ah,v 1.7 2008/01/13 17:15:16 ghen Exp $
 
---- libraries/libldap/init.c.orig	2006-05-13 11:47:50.000000000 +0200
+--- libraries/libldap/init.c.orig	2007-09-01 01:13:55.000000000 +0200
 +++ libraries/libldap/init.c
-@@ -544,7 +544,11 @@
- #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
- 	|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+@@ -581,7 +581,11 @@ void ldap_int_initialize( struct ldapopt
+ 
+ #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
  	{
 -		char	*name = ldap_int_hostname;
 +		char	*name;
diff --git a/databases/openldap/patches/patch-ak b/databases/openldap/patches/patch-ak
deleted file mode 100644
index 0f638e0d91a..00000000000
--- a/databases/openldap/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/10/26 15:08:13 jlam Exp $
-
---- servers/slurpd/Makefile.in.orig	2005-05-06 12:42:53.000000000 -0400
-+++ servers/slurpd/Makefile.in
-@@ -43,6 +43,9 @@ XLIBS = $(SLURPD_L)
- XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- 
-+AC_CFLAGS += $(PTHREAD_CFLAGS)
-+AC_LDFLAGS += $(PTHREAD_LDFLAGS)
-+
- slurpd:	version.o
- 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
- 
diff --git a/databases/openldap/patches/patch-bd b/databases/openldap/patches/patch-bd
index 3cb072f86aa..45cdd541694 100644
--- a/databases/openldap/patches/patch-bd
+++ b/databases/openldap/patches/patch-bd
@@ -1,40 +1,33 @@
-$NetBSD: patch-bd,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD: patch-bd,v 1.3 2008/01/13 17:15:17 ghen Exp $
 
---- configure.in.orig	2007-08-24 05:32:07.000000000 +0200
-+++ configure.in	2007-08-24 05:34:02.000000000 +0200
-@@ -350,8 +350,9 @@
- 	proxycache \
- 	refint \
+--- configure.in.orig	2007-10-17 01:43:09.000000000 +0200
++++ configure.in
+@@ -338,6 +338,7 @@ Overlays="accesslog \
  	retcode \
  	rwm \
+ 	seqmod \
 +	smbk5pwd \
  	syncprov \
  	translucent \
  	unique \
- 	valsort"
-@@ -382,8 +383,10 @@
- OL_ARG_ENABLE(retcode,[    --enable-retcode	  Return Code testing overlay],
- 	no, [no yes mod], ol_enable_overlays)
- OL_ARG_ENABLE(rwm,[    --enable-rwm       	  Rewrite/Remap overlay],
+@@ -374,6 +375,8 @@ OL_ARG_ENABLE(rwm,[    --enable-rwm     
  	no, [no yes mod], ol_enable_overlays)
+ OL_ARG_ENABLE(seqmod,[    --enable-seqmod	  Sequential Modify overlay],
+ 	yes, [no yes mod], ol_enable_overlays)
 +OL_ARG_ENABLE(smbk5pwd,[    --enable-smbk5pwd	  smbk5pwd overlay],
 +	yes, [no yes mod], ol_enable_overlays)
  OL_ARG_ENABLE(syncprov,[    --enable-syncprov	  Syncrepl Provider overlay],
  	yes, [no yes mod], ol_enable_overlays)
  OL_ARG_ENABLE(translucent,[    --enable-translucent  Translucent Proxy overlay],
- 	no, [no yes mod], ol_enable_overlays)
-@@ -627,8 +630,9 @@
- BUILD_PROXYCACHE=no
- BUILD_REFINT=no
+@@ -536,6 +539,7 @@ BUILD_REFINT=no
  BUILD_RETCODE=no
  BUILD_RWM=no
+ BUILD_SEQMOD=no
 +BUILD_SMBK5PWD=no
  BUILD_SYNCPROV=no
  BUILD_TRANSLUCENT=no
  BUILD_UNIQUE=no
- BUILD_VALSORT=no
-@@ -2981,8 +2985,20 @@
- 	fi
+@@ -2793,6 +2797,18 @@ if test "$ol_enable_rwm" != no ; then
  	AC_DEFINE_UNQUOTED(SLAPD_OVER_RWM,$MFLAG,[define for Rewrite/Remap overlay])
  fi
  
@@ -50,17 +43,14 @@ $NetBSD: patch-bd,v 1.2 2007/08/28 14:08:22 tron Exp $
 +	AC_DEFINE_UNQUOTED(SLAPD_OVER_SMBK5PWD,$MFLAG,[define for smbk5pwd overlay])
 +fi
 +
- if test "$ol_enable_syncprov" != no ; then
- 	BUILD_SYNCPROV=$ol_enable_syncprov
- 	if test "$ol_enable_syncprov" = mod ; then
- 		MFLAG=SLAPD_MOD_DYNAMIC
-@@ -3099,8 +3115,9 @@
-   AC_SUBST(BUILD_PROXYCACHE)
-   AC_SUBST(BUILD_REFINT)
+ if test "$ol_enable_seqmod" != no ; then
+ 	BUILD_SEQMOD=$ol_enable_seqmod
+ 	if test "$ol_enable_seqmod" = mod ; then
+@@ -2920,6 +2936,7 @@ dnl overlays
    AC_SUBST(BUILD_RETCODE)
    AC_SUBST(BUILD_RWM)
+   AC_SUBST(BUILD_SEQMOD)
 +  AC_SUBST(BUILD_SMBK5PWD)
    AC_SUBST(BUILD_SYNCPROV)
    AC_SUBST(BUILD_TRANSLUCENT)
    AC_SUBST(BUILD_UNIQUE)
-   AC_SUBST(BUILD_VALSORT)
diff --git a/databases/openldap/patches/patch-be b/databases/openldap/patches/patch-be
index 4ef6339c32b..bf3cd9934e4 100644
--- a/databases/openldap/patches/patch-be
+++ b/databases/openldap/patches/patch-be
@@ -1,21 +1,18 @@
-$NetBSD: patch-be,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD: patch-be,v 1.3 2008/01/13 17:15:17 ghen Exp $
 
---- servers/slapd/overlays/Makefile.in.orig	2007-08-24 05:35:05.000000000 +0200
-+++ servers/slapd/overlays/Makefile.in	2007-08-24 05:35:38.000000000 +0200
-@@ -24,8 +24,9 @@
- 	ppolicy.c \
- 	refint.c \
+--- servers/slapd/overlays/Makefile.in.orig	2007-10-23 23:25:37.000000000 +0200
++++ servers/slapd/overlays/Makefile.in
+@@ -27,6 +27,7 @@ SRCS = overlays.c \
  	retcode.c \
  	rwm.c rwmconf.c rwmdn.c rwmmap.c \
+ 	seqmod.c \
 +	smbk5pwd.c \
  	syncprov.c \
  	translucent.c \
  	unique.c \
- 	valsort.c
-@@ -92,8 +93,11 @@
- 
- rwm.la : rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo
- 	$(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo version.lo $(LINK_LIBS)
+@@ -101,6 +102,9 @@ rwm.la : rwm.lo rwmconf.lo rwmdn.lo rwmm
+ seqmod.la : seqmod.lo
+ 	$(LTLINK_MOD) -module -o $@ seqmod.lo version.lo $(LINK_LIBS)
  
 +smbk5pwd.la : smbk5pwd.lo
 +	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
@@ -23,4 +20,3 @@ $NetBSD: patch-be,v 1.2 2007/08/28 14:08:22 tron Exp $
  syncprov.la : syncprov.lo
  	$(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
  
- translucent.la : translucent.lo
diff --git a/databases/openldap/patches/patch-bf b/databases/openldap/patches/patch-bf
index e90cc344da7..277ca3f386d 100644
--- a/databases/openldap/patches/patch-bf
+++ b/databases/openldap/patches/patch-bf
@@ -1,42 +1,35 @@
-$NetBSD: patch-bf,v 1.3 2007/08/28 14:33:27 tron Exp $
+$NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
 
---- configure.orig	2007-08-24 06:20:33.000000000 +0200
-+++ configure	2007-08-24 06:23:02.000000000 +0200
-@@ -464,9 +464,9 @@
- #if HAVE_UNISTD_H
+--- configure.orig	2007-10-17 01:58:19.000000000 +0200
++++ configure
+@@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SMBK5PWD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SMBK5PWD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
- ac_init_help=
-@@ -1057,8 +1057,9 @@
-     --enable-proxycache	  Proxy Cache overlay no|yes|mod [no]
-     --enable-refint	  Referential Integrity overlay no|yes|mod [no]
+@@ -1058,6 +1058,7 @@ SLAPD Overlay Options:
      --enable-retcode	  Return Code testing overlay no|yes|mod [no]
      --enable-rwm       	  Rewrite/Remap overlay no|yes|mod [no]
+     --enable-seqmod	  Sequential Modify overlay no|yes|mod [yes]
 +    --enable-smbk5pwd	  smbk5pwd overlay no|yes|mod [yes]
      --enable-syncprov	  Syncrepl Provider overlay no|yes|mod [yes]
      --enable-translucent  Translucent Proxy overlay no|yes|mod [no]
      --enable-unique       Attribute Uniqueness overlay no|yes|mod [no]
-     --enable-valsort      Value Sorting overlay no|yes|mod [no]
-@@ -3175,8 +3176,9 @@
- 	proxycache \
- 	refint \
+@@ -3107,6 +3108,7 @@ Overlays="accesslog \
  	retcode \
  	rwm \
+ 	seqmod \
 +	smbk5pwd \
  	syncprov \
  	translucent \
  	unique \
- 	valsort"
-@@ -3471,8 +3473,32 @@
-   	ol_enable_rwm=${ol_enable_overlays:-no}
+@@ -3451,6 +3453,30 @@ else
  fi;
- # end --enable-rwm
+ # end --enable-seqmod
  
 +# OpenLDAP --enable-smbk5pwd
 +
@@ -65,19 +58,15 @@ $NetBSD: patch-bf,v 1.3 2007/08/28 14:33:27 tron Exp $
  # OpenLDAP --enable-syncprov
  
  	# Check whether --enable-syncprov or --disable-syncprov was given.
- if test "${enable_syncprov+set}" = set; then
-@@ -3907,8 +3933,9 @@
- BUILD_PROXYCACHE=no
- BUILD_REFINT=no
+@@ -3764,6 +3790,7 @@ BUILD_REFINT=no
  BUILD_RETCODE=no
  BUILD_RWM=no
+ BUILD_SEQMOD=no
 +BUILD_SMBK5PWD=no
  BUILD_SYNCPROV=no
  BUILD_TRANSLUCENT=no
  BUILD_UNIQUE=no
- BUILD_VALSORT=no
-@@ -44870,8 +44897,24 @@
- _ACEOF
+@@ -40700,6 +40727,22 @@ _ACEOF
  
  fi
  
@@ -100,14 +89,11 @@ $NetBSD: patch-bf,v 1.3 2007/08/28 14:33:27 tron Exp $
  if test "$ol_enable_syncprov" != no ; then
  	BUILD_SYNCPROV=$ol_enable_syncprov
  	if test "$ol_enable_syncprov" = mod ; then
- 		MFLAG=SLAPD_MOD_DYNAMIC
-@@ -45808,8 +45851,9 @@
- s,@BUILD_PROXYCACHE@,$BUILD_PROXYCACHE,;t t
- s,@BUILD_REFINT@,$BUILD_REFINT,;t t
+@@ -41635,6 +41678,7 @@ s,@BUILD_REFINT@,$BUILD_REFINT,;t t
  s,@BUILD_RETCODE@,$BUILD_RETCODE,;t t
  s,@BUILD_RWM@,$BUILD_RWM,;t t
+ s,@BUILD_SEQMOD@,$BUILD_SEQMOD,;t t
 +s,@BUILD_SMBK5PWD@,$BUILD_SMBK5PWD,;t t
  s,@BUILD_SYNCPROV@,$BUILD_SYNCPROV,;t t
  s,@BUILD_TRANSLUCENT@,$BUILD_TRANSLUCENT,;t t
  s,@BUILD_UNIQUE@,$BUILD_UNIQUE,;t t
- s,@BUILD_VALSORT@,$BUILD_VALSORT,;t t
diff --git a/databases/openldap/patches/patch-bh b/databases/openldap/patches/patch-bh
index b5fb97336a0..9f28775acfe 100644
--- a/databases/openldap/patches/patch-bh
+++ b/databases/openldap/patches/patch-bh
@@ -1,11 +1,10 @@
-$NetBSD: patch-bh,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD: patch-bh,v 1.3 2008/01/13 17:15:17 ghen Exp $
 
---- include/portable.hin.orig	2007-08-24 18:05:46.000000000 +0200
-+++ include/portable.hin	2007-08-24 18:06:10.000000000 +0200
-@@ -1001,8 +1001,11 @@
- 
- /* define for Rewrite/Remap overlay */
- #undef SLAPD_OVER_RWM
+--- include/portable.hin.orig	2007-09-01 01:13:53.000000000 +0200
++++ include/portable.hin
+@@ -987,6 +987,9 @@
+ /* define for Sequential Modify overlay */
+ #undef SLAPD_OVER_SEQMOD
  
 +/* define for smbk5pwd overlay */
 +#undef SLAPD_OVER_SMBK5PWD
@@ -13,4 +12,3 @@ $NetBSD: patch-bh,v 1.2 2007/08/28 14:08:22 tron Exp $
  /* define for Syncrepl Provider overlay */
  #undef SLAPD_OVER_SYNCPROV
  
- /* define for Translucent Proxy overlay */