diff options
| author | agc <agc> | 2003-12-04 14:48:17 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-12-04 14:48:17 +0000 |
| commit | 6e809ab9548001e4e586825d9009c8a8d493bc86 (patch) | |
| tree | 6e00189a0b9ce238b945bf6b169df60802017db0 /databases | |
| parent | b00fc3881b0f0d9164f6a89c87ae23023dd6db39 (diff) | |
| download | pkgsrc-6e809ab9548001e4e586825d9009c8a8d493bc86.tar.gz | |
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 (limited to 'databases')
| -rw-r--r-- | databases/openldap/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 3 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-ae | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index ddcfc8bd2ad..5e8d097852e 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -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 --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 8d7292f5a89..e12849cfc24 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -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 --git a/databases/openldap/patches/patch-ae b/databases/openldap/patches/patch-ae new file mode 100644 index 00000000000..934759c32cd --- /dev/null +++ b/databases/openldap/patches/patch-ae @@ -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; |