[pkgsrc/trunk]: pkgsrc/databases/openldap Add a patch and bump PKGREVISION fo...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5195fed0fea0
branches:  trunk
changeset: 464197:5195fed0fea0
user:      agc <agc%pkgsrc.org@localhost>
date:      Thu Dec 04 14:48:17 2003 +0000

description:
Add a patch and bump PKGREVISION for a patch by Christian Limpach for a
problem noted on current-users by Murray Armfield.

The problem was:  "Just try executing slapindex to get quite a verbose
libpthread invalid mutex message.  slapd still core dumps on
shutdown."

Thanks to Christian for fixing this.

diffstat:

 databases/openldap/Makefile         |   4 ++--
 databases/openldap/distinfo         |   3 ++-
 databases/openldap/patches/patch-ae |  34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 234dfc40402d -r 5195fed0fea0 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Thu Dec 04 14:45:03 2003 +0000
+++ b/databases/openldap/Makefile       Thu Dec 04 14:48:17 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.62 2003/12/04 14:48:17 agc Exp $
 #
 
 DISTNAME=              openldap-2.1.22
-PKGREVISION=           2
+PKGREVISION=           3
 SVR4_PKGNAME=          oldap
 CATEGORIES=            databases
 MASTER_SITES=          ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff -r 234dfc40402d -r 5195fed0fea0 databases/openldap/distinfo
--- a/databases/openldap/distinfo       Thu Dec 04 14:45:03 2003 +0000
+++ b/databases/openldap/distinfo       Thu Dec 04 14:48:17 2003 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2003/09/29 16:56:54 salo Exp $
+$NetBSD: distinfo,v 1.20 2003/12/04 14:48:17 agc Exp $
 
 SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
 Size (openldap-2.1.22.tgz) = 2033763 bytes
 SHA1 (patch-aa) = 0f7f0ad7e11a16d084955f5125db12a5e53bafec
 SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
 SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546
+SHA1 (patch-ae) = 89c22ffe19651cacdf7a25b492dab46c7637da4d
diff -r 234dfc40402d -r 5195fed0fea0 databases/openldap/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-ae       Thu Dec 04 14:48:17 2003 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2003/12/04 14:48:17 agc Exp $
+
+--- servers/slapd/back-bdb/init.c.orig 2003-11-17 21:31:19.000000000 +0100
++++ servers/slapd/back-bdb/init.c
+@@ -460,17 +460,19 @@ bdb_db_close( BackendDB *be )
+       bdb_cache_release_all (&bdb->bi_cache);
+ 
+ #ifdef SLAP_IDL_CACHE
+-      ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
+-      entry = bdb->bi_idl_lru_head;
+-      while ( entry != NULL ) {
+-              next_entry = entry->idl_lru_next;
+-              avl_delete( &bdb->bi_idl_tree, (caddr_t) entry, bdb_idl_entry_cmp );
+-              free( entry->idl );
+-              free( entry->kstr.bv_val );
+-              free( entry );
+-              entry = next_entry;
++      if ( bdb->bi_idl_cache_max_size ) {
++              ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
++              entry = bdb->bi_idl_lru_head;
++              while ( entry != NULL ) {
++                      next_entry = entry->idl_lru_next;
++                      avl_delete( &bdb->bi_idl_tree, (caddr_t) entry, bdb_idl_entry_cmp );
++                      free( entry->idl );
++                      free( entry->kstr.bv_val );
++                      free( entry );
++                      entry = next_entry;
++              }
++              ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
+       }
+-      ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
+ #endif
+ 
+       return 0;