# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1328379610 -7200
# Node ID e10b124b2f2160409a0bf352a02d73a5d9673aa6
# Parent  2dd48c9debd67cffd9bc75a574d5eb58a0828534
Update version, adapt patch code, and correct typical german english mistakes.

diff -r 2dd48c9debd6 -r e10b124b2f21 openldap/openldap.patch
--- a/openldap/openldap.patch	Tue Aug 28 18:42:10 2012 +0200
+++ b/openldap/openldap.patch	Sat Feb 04 20:20:10 2012 +0200
@@ -1,6 +1,6 @@
 Index: include/ac/fdset.h
---- include/ac/fdset.h.orig	2011-01-05 00:49:56.000000000 +0100
-+++ include/ac/fdset.h	2011-02-12 10:17:43.000000000 +0100
+--- include/ac/fdset.h.orig	2011-11-25 19:52:29.000000000 +0100
++++ include/ac/fdset.h	2011-12-11 14:01:59.000000000 +0100
 @@ -22,6 +22,13 @@
  #ifndef _AC_FDSET_H
  #define _AC_FDSET_H
@@ -16,8 +16,8 @@
  #  define OPENLDAP_FD_SETSIZE 4096
  #endif
 Index: include/ldap_int_thread.h
---- include/ldap_int_thread.h.orig	2011-01-06 19:43:20.000000000 +0100
-+++ include/ldap_int_thread.h	2011-02-12 10:17:43.000000000 +0100
+--- include/ldap_int_thread.h.orig	2011-11-25 19:52:29.000000000 +0100
++++ include/ldap_int_thread.h	2011-12-11 14:01:59.000000000 +0100
 @@ -110,6 +110,7 @@
   *                                 *
   ***********************************/
@@ -27,9 +27,9 @@
  #include <pth.h>
  
 Index: libraries/libldap_r/tpool.c
---- libraries/libldap_r/tpool.c.orig	2011-01-05 00:50:08.000000000 +0100
-+++ libraries/libldap_r/tpool.c	2011-02-12 10:17:43.000000000 +0100
-@@ -968,6 +968,6 @@
+--- 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
+@@ -1019,6 +1019,6 @@
  {
  	ldap_int_thread_userctx_t *ctx = vctx;
  
@@ -37,16 +37,32 @@
 +	return ctx != NULL ? ctx->ltu_id : 0;
  }
  #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
+@@ -213,7 +213,11 @@
+  * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC.
+  */
+ #ifndef MDB_DSYNC
+-# define MDB_DSYNC	O_DSYNC
++# ifdef O_DSYNC
++#  define MDB_DSYNC O_DSYNC
++# else
++#  define MDB_DSYNC	O_SYNC
++# endif
+ #endif
+ #endif
+ 
 Index: servers/slapd/back-perl/config.c
---- servers/slapd/back-perl/config.c.orig	2011-01-05 00:50:41.000000000 +0100
-+++ servers/slapd/back-perl/config.c	2011-02-12 10:17:43.000000000 +0100
-@@ -49,6 +49,9 @@
- 		}
+--- servers/slapd/back-perl/config.c.orig	2011-11-25 19:52:29.000000000 +0100
++++ servers/slapd/back-perl/config.c	2011-12-11 14:02:56.000000000 +0100
+@@ -173,6 +173,9 @@
+ 	} else {
+ 		switch( c->type ) {
+ 		case PERL_MODULE:
++			if (c->argc > 2)
++				snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", c->argv[2] );
++			else
+ 			snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] );
+ 			eval_pv( eval_str, 0 );
  
- #ifdef PERL_IS_5_6
-+		if (argc > 2)
-+		    snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] );
-+		else
- 		snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
- 		eval_pv( eval_str, 0 );
- 
diff -r 2dd48c9debd6 -r e10b124b2f21 openldap/openldap.spec
--- a/openldap/openldap.spec	Tue Aug 28 18:42:10 2012 +0200
+++ b/openldap/openldap.spec	Sat Feb 04 20:20:10 2012 +0200
@@ -31,8 +31,8 @@
 Class:        BASE
 Group:        LDAP
 License:      GPL
-Version:      2.4.26
-Release:      20110914
+Version:      2.4.29
+Release:      20120208
 
 #   package options
 %option       with_server   yes
@@ -85,7 +85,7 @@
 %description
     OpenLDAP is an open source implementation of the Lightweight
     Directory Access Protocol (LDAP). The suite includes libraries
-    implementing the LDAP protocol plus a stand-alone LDAP server
+    implementing the LDAP protocol plus a stand alone LDAP server
     slapd(8).
 
 %track
@@ -123,7 +123,6 @@
     ARGS="$ARGS --enable-syslog"
     ARGS="$ARGS --with-tls"
     ARGS="$ARGS --without-fetch"
-    ARGS="$ARGS --without-gssapi"
     ARGS="$ARGS --disable-dynamic"
     ARGS="$ARGS --disable-shared"
 %if "%{with_server}" == "yes"
@@ -206,7 +205,7 @@
         *-sunos* ) CFLAGS="$CFLAGS -D_AVL_H"; LIBS="$LIBS -lrt" ;;
     esac
 
-    #   configuration: use hard-links and make sure our Berkeley-DB is picked up first
+    #   configuration: use hard links and make sure our Berkeley-DB is picked up first
     %{l_shtool} subst \
         -e 's;ln -s;ln;g' \
         -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \