Mon, 01 Jul 2013 22:00:33 +0200
Correct use of nonportable u_int types and update to new vendor version.
openldap/openldap.patch | file | annotate | diff | comparison | revisions | |
openldap/openldap.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/openldap/openldap.patch Mon Jul 01 21:23:57 2013 +0200 1.2 +++ b/openldap/openldap.patch Mon Jul 01 22:00:33 2013 +0200 1.3 @@ -29,7 +29,7 @@ 1.4 Index: libraries/libldap_r/tpool.c 1.5 --- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100 1.6 +++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.000000000 +0100 1.7 -@@ -968,6 +968,6 @@ 1.8 +@@ -1019,6 +1019,6 @@ 1.9 { 1.10 ldap_int_thread_userctx_t *ctx = vctx; 1.11 1.12 @@ -38,9 +38,9 @@ 1.13 } 1.14 #endif /* LDAP_THREAD_HAVE_TPOOL */ 1.15 Index: libraries/libmdb/mdb.c 1.16 ---- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 1.17 -+++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 1.18 -@@ -198,7 +198,11 @@ 1.19 +--- libraries/liblmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 1.20 ++++ libraries/liblmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 1.21 +@@ -236,7 +236,11 @@ 1.22 * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. 1.23 */ 1.24 #ifndef MDB_DSYNC
2.1 --- a/openldap/openldap.spec Mon Jul 01 21:23:57 2013 +0200 2.2 +++ b/openldap/openldap.spec Mon Jul 01 22:00:33 2013 +0200 2.3 @@ -31,7 +31,7 @@ 2.4 Class: BASE 2.5 Group: LDAP 2.6 License: GPL 2.7 -Version: 2.4.32 2.8 +Version: 2.4.35 2.9 Release: 20120800 2.10 2.11 # package options 2.12 @@ -100,6 +100,11 @@ 2.13 -e 's;-ldb-4[1-9];-ldb;g' \ 2.14 -e 's;-ldb-4;-ldb;g' \ 2.15 configure 2.16 + ( cd servers/slapd/back-bdb/ 2.17 + %{l_shtool} subst \ 2.18 + -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \ 2.19 + back-bdb.h init.c config.c dbcache.c dn2id.c idl.c 2.20 + ) || exit $? 2.21 2.22 %build 2.23 cp /dev/null config.cache