Update OpenLDAP packages to 2.4.8 (bugfixes).

OpenLDAP 2.4.8 Release (2008/02/19)
	Fixed ldapmodify verbose logging (ITS#5247)
	Fixed ldapdelete with sizelimit (ITS#5294)
	Fixed ldapdelete with subentries control (ITS#5293)
	Fixed ldapsearch exit code init (ITS#5317)
	Fixed libldap extended decoding (ITS#5304)
	Fixed libldap filter abort (ITS#5300)
	Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
	Fixed libldap result codes for open (ITS#5338)
	Fixed libldap search timeout crash (ITS#5291)
	Fixed libldap paged results crash (ITS#5315)
	Fixed libldap cipher suite with GnuTLS (ITS#5341)
	Fixed slapd support for 2.1 CSN (ITS#5348)
	Fixed slapd include handling (ITS#5276)
	Fixed slapd modrdn check for valid new DN (ITS#5344)
	Fixed slapd multi-step SASL binds (ITS#5298)
	Fixed slapd non-atomic signal variables (ITS#5248)
	Fixed slapd overlay ordering when moving to slapd.d (ITS#5284)
	Fixed slapd NULL printf (ITS#5264)
	Fixed slapd NULL set values (ITS#5286)
	Fixed slapd segv with SASL/OTP (ITS#5259)
	Fixed slapd timestamp race condition (ITS#5370)
	Fixed slapd cn=config crash on delete (ITS#5343)
	Fixed slapd cn=config global acls (ITS#5352)
	Fixed slapd truncated cookie (ITS#5362)
	Fixed slapd sasl with CLEARTEXT (ITS#5368)
	Fixed slapd str2entry with no attrs (ITS#5308)
	Fixed slapd TLSVerifyClient default (ITS#5360)
	Fixed slapd HAVE_TLS dependency (ITS#5379)
	Fixed slapd delta-syncrepl refresh mode (ITS#5376)
	Fixed slapd ACL sets URI attrs (ITS#5384)
	Fixed slapd invalid entryUUID filter (ITS#5386)
	Fixed slapd-bdb idlcache on adds (ITS#5086)
	Fixed slapd-bdb crash with modrdn (ITS#5358)
	Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
	Fixed slapd-bdb modrdn to same dn (ITS#5319)
	Fixed slapd-bdb MMR (ITS#5332)
	Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
	Fixed slapd-ldif delete (ITS#5265)
	Fixed slapd-meta link to slapd-ldap (ITS#5355)
	Fixed slapd-meta setting of sm_nvalues (ITS#5375)
	Fixed slapd-monitor crash (ITS#5311)
	Fixed slapd-relay compare (ITS#4937)
	Added slapd-sock (ITS#4094)
	Fixed slapo-accesslog cleanup on successful response (ITS#5374)
	Added slapo-autogroup contrib module (ITS#5145)
	Added slapo-constraint cross-attribute constraints (ITS#4987)
	Fixed slapo-memberof objectClass inheritance (ITS#5299)
	Added slapo-memberof global overlay support (ITS#5301)
	Fixed slapo-memberof leak (ITS#5302)
	Fixed slapo-ppolicy only password check with policy (ITS#5285)
	Fixed slapo-ppolicy del/replace password without new one (ITS#5373)
	Fixed slapo-syncprov hang on checkpoint (ITS#5261)
	Added slapo-translucent local searching (ITS#5283)
	Removed lint
	Build Environment
		Fixed libldap_r threaded library linking (ITS#4982)
		Fixed libldap use of %n (ITS#5324)
		Fixed test047 to skip if rwm is not available (ITS#5292)
	Documentation
		DB_CONFIG.example URL wrong in comments (ITS#5288)
		Add cn=config example for auditlog (ITS#5245)
		ldapmodify(1) clarification for RFC2849 (ITS#5312)

5 files changed, 23 insertions, 23 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index a829d9b210b..b7683df4b9c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2008/01/13 17:15:16 ghen Exp $
+# $NetBSD: Makefile,v 1.126 2008/02/24 20:15:05 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.4.7
+OPENLDAP_VERSION=	2.4.8
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 284d909b826..6bc3a799a36 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.14 2008/01/13 17:15:16 ghen Exp $
+# $NetBSD: Makefile.common,v 1.15 2008/02/24 20:15:05 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.4.7
+DISTNAME=		openldap-2.4.8
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=		http://www.openldap.org/software/download/OpenLDAP/openldap-release/
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 3fc67922532..7412a5b6e08 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.61 2008/01/13 17:15:16 ghen Exp $
+$NetBSD: distinfo,v 1.62 2008/02/24 20:15:05 ghen Exp $
 
-SHA1 (openldap-2.4.7.tgz) = e12d96327980abbe07c9187f3fd238c47098943a
-RMD160 (openldap-2.4.7.tgz) = 22942db03c278c941de8f00a99f251d378b34bd8
-Size (openldap-2.4.7.tgz) = 4217144 bytes
+SHA1 (openldap-2.4.8.tgz) = d2fdb317a8b89e4c06a4543d35b09249e99e4b6e
+RMD160 (openldap-2.4.8.tgz) = 066ece9c6d4815d1a51bea932eebbcc84ef19f1c
+Size (openldap-2.4.8.tgz) = 4266336 bytes
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
 SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
 SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47
-SHA1 (patch-aj) = 6425a7bf08fa35861d0ea71d893836e177b0b29a
+SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d
 SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
@@ -16,5 +16,5 @@ SHA1 (patch-ba) = 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77
 SHA1 (patch-bb) = 5014662e475e4b9f51d444f01ce45fdeb5f36951
 SHA1 (patch-bd) = e26f7964a71c9b6df216984860acaa22b5a4ba04
 SHA1 (patch-be) = fb828f59b4ff21009c24be94a18c01276feab0b5
-SHA1 (patch-bf) = b4876c573d1176f7ea4b8feb77ea7d05e8238467
+SHA1 (patch-bf) = 09874cc5fcd476b4bc37bcb1ad5b7f833cfcdb94
 SHA1 (patch-bh) = f8660750454c80e7520ed27f1a2e39ecfd266997
diff --git a/databases/openldap/patches/patch-aj b/databases/openldap/patches/patch-aj
index 06e08858bd4..54d533f5936 100644
--- a/databases/openldap/patches/patch-aj
+++ b/databases/openldap/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.2 2005/10/26 15:08:13 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2008/02/24 20:15:05 ghen Exp $
 
---- libraries/libldap_r/Makefile.in.orig	2005-09-27 20:30:28.000000000 -0400
+--- libraries/libldap_r/Makefile.in.orig	2008-02-12 00:26:41.000000000 +0100
 +++ libraries/libldap_r/Makefile.in
 @@ -58,6 +58,10 @@ XXXLIBS = $(LTHREAD_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
  
 +AC_CFLAGS += $(PTHREAD_CFLAGS)
 +AC_LDFLAGS += $(PTHREAD_LDFLAGS)
diff --git a/databases/openldap/patches/patch-bf b/databases/openldap/patches/patch-bf
index 277ca3f386d..4a987233a34 100644
--- a/databases/openldap/patches/patch-bf
+++ b/databases/openldap/patches/patch-bf
@@ -1,17 +1,17 @@
-$NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
+$NetBSD: patch-bf,v 1.5 2008/02/24 20:15:05 ghen Exp $
 
---- configure.orig	2007-10-17 01:58:19.000000000 +0200
+--- configure.orig	2008-02-12 00:36:45.000000000 +0100
 +++ 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_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_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_SOCK 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_SOCK 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.
-@@ -1058,6 +1058,7 @@ SLAPD Overlay Options:
+@@ -1059,6 +1059,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]
@@ -19,7 +19,7 @@ $NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
      --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]
-@@ -3107,6 +3108,7 @@ Overlays="accesslog \
+@@ -3132,6 +3133,7 @@ Overlays="accesslog \
  	retcode \
  	rwm \
  	seqmod \
@@ -27,7 +27,7 @@ $NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
  	syncprov \
  	translucent \
  	unique \
-@@ -3451,6 +3453,30 @@ else
+@@ -3476,6 +3478,30 @@ else
  fi;
  # end --enable-seqmod
  
@@ -58,7 +58,7 @@ $NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
  # OpenLDAP --enable-syncprov
  
  	# Check whether --enable-syncprov or --disable-syncprov was given.
-@@ -3764,6 +3790,7 @@ BUILD_REFINT=no
+@@ -3791,6 +3817,7 @@ BUILD_REFINT=no
  BUILD_RETCODE=no
  BUILD_RWM=no
  BUILD_SEQMOD=no
@@ -66,7 +66,7 @@ $NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
  BUILD_SYNCPROV=no
  BUILD_TRANSLUCENT=no
  BUILD_UNIQUE=no
-@@ -40700,6 +40727,22 @@ _ACEOF
+@@ -40744,6 +40771,22 @@ _ACEOF
  
  fi
  
@@ -89,7 +89,7 @@ $NetBSD: patch-bf,v 1.4 2008/01/13 17:15:17 ghen Exp $
  if test "$ol_enable_syncprov" != no ; then
  	BUILD_SYNCPROV=$ol_enable_syncprov
  	if test "$ol_enable_syncprov" = mod ; then
-@@ -41635,6 +41678,7 @@ s,@BUILD_REFINT@,$BUILD_REFINT,;t t
+@@ -41682,6 +41725,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