From 65c2e49f461d2c93d64a1fa5f610a33a0f43b742 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Thu, 17 Mar 2011 14:09:20 +0000
Subject: update to 2.4.24 changes: -Added LDIF line wrapping setting -Added
 libldap cert x500UniqueIdentifier handling -Added libldap_r,libldap formal
 concurrency API -Added slapadd attribute value checking -Added slapcat
 continue mode for problematic DBs -Added slapd syncrepl suffixmassage support
 -Added slapd multiple listener threads -Added slapd extensible match for
 ordering rules -Added slapd-meta paged results control forwarding -Added
 slapd-meta subtree-include support -Added slapd-null back-config support
 -Added slapd-sql autocommit support -Added slapd-sql support for long long
 keys -Added slapo-sssvlv multiple sorts per connection -many bugfixes
 -documentation improvements

approved by Geert Hendrickx (the MAINTAINER)
---
 databases/openldap/Makefile.common  |  4 ++--
 databases/openldap/distinfo         |  9 ++++-----
 databases/openldap/patches/patch-aa | 23 -----------------------
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 databases/openldap/patches/patch-aa

(limited to 'databases/openldap')

diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index e216a4b0409..bd3ae8fc3ea 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2010/12/17 10:20:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2011/03/17 14:09:20 drochner Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-nops/Makefile
@@ -6,7 +6,7 @@
 # used by databases/openldap-smbk5pwd/Makefile
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.4.23
+DISTNAME=		openldap-2.4.24
 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 0e3138154b4..a825abcb316 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.79 2010/12/17 10:20:51 adam Exp $
+$NetBSD: distinfo,v 1.80 2011/03/17 14:09:20 drochner Exp $
 
-SHA1 (openldap-2.4.23.tgz) = 26027e7020256c5f47e17787f17ee8b31af42378
-RMD160 (openldap-2.4.23.tgz) = d2268e8fb894680d1d9926fedca736f195e0a0be
-Size (openldap-2.4.23.tgz) = 5182440 bytes
-SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
+SHA1 (openldap-2.4.24.tgz) = a4baad3d45ae5810ba5fee48603210697c70d52f
+RMD160 (openldap-2.4.24.tgz) = b9df6a5a562b83fe4ad92f8779909b36fab65c52
+Size (openldap-2.4.24.tgz) = 5240643 bytes
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
deleted file mode 100644
index fb76e2d2cc8..00000000000
--- a/databases/openldap/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2008/07/03 22:14:50 tonnerre Exp $
-
---- libraries/liblber/io.c.orig	2008-02-12 00:26:41.000000000 +0100
-+++ libraries/liblber/io.c
-@@ -584,13 +584,11 @@ ber_get_next(
- 				return LBER_DEFAULT;
- 			}
- 			/* Not enough bytes? */
--			if (ber->ber_rwptr - (char *)p < llen) {
--#if defined( EWOULDBLOCK )
--				sock_errset(EWOULDBLOCK);
--#elif defined( EAGAIN )
--				sock_errset(EAGAIN);
--#endif			
--				return LBER_DEFAULT;
-+			i = ber->ber_rwptr - (char *)p;
-+			if (i < llen) {
-+				sblen=ber_int_sb_read( sb, ber->ber_rwptr, i );
-+				if (sblen<i) return LBER_DEFAULT;
-+				ber->ber_rwptr += sblen;
- 			}
- 			for (i=0; i<llen; i++) {
- 				tlen <<=8;
-- 
cgit v1.2.3