pkgsrc-users: Major OpenLDAP upgrade coming up

Subject: Major OpenLDAP upgrade coming up
To: None <pkgsrc-users@netbsd.org>
From: Geert Hendrickx <ghen@telenet.be>
List: pkgsrc-users
Date: 12/03/2007 06:38:35
--SUOF0GtieIMvvwua
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

the policy for OpenLDAP has usually been to stick to the latest "stable"
release (currently 2.3.39), which is why I haven't committed the 2.4.6 update
yet, but I've upgraded the openldap-* packages locally and have been running
with 2.4.6 for a while now.  It might be good though if more people could test
the 2.4.x package before it's declared stable and I commit it.  The diffs are
attached.

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.

I'd be especially interested in experiences with dynamic configurations, as
this may require changes to the pkgsrc package to work out-of-the-box  (I'm
still using slapd.conf myself at the moment).

	Geert



--SUOF0GtieIMvvwua
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="openldap.diff"
Content-Transfer-Encoding: quoted-printable

? databases/openldap/changes
Index: databases/openldap/DESCR
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- databases/openldap/DESCR	31 May 2006 18:17:49 -0000	1.2
+++ databases/openldap/DESCR	3 Dec 2007 14:27:52 -0000
@@ -2,7 +2,6 @@
 Protocol.  This package includes:
=20
 * 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
Index: databases/openldap/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- databases/openldap/Makefile	18 Nov 2007 19:46:15 -0000	1.122
+++ databases/openldap/Makefile	3 Dec 2007 14:27:52 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.122 2007/11/18 19:46:15 ghen Exp $
=20
 DISTNAME=3D		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=3D	2.3.39
+OPENLDAP_VERSION=3D	2.4.6
 CATEGORIES=3D		databases
 MASTER_SITES=3D		# empty
 DISTFILES=3D		# empty
Index: databases/openldap/Makefile.common
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- databases/openldap/Makefile.common	23 Nov 2007 08:38:05 -0000	1.12
+++ databases/openldap/Makefile.common	3 Dec 2007 14:27:52 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.12 2007/11/23 08:38:05 dsainty Exp $
=20
 # please stick to the "stable" releases as much as possible!
-DISTNAME=3D		openldap-2.3.39
+DISTNAME=3D		openldap-2.4.6
 CATEGORIES=3D		databases
 MASTER_SITES=3D		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=3D		http://www.openldap.org/software/download/OpenLDAP/openl=
dap-release/
@@ -41,11 +41,10 @@
 OPENLDAP_VARDIR?=3D	${VARBASE}/openldap
=20
 SLAPD_USER?=3D		slapd
-SLURPD_USER?=3D		slurpd
 LDAP_GROUP?=3D		ldap
=20
 PKG_GROUPS_VARS+=3D	LDAP_GROUP
-PKG_USERS_VARS+=3D	SLAPD_USER SLURPD_USER
+PKG_USERS_VARS+=3D	SLAPD_USER
=20
 # the internal avl_* prototypes conflict with those in <sys/avl.h> which
 # is included by another system header file on Solaris, so subst them.
Index: databases/openldap/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/distinfo,v
retrieving revision 1.60
diff -u -r1.60 distinfo
--- databases/openldap/distinfo	18 Nov 2007 21:45:11 -0000	1.60
+++ databases/openldap/distinfo	3 Dec 2007 14:27:52 -0000
@@ -1,21 +1,20 @@
 $NetBSD: distinfo,v 1.60 2007/11/18 21:45:11 ghen Exp $
=20
-SHA1 (openldap-2.3.39.tgz) =3D e87e60b1269f51d753d88df9b51745a66730a5d4
-RMD160 (openldap-2.3.39.tgz) =3D cd6f652dc68786ca7d2b9f1b2d389e22ec17e3a0
-Size (openldap-2.3.39.tgz) =3D 3807707 bytes
+SHA1 (openldap-2.4.6.tgz) =3D 851992b8757cf4c7a5c46699dc93efcb65c7662d
+RMD160 (openldap-2.4.6.tgz) =3D 84483799441c12d5ca0b6523b254673ee79970a1
+Size (openldap-2.4.6.tgz) =3D 4043736 bytes
 SHA1 (patch-ac) =3D 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) =3D 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) =3D 1ae9137e76e885e03d0f44727197a444893ec7c5
 SHA1 (patch-ag) =3D bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
