From 69fa2c3543a6abd0d1a4d06fb1ae40b05222517f Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Tue, 15 Jul 2008 18:25:53 +0000
Subject: [PATCH] Update to OpenLDAP 2.3.42. bug fix release.

ok mbalmer@
---
 databases/openldap/Makefile         |  6 +++---
 databases/openldap/distinfo         | 10 +++++-----
 databases/openldap/pkg/PLIST-main   | 16 ++++++++--------
 databases/openldap/pkg/PLIST-server |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index fb24ac75daf..7fd4cb48f0f 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.83 2008/02/15 12:34:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.84 2008/07/15 18:25:53 brad Exp $
 
 COMMENT-main=	Open source LDAP software (client)
 COMMENT-server=	Open source LDAP software (server)
 
-DISTNAME=		openldap-2.3.39
+DISTNAME=		openldap-2.3.42
 FULLPKGNAME-main=	${DISTNAME:S/-/-client-/}
-PKGNAME-server=		${DISTNAME:S/-/-server-/}p0
+PKGNAME-server=		${DISTNAME:S/-/-server-/}
 
 SHARED_LIBS +=	lber                 9.1      # .2.15
 SHARED_LIBS +=	ldap                 9.1      # .2.15
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 064c6f36648..4b3556dc2d6 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,5 +1,5 @@
-MD5 (openldap-2.3.39.tgz) = 4/7ClTyUj2mQzNw6979/GA==
-RMD160 (openldap-2.3.39.tgz) = zW9lLcaHhsp9K58bLTieIuwX46A=
-SHA1 (openldap-2.3.39.tgz) = 6H5gsSafUddT2I35tRdFpmcwpdQ=
-SHA256 (openldap-2.3.39.tgz) = D8VDG5ylpcOeJ2B2aBEtjpUzqmhGMIclFoLB0ftgtVs=
-SIZE (openldap-2.3.39.tgz) = 3807707
+MD5 (openldap-2.3.42.tgz) = 2zKp4WHTEDM6Oedq+4XOqg==
+RMD160 (openldap-2.3.42.tgz) = kfUiaL3Jujj8OVbVfPy2eW+Poyg=
+SHA1 (openldap-2.3.42.tgz) = e8iSZmMBaDDUqRHaM3ThQQzG+48=
+SHA256 (openldap-2.3.42.tgz) = ekVGzHWfKrlDCxBz7HVMcaaoX+0deB4cOMlqhGD2zOU=
+SIZE (openldap-2.3.42.tgz) = 3802721
diff --git a/databases/openldap/pkg/PLIST-main b/databases/openldap/pkg/PLIST-main
index 8614cb69221..249403247f2 100644
--- a/databases/openldap/pkg/PLIST-main
+++ b/databases/openldap/pkg/PLIST-main
@@ -1,13 +1,13 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2007/01/13 13:37:33 mbalmer Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2008/07/15 18:25:53 brad Exp $
 @pkgpath ${BASE_PKGPATH}
 bin/ldapadd
-bin/ldapcompare
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ldapwhoami
+@bin bin/ldapcompare
+@bin bin/ldapdelete
+@bin bin/ldapmodify
+@bin bin/ldapmodrdn
+@bin bin/ldappasswd
+@bin bin/ldapsearch
+@bin bin/ldapwhoami
 include/lber.h
 include/lber_types.h
 include/ldap.h
diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server
index 696bd8d23f1..41e44d37d99 100644
--- a/databases/openldap/pkg/PLIST-server
+++ b/databases/openldap/pkg/PLIST-server
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST-server,v 1.16 2008/02/13 09:45:54 landry Exp $
+@comment $OpenBSD: PLIST-server,v 1.17 2008/07/15 18:25:53 brad Exp $
 @conflict openldap-client->=2.3.11,<=2.3.11p3
 @newgroup _openldap:544
 @newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
-libexec/slapd
-libexec/slurpd
+@bin libexec/slapd
+@bin libexec/slurpd
 @man man/man5/slapd-bdb.5
 @man man/man5/slapd-dnssrv.5
 @man man/man5/slapd-hdb.5