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: 13-Oct-2008 11:51:43
Branch: HEAD Handle: 2008101310514201
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
Log:
upgrading package: openldap 2.4.11 -> 2.4.12
Summary:
Revision Changes Path
1.22 +14 -86 openpkg-src/openldap/openldap.patch
1.221 +2 -2 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.21 -r1.22 openldap.patch
--- openpkg-src/openldap/openldap.patch 30 Jul 2008 19:19:21 -0000
1.21
+++ openpkg-src/openldap/openldap.patch 13 Oct 2008 09:51:42 -0000
1.22
@@ -1,6 +1,6 @@
Index: include/ac/fdset.h
--- include/ac/fdset.h.orig 2008-02-12 00:26:40 +0100
-+++ include/ac/fdset.h 2008-06-09 08:32:46 +0200
++++ include/ac/fdset.h 2008-10-13 11:38:23 +0200
@@ -22,6 +22,13 @@
#ifndef _AC_FDSET_H
#define _AC_FDSET_H
@@ -15,9 +15,20 @@
#if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
# define OPENLDAP_FD_SETSIZE 4096
#endif
+Index: include/ldap_int_thread.h
+--- include/ldap_int_thread.h.orig 2008-02-12 00:26:40 +0100
++++ include/ldap_int_thread.h 2008-10-13 11:38:23 +0200
+@@ -100,6 +100,7 @@
+ * *
+ ***********************************/
+
++#define _POSIX_PTHREAD_SEMANTICS
+ #define PTH_SYSCALL_SOFT 1
+ #include <pth.h>
+
Index: libraries/libldap_r/tpool.c
--- 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
++++ libraries/libldap_r/tpool.c 2008-10-13 11:38:23 +0200
@@ -950,6 +950,6 @@
{
ldap_int_thread_userctx_t *ctx = vctx;
@@ -26,81 +37,9 @@
+ 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 2008-02-12 00:26:47 +0100
-+++ servers/slapd/back-perl/config.c 2008-06-09 08:32:46 +0200
++++ servers/slapd/back-perl/config.c 2008-10-13 11:38:23 +0200
@@ -49,6 +49,9 @@
}
@@ -111,14 +50,3 @@
snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
eval_pv( eval_str, 0 );
-Index: include/ldap_int_thread.h
---- include/ldap_int_thread.h.orig 2008-02-12 00:26:40 +0100
-+++ include/ldap_int_thread.h 2008-07-30 21:07:22 +0200
-@@ -100,6 +100,7 @@
- * *
- ***********************************/
-
-+#define _POSIX_PTHREAD_SEMANTICS
- #define PTH_SYSCALL_SOFT 1
- #include <pth.h>
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.220 -r1.221 openldap.spec
--- openpkg-src/openldap/openldap.spec 30 Jul 2008 19:19:21 -0000
1.220
+++ openpkg-src/openldap/openldap.spec 13 Oct 2008 09:51:43 -0000
1.221
@@ -31,8 +31,8 @@
Class: BASE
Group: LDAP
License: GPL
-Version: 2.4.11
-Release: 20080730
+Version: 2.4.12
+Release: 20081013
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