-SHA1 (patch-ah) =3D a4978e4981f79768b1840f4cc2b57d9bd6696412
+SHA1 (patch-ah) =3D ba33845171cef760a68af1406ee2e1dcae7a5a47
 SHA1 (patch-aj) =3D 6425a7bf08fa35861d0ea71d893836e177b0b29a
-SHA1 (patch-ak) =3D 80685a7b46ded94722ea91c2842db424572d6513
 SHA1 (patch-am) =3D 06c17b10bb8cc091461b82fca2b5d6032b613c78
 SHA1 (patch-an) =3D f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) =3D 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-ba) =3D 6e7fb1dd6e17afb2009d0bd1c05059feedfdab77
 SHA1 (patch-bb) =3D 5014662e475e4b9f51d444f01ce45fdeb5f36951
-SHA1 (patch-bd) =3D 27281d5057fd82631600ef2e43ceee4cb918a674
-SHA1 (patch-be) =3D ffe85c7127fa42e4d5f06bfe9dd6cbb9b91850c4
-SHA1 (patch-bf) =3D caace2398744b236712247fa0927f34673c64994
-SHA1 (patch-bh) =3D ec0d59bfebe2b010dd24344b6b95106d35d329e2
+SHA1 (patch-bd) =3D e26f7964a71c9b6df216984860acaa22b5a4ba04
+SHA1 (patch-be) =3D fb828f59b4ff21009c24be94a18c01276feab0b5
+SHA1 (patch-bf) =3D b4876c573d1176f7ea4b8feb77ea7d05e8238467
+SHA1 (patch-bh) =3D f8660750454c80e7520ed27f1a2e39ecfd266997
Index: databases/openldap/files/slurpd.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: databases/openldap/files/slurpd.sh
diff -N databases/openldap/files/slurpd.sh
--- databases/openldap/files/slurpd.sh	31 May 2006 18:17:49 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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=3D"slurpd"
-rcvar=3D${name}
-command=3D"@PREFIX@/libexec/${name}"
-required_files=3D"@OPENLDAP_ETCDIR@/slapd.conf"
-required_vars=3D"slapd"
-slurpd_user=3D"@SLURPD_USER@"
-
-load_rc_config $name
-run_rc_command "$1"
Index: databases/openldap/patches/patch-ah
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-ah,v
retrieving revision 1.6
diff -u -r1.6 patch-ah
--- databases/openldap/patches/patch-ah	6 Aug 2006 09:14:47 -0000	1.6
+++ databases/openldap/patches/patch-ah	3 Dec 2007 14:27:52 -0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.6 2006/08/06 09:14:47 taca Exp $
+$NetBSD$
=20
---- 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
+=20
+ #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
  	{
 -		char	*name =3D ldap_int_hostname;
 +		char	*name;
Index: databases/openldap/patches/patch-ak
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: databases/openldap/patches/patch-ak
diff -N databases/openldap/patches/patch-ak
--- databases/openldap/patches/patch-ak	26 Oct 2005 15:08:13 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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 =3D $(SLURPD_L)
- XXLIBS =3D $(SLURPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS =3D $(LTHREAD_LIBS)
-=20
-+AC_CFLAGS +=3D $(PTHREAD_CFLAGS)
-+AC_LDFLAGS +=3D $(PTHREAD_LDFLAGS)
-+
- slurpd:	version.o
- 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
-=20
Index: databases/openldap/patches/patch-bd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-bd,v
retrieving revision 1.2
diff -u -r1.2 patch-bd
--- databases/openldap/patches/patch-bd	28 Aug 2007 14:08:22 -0000	1.2
+++ databases/openldap/patches/patch-bd	3 Dec 2007 14:27:52 -0000
@@ -1,40 +1,33 @@
-$NetBSD: patch-bd,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD$
=20
---- 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=3D"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    =20
  	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 ov=
erlay],
- 	no, [no yes mod], ol_enable_overlays)
-@@ -627,8 +630,9 @@
- BUILD_PROXYCACHE=3Dno
- BUILD_REFINT=3Dno
+@@ -536,6 +539,7 @@ BUILD_REFINT=3Dno
  BUILD_RETCODE=3Dno
  BUILD_RWM=3Dno
