# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1372708833 -7200
# Node ID 4e2fe5febd4878048dabda5a55d99373ca979a6b
# Parent  6fb4607b503b2e50fa52d3af33d75b4f05251f4e
Correct use of nonportable u_int types and update to new vendor version.

diff -r 6fb4607b503b -r 4e2fe5febd48 openldap/openldap.patch
--- a/openldap/openldap.patch	Mon Jul 01 21:23:57 2013 +0200
+++ b/openldap/openldap.patch	Mon Jul 01 22:00:33 2013 +0200
@@ -29,7 +29,7 @@
 Index: libraries/libldap_r/tpool.c
 --- libraries/libldap_r/tpool.c.orig	2011-11-25 19:52:29.000000000 +0100
 +++ libraries/libldap_r/tpool.c	2011-12-11 14:01:59.000000000 +0100
-@@ -968,6 +968,6 @@
+@@ -1019,6 +1019,6 @@
  {
  	ldap_int_thread_userctx_t *ctx = vctx;
  
@@ -38,9 +38,9 @@
  }
  #endif /* LDAP_THREAD_HAVE_TPOOL */
 Index: libraries/libmdb/mdb.c
---- libraries/libmdb/mdb.c.orig	2011-11-25 19:52:29.000000000 +0100
-+++ libraries/libmdb/mdb.c	2011-12-11 14:01:59.000000000 +0100
-@@ -198,7 +198,11 @@
+--- libraries/liblmdb/mdb.c.orig	2011-11-25 19:52:29.000000000 +0100
++++ libraries/liblmdb/mdb.c	2011-12-11 14:01:59.000000000 +0100
+@@ -236,7 +236,11 @@
   * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC.
   */
  #ifndef MDB_DSYNC
diff -r 6fb4607b503b -r 4e2fe5febd48 openldap/openldap.spec
--- a/openldap/openldap.spec	Mon Jul 01 21:23:57 2013 +0200
+++ b/openldap/openldap.spec	Mon Jul 01 22:00:33 2013 +0200
@@ -31,7 +31,7 @@
 Class:        BASE
 Group:        LDAP
 License:      GPL
-Version:      2.4.32
+Version:      2.4.35
 Release:      20120800
 
 #   package options
@@ -100,6 +100,11 @@
         -e 's;-ldb-4[1-9];-ldb;g' \
         -e 's;-ldb-4;-ldb;g' \
         configure
+    ( cd servers/slapd/back-bdb/
+      %{l_shtool} subst \
+          -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
+          back-bdb.h init.c config.c dbcache.c dn2id.c idl.c
+    ) || exit $?
 
 %build
     cp /dev/null config.cache