1.1 --- a/openldap/openldap.patch Tue Aug 28 18:42:10 2012 +0200
1.2 +++ b/openldap/openldap.patch Sat Feb 04 20:20:10 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 Index: include/ac/fdset.h
1.5 ---- include/ac/fdset.h.orig 2011-01-05 00:49:56.000000000 +0100
1.6 -+++ include/ac/fdset.h 2011-02-12 10:17:43.000000000 +0100
1.7 +--- include/ac/fdset.h.orig 2011-11-25 19:52:29.000000000 +0100
1.8 ++++ include/ac/fdset.h 2011-12-11 14:01:59.000000000 +0100
1.9 @@ -22,6 +22,13 @@
1.10 #ifndef _AC_FDSET_H
1.11 #define _AC_FDSET_H
1.12 @@ -16,8 +16,8 @@
1.13 # define OPENLDAP_FD_SETSIZE 4096
1.14 #endif
1.15 Index: include/ldap_int_thread.h
1.16 ---- include/ldap_int_thread.h.orig 2011-01-06 19:43:20.000000000 +0100
1.17 -+++ include/ldap_int_thread.h 2011-02-12 10:17:43.000000000 +0100
1.18 +--- include/ldap_int_thread.h.orig 2011-11-25 19:52:29.000000000 +0100
1.19 ++++ include/ldap_int_thread.h 2011-12-11 14:01:59.000000000 +0100
1.20 @@ -110,6 +110,7 @@
1.21 * *
1.22 ***********************************/
1.23 @@ -27,9 +27,9 @@
1.24 #include <pth.h>
1.25
1.26 Index: libraries/libldap_r/tpool.c
1.27 ---- libraries/libldap_r/tpool.c.orig 2011-01-05 00:50:08.000000000 +0100
1.28 -+++ libraries/libldap_r/tpool.c 2011-02-12 10:17:43.000000000 +0100
1.29 -@@ -968,6 +968,6 @@
1.30 +--- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100
1.31 ++++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.000000000 +0100
1.32 +@@ -1019,6 +1019,6 @@
1.33 {
1.34 ldap_int_thread_userctx_t *ctx = vctx;
1.35
1.36 @@ -37,16 +37,32 @@
1.37 + return ctx != NULL ? ctx->ltu_id : 0;
1.38 }
1.39 #endif /* LDAP_THREAD_HAVE_TPOOL */
1.40 +Index: libraries/libmdb/mdb.c
1.41 +--- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100
1.42 ++++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100
1.43 +@@ -213,7 +213,11 @@
1.44 + * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC.
1.45 + */
1.46 + #ifndef MDB_DSYNC
1.47 +-# define MDB_DSYNC O_DSYNC
1.48 ++# ifdef O_DSYNC
1.49 ++# define MDB_DSYNC O_DSYNC
1.50 ++# else
1.51 ++# define MDB_DSYNC O_SYNC
1.52 ++# endif
1.53 + #endif
1.54 + #endif
1.55 +
1.56 Index: servers/slapd/back-perl/config.c
1.57 ---- servers/slapd/back-perl/config.c.orig 2011-01-05 00:50:41.000000000 +0100
1.58 -+++ servers/slapd/back-perl/config.c 2011-02-12 10:17:43.000000000 +0100
1.59 -@@ -49,6 +49,9 @@
1.60 - }
1.61 +--- servers/slapd/back-perl/config.c.orig 2011-11-25 19:52:29.000000000 +0100
1.62 ++++ servers/slapd/back-perl/config.c 2011-12-11 14:02:56.000000000 +0100
1.63 +@@ -173,6 +173,9 @@
1.64 + } else {
1.65 + switch( c->type ) {
1.66 + case PERL_MODULE:
1.67 ++ if (c->argc > 2)
1.68 ++ snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", c->argv[2] );
1.69 ++ else
1.70 + snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] );
1.71 + eval_pv( eval_str, 0 );
1.72
1.73 - #ifdef PERL_IS_5_6
1.74 -+ if (argc > 2)
1.75 -+ snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] );
1.76 -+ else
1.77 - snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
1.78 - eval_pv( eval_str, 0 );
1.79 -
