pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/openldap Missing bits for OpenLDAP-2.4.13 up...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5abba14f8aee
branches: trunk
changeset: 553563:5abba14f8aee
user: manu <manu%pkgsrc.org@localhost>
date: Sat Jan 24 22:11:19 2009 +0000
description:
Missing bits for OpenLDAP-2.4.13 update
diffstat:
databases/openldap/Makefile | 4 +-
databases/openldap/Makefile.common | 4 +-
databases/openldap/distinfo | 11 +-
databases/openldap/patches/patch-bf | 20 +-
databases/openldap/patches/patch-ca | 2177 -----------------------------------
5 files changed, 19 insertions(+), 2197 deletions(-)
diffs (truncated from 2302 to 300 lines):
diff -r e0e1ada4831f -r 5abba14f8aee databases/openldap/Makefile
--- a/databases/openldap/Makefile Sat Jan 24 21:55:31 2009 +0000
+++ b/databases/openldap/Makefile Sat Jan 24 22:11:19 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2008/07/19 21:08:42 ghen Exp $
+# $NetBSD: Makefile,v 1.129 2009/01/24 22:11:19 manu Exp $
DISTNAME= openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION= 2.4.11
+OPENLDAP_VERSION= 2.4.13
CATEGORIES= databases
MASTER_SITES= # empty
DISTFILES= # empty
diff -r e0e1ada4831f -r 5abba14f8aee databases/openldap/Makefile.common
--- a/databases/openldap/Makefile.common Sat Jan 24 21:55:31 2009 +0000
+++ b/databases/openldap/Makefile.common Sat Jan 24 22:11:19 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.18 2008/08/23 08:12:02 obache Exp $
+# $NetBSD: Makefile.common,v 1.19 2009/01/24 22:11:19 manu Exp $
# please stick to the "stable" releases as much as possible!
-DISTNAME= openldap-2.4.11
+DISTNAME= openldap-2.4.13
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/
diff -r e0e1ada4831f -r 5abba14f8aee databases/openldap/distinfo
--- a/databases/openldap/distinfo Sat Jan 24 21:55:31 2009 +0000
+++ b/databases/openldap/distinfo Sat Jan 24 22:11:19 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.66 2008/09/07 12:18:06 wiz Exp $
+$NetBSD: distinfo,v 1.67 2009/01/24 22:11:19 manu Exp $
-SHA1 (openldap-2.4.11.tgz) = 5a7d2d8824d8d2671a781a2fc24b629a145b919d
-RMD160 (openldap-2.4.11.tgz) = 27959c4111f6ba5b7c4b1344c2cb27d9f69cd628
-Size (openldap-2.4.11.tgz) = 4941654 bytes
+SHA1 (openldap-2.4.13.tgz) = bb6fe22808d36425b3bad6ce367e882530ccbf51
+RMD160 (openldap-2.4.13.tgz) = c459bb7912e70187bab298911252b6d14590bfd2
+Size (openldap-2.4.13.tgz) = 5040598 bytes
SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
@@ -17,6 +17,5 @@
SHA1 (patch-bb) = 0a6c451b501f8fcd98f990aa39cadc5e885cbf4a
SHA1 (patch-bd) = e26f7964a71c9b6df216984860acaa22b5a4ba04
SHA1 (patch-be) = fb828f59b4ff21009c24be94a18c01276feab0b5
-SHA1 (patch-bf) = 09874cc5fcd476b4bc37bcb1ad5b7f833cfcdb94
+SHA1 (patch-bf) = f457bac090294e2f2677702ca4faf71c57472057
SHA1 (patch-bh) = f8660750454c80e7520ed27f1a2e39ecfd266997
-SHA1 (patch-ca) = 317c8862aed7432b45e788cafd72cef0ebce2a4d
diff -r e0e1ada4831f -r 5abba14f8aee databases/openldap/patches/patch-bf
--- a/databases/openldap/patches/patch-bf Sat Jan 24 21:55:31 2009 +0000
+++ b/databases/openldap/patches/patch-bf Sat Jan 24 22:11:19 2009 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-bf,v 1.5 2008/02/24 20:15:05 ghen Exp $
+$NetBSD: patch-bf,v 1.6 2009/01/24 22:11:19 manu Exp $
---- configure.orig 2008-02-12 00:36:45.000000000 +0100
+--- configure.orig 2008-11-21 02:26:20.000000000 +0100
+++ configure
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host
host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION 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_DATE top_builddir ldap_subdir CC AR
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB
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_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL
BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE
BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_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_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='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host
host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION 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_DATE top_builddir ldap_subdir CC AR
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB
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_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL
BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE
BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SMBK5PWD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_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_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='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host
host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION 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_DATE top_builddir ldap_subdir CC AR
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB
ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED
WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD
BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_COLLECT BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF
BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS SLAPD_NDB_LIBS
SLAPD_NDB_INCS 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_DYNAMIC_OVERLAYS
PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS GSSAPI_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='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host
host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION 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_DATE top_builddir ldap_subdir CC AR
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB
ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED
WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD
BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_COLLECT BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF
BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SMBK5PWD BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS
SLAPD_NDB_LIBS SLAPD_NDB_INCS 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_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS GSSAPI_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_files=''
# Initialize some variables set by options.
-@@ -1059,6 +1059,7 @@ SLAPD Overlay Options:
+@@ -1062,6 +1062,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]
@@ -19,7 +19,7 @@
--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]
-@@ -3132,6 +3133,7 @@ Overlays="accesslog \
+@@ -3185,6 +3186,7 @@ Overlays="accesslog \
retcode \
rwm \
seqmod \
@@ -27,7 +27,7 @@
syncprov \
translucent \
unique \
-@@ -3476,6 +3478,30 @@ else
+@@ -3577,6 +3579,30 @@ else
fi;
# end --enable-seqmod
@@ -58,7 +58,7 @@
# OpenLDAP --enable-syncprov
# Check whether --enable-syncprov or --disable-syncprov was given.
-@@ -3791,6 +3817,7 @@ BUILD_REFINT=no
+@@ -3896,6 +3922,7 @@ BUILD_REFINT=no
BUILD_RETCODE=no
BUILD_RWM=no
BUILD_SEQMOD=no
@@ -66,7 +66,7 @@
BUILD_SYNCPROV=no
BUILD_TRANSLUCENT=no
BUILD_UNIQUE=no
-@@ -40744,6 +40771,22 @@ _ACEOF
+@@ -38875,6 +38902,22 @@ _ACEOF
fi
@@ -89,7 +89,7 @@
if test "$ol_enable_syncprov" != no ; then
BUILD_SYNCPROV=$ol_enable_syncprov
if test "$ol_enable_syncprov" = mod ; then
-@@ -41682,6 +41725,7 @@ s,@BUILD_REFINT@,$BUILD_REFINT,;t t
+@@ -39822,6 +39865,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
diff -r e0e1ada4831f -r 5abba14f8aee databases/openldap/patches/patch-ca
--- a/databases/openldap/patches/patch-ca Sat Jan 24 21:55:31 2009 +0000
+++ b/databases/openldap/patches/patch-ca Sat Jan 24 22:11:19 2009 +0000
@@ -1,2177 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2008/09/07 12:18:07 wiz Exp $
-
-BDB 4.7 support based on
-http://www.openldap.org/lists/openldap-commit/200808/msg00045.html
-http://www.openldap.org/lists/openldap-commit/200808/msg00048.html
-
-Index: add.c
-===================================================================
-RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/add.c,v
-retrieving revision 1.173
-retrieving revision 1.174
-diff -u -r1.173 -r1.174
---- servers/slapd/back-bdb/add.c 1 May 2008 11:25:15 -0000 1.173
-+++ servers/slapd/back-bdb/add.c 26 Aug 2008 23:45:35 -0000 1.174
-@@ -32,11 +32,10 @@
- size_t textlen = sizeof textbuf;
- AttributeDescription *children = slap_schema.si_ad_children;
- AttributeDescription *entry = slap_schema.si_ad_entry;
-- DB_TXN *ltid = NULL, *lt2;
-+ DB_TXN *ltid = NULL, *lt2, *rtxn;
- ID eid = NOID;
- struct bdb_op_info opinfo = {0};
- int subentry;
-- BDB_LOCKER locker = 0, rlocker = 0;
- DB_LOCK lock;
-
- int num_retries = 0;
-@@ -115,8 +114,8 @@
-
- subentry = is_entry_subentry( op->oq_add.rs_e );
-
-- /* Get our thread locker ID */
-- rs->sr_err = LOCK_ID( bdb->bi_dbenv, &rlocker );
-+ /* Get our reader TXN */
-+ rs->sr_err = bdb_reader_get( op, bdb->bi_dbenv, &rtxn );
-
- if( 0 ) {
- retry: /* transaction retry */
-@@ -157,8 +156,6 @@
- goto return_results;
- }
-
-- locker = TXN_ID ( ltid );
--
- opinfo.boi_oe.oe_key = bdb;
- opinfo.boi_txn = ltid;
- opinfo.boi_err = 0;
-@@ -176,7 +173,7 @@
-
- /* get entry or parent */
- rs->sr_err = bdb_dn2entry( op, ltid, &op->ora_e->e_nname, &ei,
-- 1, locker, &lock );
-+ 1, &lock );
- switch( rs->sr_err ) {
- case 0:
- rs->sr_err = LDAP_ALREADY_EXISTS;
-@@ -428,8 +425,8 @@
- nrdn = op->ora_e->e_nname;
- }
-
-- /* Use the thread locker here, outside the txn */
-- bdb_cache_add( bdb, ei, op->ora_e, &nrdn, rlocker, &lock );
-+ /* Use the reader txn here, outside the add txn */
-+ bdb_cache_add( bdb, ei, op->ora_e, &nrdn, rtxn, &lock );
-
- if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
- rs->sr_text = "txn_commit failed";
-Index: back-bdb.h
-===================================================================
-RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/back-bdb.h,v
-retrieving revision 1.173
-retrieving revision 1.174
-diff -u -r1.173 -r1.174
---- servers/slapd/back-bdb/back-bdb.h 1 May 2008 10:49:35 -0000 1.173
-+++ servers/slapd/back-bdb/back-bdb.h 26 Aug 2008 23:45:35 -0000 1.174
-@@ -58,30 +58,6 @@
- #define BDB_PAGESIZE 4096 /* BDB's original default */
- #endif
-
--/* 4.6.18 redefines cursor->locker */
--#if DB_VERSION_FULL >= 0x04060012
--
--struct __db_locker {
-- u_int32_t id;
--};
--
--typedef struct __db_locker * BDB_LOCKER;
--
--extern int __lock_getlocker(DB_LOCKTAB *lt, u_int32_t locker, int create, DB_LOCKER **ret);
--
--#define CURSOR_SETLOCKER(cursor, id) cursor->locker = id
--#define CURSOR_GETLOCKER(cursor) cursor->locker
--#define BDB_LOCKID(locker) locker->id
--#else
--
--typedef u_int32_t BDB_LOCKER;
--
--#define CURSOR_SETLOCKER(cursor, id) cursor->locker = id
--#define CURSOR_GETLOCKER(cursor) cursor->locker
--#define BDB_LOCKID(locker) locker
--
--#endif
--
- #define DEFAULT_CACHE_SIZE 1000
-
- /* The default search IDL stack cache depth */
-@@ -160,7 +136,7 @@
- int c_eiused; /* EntryInfo's in use */
- int c_leaves; /* EntryInfo leaf nodes */
- int c_purging;
-- BDB_LOCKER c_locker; /* used by lru cleaner */
-+ DB_TXN *c_txn; /* used by lru cleaner */
- ldap_pvt_thread_rdwr_t c_rwlock;
- ldap_pvt_thread_mutex_t c_lru_mutex;
- ldap_pvt_thread_mutex_t c_count_mutex;
-@@ -309,12 +285,6 @@
- ((db)->open)(db, NULL, file, name, type, flags, mode)
- #endif
-
--/* BDB 4.6.18 makes locker a struct instead of an int */
--#if DB_VERSION_FULL >= 0x04060012
--#undef TXN_ID
--#define TXN_ID(txn) (txn)->locker
--#endif
--
- /* #undef BDB_LOG_DEBUG */
-
- #ifdef BDB_LOG_DEBUG
-@@ -343,8 +313,6 @@
- #define DB_BUFFER_SMALL ENOMEM
- #endif
-
--#define BDB_REUSE_LOCKERS
--
- #define BDB_CSN_COMMIT 0
- #define BDB_CSN_ABORT 1
- #define BDB_CSN_RETRY 2
-Index: bind.c
-===================================================================
-RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/bind.c,v
-retrieving revision 1.54
-retrieving revision 1.55
-diff -u -r1.54 -r1.55
---- servers/slapd/back-bdb/bind.c 7 Jan 2008 23:20:10 -0000 1.54
-+++ servers/slapd/back-bdb/bind.c 26 Aug 2008 23:45:35 -0000 1.55
-@@ -32,7 +32,7 @@
-
- AttributeDescription *password = slap_schema.si_ad_userPassword;
-
-- BDB_LOCKER locker;
-+ DB_TXN *rtxn;
- DB_LOCK lock;
-
- Debug( LDAP_DEBUG_ARGS,
-@@ -55,7 +55,7 @@
- break;
- }
-
-- rs->sr_err = LOCK_ID(bdb->bi_dbenv, &locker);
-+ rs->sr_err = bdb_reader_get(op, bdb->bi_dbenv, &rtxn);
- switch(rs->sr_err) {
- case 0:
- break;
-@@ -67,8 +67,8 @@
-
- dn2entry_retry:
- /* get entry with reader lock */
-- rs->sr_err = bdb_dn2entry( op, NULL, &op->o_req_ndn, &ei, 1,
-- locker, &lock );
-+ rs->sr_err = bdb_dn2entry( op, rtxn, &op->o_req_ndn, &ei, 1,
-+ &lock );
-
- switch(rs->sr_err) {
- case DB_NOTFOUND:
-@@ -76,14 +76,12 @@
Home |
Main Index |
Thread Index |
Old Index