OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2008 08:55:06
Branch: HEAD Handle: 2008060907550500
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
Log:
upgrading package: openldap 2.4.9 -> 2.4.10
Summary:
Revision Changes Path
1.20 +79 -7 openpkg-src/openldap/openldap.patch
1.218 +2 -2 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 openldap.patch
--- openpkg-src/openldap/openldap.patch 22 Dec 2007 16:12:27 -0000
1.19
+++ openpkg-src/openldap/openldap.patch 9 Jun 2008 06:55:05 -0000
1.20
@@ -1,6 +1,6 @@
Index: include/ac/fdset.h
---- include/ac/fdset.h.orig 2007-09-01 01:13:54 +0200
-+++ include/ac/fdset.h 2007-11-03 11:57:26 +0100
+--- include/ac/fdset.h.orig 2008-02-12 00:26:40 +0100
++++ include/ac/fdset.h 2008-06-09 08:32:46 +0200
@@ -22,6 +22,13 @@
#ifndef _AC_FDSET_H
#define _AC_FDSET_H
@@ -16,9 +16,9 @@
# define OPENLDAP_FD_SETSIZE 4096
#endif
Index: libraries/libldap_r/tpool.c
---- libraries/libldap_r/tpool.c.orig 2007-10-19 03:56:47 +0200
-+++ libraries/libldap_r/tpool.c 2007-11-03 12:05:18 +0100
-@@ -868,6 +868,6 @@
+--- libraries/libldap_r/tpool.c.orig 2008-03-21 01:46:03 +0100
++++ libraries/libldap_r/tpool.c 2008-06-09 08:32:46 +0200
+@@ -950,6 +950,6 @@
{
ldap_int_thread_userctx_t *ctx = vctx;
@@ -26,9 +26,81 @@
+ return ctx != NULL ? ctx->ltu_id : 0;
}
#endif /* LDAP_THREAD_HAVE_TPOOL */
+Index: servers/slapd/back-bdb/back-bdb.h
+--- servers/slapd/back-bdb/back-bdb.h.orig 2008-05-01 23:39:35 +0200
++++ servers/slapd/back-bdb/back-bdb.h 2008-06-09 08:48:39 +0200
+@@ -59,7 +59,7 @@
+ #endif
+
+ /* 4.6.18 redefines cursor->locker */
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+
+ struct __db_locker {
+ u_int32_t id;
+@@ -310,7 +310,7 @@
+ #endif
+
+ /* BDB 4.6.18 makes locker a struct instead of an int */
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ #undef TXN_ID
+ #define TXN_ID(txn) (txn)->locker
+ #endif
+Index: servers/slapd/back-bdb/cache.c
+--- servers/slapd/back-bdb/cache.c.orig 2008-05-01 23:39:35 +0200
++++ servers/slapd/back-bdb/cache.c 2008-06-09 08:47:39 +0200
+@@ -1444,7 +1444,7 @@
+ u_int32_t lockid;
+ int rc;
+
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ BDB_LOCKER lptr = data;
+ lockid = lptr->id;
+ #else
+@@ -1508,7 +1508,7 @@
+ if ( rc != 0) {
+ return rc;
+ }
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ { BDB_LOCKER lptr;
+ __lock_getlocker( env->lk_handle, lockid, 0, &lptr );
+ data = lptr;
+@@ -1527,7 +1527,7 @@
+ } else {
+ lockid = (long)data;
+ }
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ *locker = data;
+ #else
+ *locker = lockid;
+Index: servers/slapd/back-bdb/init.c
+--- servers/slapd/back-bdb/init.c.orig 2008-02-12 00:26:45 +0100
++++ servers/slapd/back-bdb/init.c 2008-06-09 08:46:19 +0200
+@@ -503,7 +503,7 @@
+ }
+
+ if ( !quick ) {
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ u_int32_t lid;
+ XLOCK_ID(bdb->bi_dbenv, &lid);
+ __lock_getlocker(bdb->bi_dbenv->lk_handle, lid, 0,
&bdb->bi_cache.c_locker);
+@@ -601,7 +601,7 @@
+ if( bdb->bi_dbenv ) {
+ /* Free cache locker if we enabled locking */
+ if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_cache.c_locker
) {
+-#if DB_VERSION_FULL >= 0x04060012
++#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000
+ XLOCK_ID_FREE(bdb->bi_dbenv,
bdb->bi_cache.c_locker->id);
+ #else
+ XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
Index: servers/slapd/back-perl/config.c
---- servers/slapd/back-perl/config.c.orig 2007-09-01 01:14:04 +0200
-+++ servers/slapd/back-perl/config.c 2007-11-03 11:57:26 +0100
+--- servers/slapd/back-perl/config.c.orig 2008-02-12 00:26:47 +0100
++++ servers/slapd/back-perl/config.c 2008-06-09 08:32:46 +0200
@@ -49,6 +49,9 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.217 -r1.218 openldap.spec
--- openpkg-src/openldap/openldap.spec 8 May 2008 06:39:33 -0000
1.217
+++ openpkg-src/openldap/openldap.spec 9 Jun 2008 06:55:05 -0000
1.218
@@ -31,8 +31,8 @@
Class: BASE
Group: LDAP
License: GPL
-Version: 2.4.9
-Release: 20080508
+Version: 2.4.10
+Release: 20080609
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