+ BUILD_SEQMOD=3Dno
 +BUILD_SMBK5PWD=3Dno
  BUILD_SYNCPROV=3Dno
  BUILD_TRANSLUCENT=3Dno
  BUILD_UNIQUE=3Dno
- BUILD_VALSORT=3Dno
-@@ -2981,8 +2985,20 @@
- 	fi
+@@ -2793,6 +2797,18 @@ if test "$ol_enable_rwm" !=3D no ; then
  	AC_DEFINE_UNQUOTED(SLAPD_OVER_RWM,$MFLAG,[define for Rewrite/Remap overl=
ay])
  fi
 =20
@@ -50,17 +43,14 @@
 +	AC_DEFINE_UNQUOTED(SLAPD_OVER_SMBK5PWD,$MFLAG,[define for smbk5pwd overl=
ay])
 +fi
 +
- if test "$ol_enable_syncprov" !=3D no ; then
- 	BUILD_SYNCPROV=3D$ol_enable_syncprov
- 	if test "$ol_enable_syncprov" =3D mod ; then
- 		MFLAG=3DSLAPD_MOD_DYNAMIC
-@@ -3099,8 +3115,9 @@
-   AC_SUBST(BUILD_PROXYCACHE)
-   AC_SUBST(BUILD_REFINT)
+ if test "$ol_enable_seqmod" !=3D no ; then
+ 	BUILD_SEQMOD=3D$ol_enable_seqmod
+ 	if test "$ol_enable_seqmod" =3D 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)
Index: databases/openldap/patches/patch-be
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-be,v
retrieving revision 1.2
diff -u -r1.2 patch-be
--- databases/openldap/patches/patch-be	28 Aug 2007 14:08:22 -0000	1.2
+++ databases/openldap/patches/patch-be	3 Dec 2007 14:27:52 -0000
@@ -1,21 +1,18 @@
-$NetBSD: patch-be,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD$
=20
---- 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 =3D 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 @@
-=20
- 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)
 =20
 +smbk5pwd.la : smbk5pwd.lo
 +	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
@@ -23,4 +20,3 @@
  syncprov.la : syncprov.lo
  	$(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
 =20
- translucent.la : translucent.lo
Index: databases/openldap/patches/patch-bf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-bf,v
retrieving revision 1.3
diff -u -r1.3 patch-bf
--- databases/openldap/patches/patch-bf	28 Aug 2007 14:33:27 -0000	1.3
+++ databases/openldap/patches/patch-bf	3 Dec 2007 14:27:53 -0000
@@ -1,42 +1,35 @@
-$NetBSD: patch-bf,v 1.3 2007/08/28 14:33:27 tron Exp $
+$NetBSD$
=20
---- 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=3D"\
  # include <unistd.h>
  #endif"
 =20
--ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendo=
r build_os host host_cpu host_vendor host_os target target_cpu target_vendo=
r target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE V=
ERSION 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_DAT=
E top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OB=
JEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCD=
EPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANL=
IB 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_LIB=
S_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_A=
UDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLI=
CY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SYNCPROV BUI=
LD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS=
 SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPF=
LAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNA=
MIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLA=
PD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MOD=
ULES_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=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendo=
r build_os host host_cpu host_vendor host_os target target_cpu target_vendo=
r target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE V=
ERSION 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_DAT=
E top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OB=
JEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCD=
EPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANL=
IB 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_LIB=
S_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_A=
UDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLI=
CY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SMBK5PWD BUI=
LD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_=
LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLA=
PD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACK=
ENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PE=
RL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LI=
BS 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=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendo=
r build_os host host_cpu host_vendor host_os target target_cpu target_vendo=
r target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE V=
ERSION 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_DAT=
E top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OB=
JEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCD=
EPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANL=
IB 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_LIB=
S_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV=
 BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUIL=
D_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUI=
LD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LAS=
TMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCO=
DE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUI=
LD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS =
SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_B=
ACKENDS 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=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendo=
r build_os host host_cpu host_vendor host_os target target_cpu target_vendo=
r target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE V=
ERSION 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_DAT=
E top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OB=
JEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCD=
EPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANL=
IB 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_LIB=
S_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV=
 BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUIL=
D_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUI=
LD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LAS=
TMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCO=
DE BUILD_RWM BUILD_SEQMOD BUILD_SMBK5PWD BUILD_SYNCPROV BUILD_TRANSLUCENT B=
UILD_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_D=
YNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS=
 KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOL=
S AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_=
SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
  ac_subst_files=3D''
 =20
  # Initialize some variables set by options.
- ac_init_help=3D
-@@ -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=3D"accesslog \
  	retcode \
  	rwm \
+ 	seqmod \
 +	smbk5pwd \
  	syncprov \
  	translucent \
  	unique \
- 	valsort"
-@@ -3471,8 +3473,32 @@
-   	ol_enable_rwm=3D${ol_enable_overlays:-no}
+@@ -3451,6 +3453,30 @@ else
  fi;
- # end --enable-rwm
+ # end --enable-seqmod
 =20
 +# OpenLDAP --enable-smbk5pwd
 +
@@ -65,19 +58,15 @@
  # OpenLDAP --enable-syncprov
 =20
  	# Check whether --enable-syncprov or --disable-syncprov was given.
- if test "${enable_syncprov+set}" =3D set; then
-@@ -3907,8 +3933,9 @@
- BUILD_PROXYCACHE=3Dno
- BUILD_REFINT=3Dno
+@@ -3764,6 +3790,7 @@ BUILD_REFINT=3Dno
  BUILD_RETCODE=3Dno
  BUILD_RWM=3Dno
+ BUILD_SEQMOD=3Dno
 +BUILD_SMBK5PWD=3Dno
  BUILD_SYNCPROV=3Dno
  BUILD_TRANSLUCENT=3Dno
  BUILD_UNIQUE=3Dno
- BUILD_VALSORT=3Dno
-@@ -44870,8 +44897,24 @@
- _ACEOF
+@@ -40700,6 +40727,22 @@ _ACEOF
 =20
  fi
 =20
@@ -100,14 +89,11 @@
  if test "$ol_enable_syncprov" !=3D no ; then
  	BUILD_SYNCPROV=3D$ol_enable_syncprov
  	if test "$ol_enable_syncprov" =3D mod ; then
- 		MFLAG=3DSLAPD_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
Index: databases/openldap/patches/patch-bh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-bh,v
retrieving revision 1.2
diff -u -r1.2 patch-bh
--- databases/openldap/patches/patch-bh	28 Aug 2007 14:08:22 -0000	1.2
+++ databases/openldap/patches/patch-bh	3 Dec 2007 14:27:53 -0000
@@ -1,11 +1,10 @@
-$NetBSD: patch-bh,v 1.2 2007/08/28 14:08:22 tron Exp $
+$NetBSD$
=20
---- 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 @@
-=20
- /* 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
 =20
 +/* define for smbk5pwd overlay */
 +#undef SLAPD_OVER_SMBK5PWD
@@ -13,4 +12,3 @@
  /* define for Syncrepl Provider overlay */
  #undef SLAPD_OVER_SYNCPROV
 =20
- /* define for Translucent Proxy overlay */
Index: databases/openldap-client/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-client/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- databases/openldap-client/Makefile	2 Jan 2007 11:29:15 -0000	1.4
+++ databases/openldap-client/Makefile	3 Dec 2007 14:27:53 -0000
@@ -6,7 +6,6 @@
 CONFLICTS+=3D		openldap<2.3.23nb1
=20
 CONFIGURE_ARGS+=3D	--disable-slapd
-CONFIGURE_ARGS+=3D	--disable-slurpd
=20
 #BUILD_DIRS=3D		include libraries clients
=20
Index: databases/openldap-client/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-client/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- databases/openldap-client/PLIST	31 May 2006 18:18:34 -0000	1.1.1.1
+++ databases/openldap-client/PLIST	3 Dec 2007 14:27:53 -0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
+@comment $NetBSD$
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
+bin/ldapexop
 bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
@@ -64,6 +65,7 @@
 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_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_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_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_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/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-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/slapindex.8
 man/man8/slappasswd.8
 man/man8/slaptest.8
-man/man8/slurpd.8
 share/examples/openldap/ldap.conf
 @dirrm share/examples/openldap
Index: databases/openldap-doc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-doc/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- databases/openldap-doc/Makefile	18 Nov 2007 19:46:16 -0000	1.8
+++ databases/openldap-doc/Makefile	3 Dec 2007 14:27:53 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2007/11/18 19:46:16 ghen Exp $
=20
-DISTNAME=3D		openldap-2.3.39
+DISTNAME=3D		openldap-2.4.6
 PKGNAME=3D		${DISTNAME:S/-/-doc-/}
 CATEGORIES=3D		databases
 MASTER_SITES=3D		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -30,9 +30,8 @@
 NO_BUILD=3D		yes
=20
 DOCDIR=3D			${PREFIX}/share/doc/openldap
-IMAGES=3D			config_dit.gif config_local.gif config_ref.gif
-IMAGES+=3D		config_repl.gif config_x500fe.gif config_x500ref.gif
-IMAGES+=3D		intro_dctree.gif intro_tree.gif replication.gif
+IMAGES=3D			config_dit.png config_local.png config_ref.png
+IMAGES+=3D		config_repl.gif intro_dctree.png intro_tree.png
=20
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
Index: databases/openldap-doc/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-doc/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- databases/openldap-doc/PLIST	31 May 2006 18:18:38 -0000	1.1.1.1
+++ databases/openldap-doc/PLIST	3 Dec 2007 14:27:53 -0000
@@ -2,16 +2,13 @@
 share/doc/openldap/COPYRIGHT
 share/doc/openldap/LICENSE
 share/doc/openldap/README
-share/doc/openldap/admin/config_dit.gif
-share/doc/openldap/admin/config_local.gif
-share/doc/openldap/admin/config_ref.gif
+share/doc/openldap/admin/config_dit.png
+share/doc/openldap/admin/config_local.png
+share/doc/openldap/admin/config_ref.png
 share/doc/openldap/admin/config_repl.gif
-share/doc/openldap/admin/config_x500fe.gif
-share/doc/openldap/admin/config_x500ref.gif
 share/doc/openldap/admin/guide.html
-share/doc/openldap/admin/intro_dctree.gif
-share/doc/openldap/admin/intro_tree.gif
-share/doc/openldap/admin/replication.gif
+share/doc/openldap/admin/intro_dctree.png
+share/doc/openldap/admin/intro_tree.png
 share/doc/openldap/images/LDAPlogo.gif
 share/doc/openldap/images/LDAPwww.gif
 @dirrm share/doc/openldap/images
Index: databases/openldap-server/DESCR
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-server/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- databases/openldap-server/DESCR	31 May 2006 18:18:36 -0000	1.1.1.1
+++ databases/openldap-server/DESCR	3 Dec 2007 14:27:53 -0000
@@ -2,4 +2,3 @@
 Protocol.  This package includes:
=20
 * slapd - stand-alone LDAP daemon (server)
-* slurpd - stand-alone LDAP update replication daemon
Index: databases/openldap-server/MESSAGE
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-server/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE
--- databases/openldap-server/MESSAGE	31 May 2006 18:18:36 -0000	1.1.1.1
+++ databases/openldap-server/MESSAGE	3 Dec 2007 14:27:53 -0000
@@ -1,13 +1,12 @@
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
 $NetBSD: MESSAGE,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
=20
-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:
=20
-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:
=20
   ${CHOWN} -R ${SLAPD_USER}:${LDAP_GROUP} ${OPENLDAP_VARDIR}/openldap-data=
/*
-  ${CHOWN} -R ${SLURPD_USER}:${LDAP_GROUP} ${OPENLDAP_VARDIR}/openldap-slu=
rp/*
   ${CHOWN} :${LDAP_GROUP} ${OPENLDAP_ETCDIR}/slapd.conf
   ${CHMOD} 640 ${OPENLDAP_ETCDIR}/slapd.conf
=20
Index: databases/openldap-server/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-server/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- databases/openldap-server/Makefile	2 Sep 2007 13:04:38 -0000	1.9
+++ databases/openldap-server/Makefile	3 Dec 2007 14:27:53 -0000
@@ -25,9 +25,6 @@
 # slapd (stackable) overlays
 CONFIGURE_ARGS+=3D	--enable-overlays
=20
-# slurpd options
-CONFIGURE_ARGS+=3D	--enable-slurpd
-
 BUILD_DIRS=3D		include libraries servers
 TEST_DIRS=3D		tests
 INSTALL_DIRS=3D		servers
@@ -35,17 +32,15 @@
 BUILD_DEFS+=3D		OPENLDAP_ETCDIR OPENLDAP_VARDIR
=20
 PKG_GROUPS=3D		${LDAP_GROUP}
-PKG_USERS=3D		${SLAPD_USER}:${LDAP_GROUP} ${SLURPD_USER}:${LDAP_GROUP}
+PKG_USERS=3D		${SLAPD_USER}:${LDAP_GROUP}
=20
 OPENLDAP_FILEPERMS=3D	${ROOT_USER} ${LDAP_GROUP} 0640
 SLAPD_DIRPERMS=3D		${SLAPD_USER} ${LDAP_GROUP} 0700
-SLURPD_DIRPERMS=3D	${SLURPD_USER} ${LDAP_GROUP} 0770
 RUN_DIRPERMS=3D		${ROOT_USER} ${LDAP_GROUP} 0775
=20
 MAKE_DIRS=3D		${OPENLDAP_ETCDIR}/schema
 OWN_DIRS+=3D		${OPENLDAP_VARDIR}
 OWN_DIRS_PERMS=3D		${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
-OWN_DIRS_PERMS+=3D	${OPENLDAP_VARDIR}/openldap-slurp ${SLURPD_DIRPERMS}
 OWN_DIRS_PERMS+=3D	${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
=20
 CNFS=3D			${CNFS_SCHEMAS_cmd:sh}
@@ -55,14 +50,12 @@
=20
 DB_CONFIG=3D		DB_CONFIG
=20
-RCD_SCRIPTS=3D		slapd slurpd
+RCD_SCRIPTS=3D		slapd
=20
 FILES_SUBST+=3D		OPENLDAP_ETCDIR=3D${OPENLDAP_ETCDIR:Q}
 FILES_SUBST+=3D		SLAPD_USER=3D${SLAPD_USER}
-FILES_SUBST+=3D		SLURPD_USER=3D${SLURPD_USER}
=20
 MESSAGE_SUBST+=3D		SLAPD_USER=3D${SLAPD_USER:Q}
-MESSAGE_SUBST+=3D		SLURPD_USER=3D${SLURPD_USER:Q}
 MESSAGE_SUBST+=3D		LDAP_GROUP=3D${LDAP_GROUP:Q}
 MESSAGE_SUBST+=3D		OPENLDAP_VARDIR=3D${OPENLDAP_VARDIR:Q}
 MESSAGE_SUBST+=3D		OPENLDAP_ETCDIR=3D${OPENLDAP_ETCDIR:Q}
Index: databases/openldap-server/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/databases/openldap-server/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- databases/openldap-server/PLIST	31 May 2006 18:18:36 -0000	1.1.1.1
+++ databases/openldap-server/PLIST	3 Dec 2007 14:27:53 -0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
+@comment $NetBSD$
 libexec/slapd
-libexec/slurpd
 sbin/slapacl
 sbin/slapadd
 sbin/slapauth
@@ -11,19 +10,24 @@
 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

--SUOF0GtieIMvvwua--