From 78ba7b81e313d598bbbb7cc29862f6977577c47800e9a84a86499b09b6b33e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 26 Oct 2015 13:52:21 +0000 Subject: [PATCH] Accepting request 340787 from home:sumski:hazard:to:your:stereo - Update to 0.9.16: * Fix cursor EOF bug (ITS#8190) * Fix handling of subDB records (ITS#8181) * Fix mdb_midl_shrink() usage (ITS#8200) - Changes since 0.9.15: * Fix txn init (ITS#7961,#7987) * Fix MDB_PREV_DUP (ITS#7955,#7671) * Fix compact of empty env (ITS#7956) * Fix mdb_copy file mode * Fix mdb_env_close() after failed mdb_env_open() * Fix mdb_rebalance collapsing root (ITS#8062) * Fix mdb_load with large values (ITS#8066) * Fix to retry writes on EINTR (ITS#8106) * Fix mdb_cursor_del on empty DB (ITS#8109) * Fix MDB_INTEGERDUP key compare (ITS#8117) * Fix error handling (ITS#7959,#8157,etc.) * Fix race conditions (ITS#7969,7970) * Added workaround for fdatasync bug in ext3fs * Build: * Don't use -fPIC for static lib * Update .gitignore (ITS#7952,#7953) * Cleanup for "make test" (ITS#7841), "make clean", mtest*.c * Misc. Android/Windows cleanup * Documentation * Fix MDB_APPEND doc * Fix MDB_MAXKEYSIZE doc (ITS#8156) * Fix mdb_cursor_put,mdb_cursor_del EACCES description * Fix mdb_env_sync(MDB_RDONLY env) doc (ITS#8021) * Clarify MDB_WRITEMAP doc (ITS#8021) * Clarify mdb_env_open doc OBS-URL: https://build.opensuse.org/request/show/340787 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/lmdb?expand=0&rev=16 --- ...Patch-for-LMDB-to-use-robust-mutexes.patch | 12 +++---- automake.diff | 2 +- baselibs.conf | 2 +- lmdb-0.9.14.tar.bz2 | 3 -- lmdb-0.9.16.tar.bz2 | 3 ++ lmdb.changes | 35 +++++++++++++++++++ lmdb.spec | 4 +-- 7 files changed, 48 insertions(+), 13 deletions(-) delete mode 100644 lmdb-0.9.14.tar.bz2 create mode 100644 lmdb-0.9.16.tar.bz2 diff --git a/0001-Patch-for-LMDB-to-use-robust-mutexes.patch b/0001-Patch-for-LMDB-to-use-robust-mutexes.patch index 4218573..297f299 100644 --- a/0001-Patch-for-LMDB-to-use-robust-mutexes.patch +++ b/0001-Patch-for-LMDB-to-use-robust-mutexes.patch @@ -17,7 +17,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-liblmdb/mdb.c ./mdb.c --- ../orig-liblmdb/mdb.c 2014-01-31 09:23:13.341427766 +0100 +++ ./mdb.c 2014-07-28 17:44:55.145959267 +0200 -@@ -207,6 +207,7 @@ extern int cacheflush(char *addr, int nbytes, int cache); +@@ -215,6 +215,7 @@ extern int cacheflush(char *addr, int nbytes, int cache); #define MDB_USE_HASH 1 #define MDB_PIDLOCK 0 #define THREAD_RET DWORD @@ -25,7 +25,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache #define pthread_t HANDLE #define pthread_mutex_t HANDLE #define pthread_cond_t HANDLE -@@ -218,7 +219,7 @@ extern int cacheflush(char *addr, int nbytes, int cache); +@@ -226,7 +227,7 @@ extern int cacheflush(char *addr, int nbytes, int cache); #define pthread_getspecific(x) TlsGetValue(x) #define pthread_setspecific(x,y) (TlsSetValue(x,y) ? 0 : ErrCode()) #define pthread_mutex_unlock(x) ReleaseMutex(*x) @@ -34,7 +34,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache #define pthread_cond_signal(x) SetEvent(*x) #define pthread_cond_wait(cond,mutex) do{SignalObjectAndWait(*mutex, *cond, INFINITE, FALSE); WaitForSingleObject(*mutex, INFINITE);}while(0) #define THREAD_CREATE(thr,start,arg) thr=CreateThread(NULL,0,start,arg,0,NULL) -@@ -2498,7 +2499,20 @@ mdb_txn_renew0(MDB_txn *txn) +@@ -2529,7 +2530,20 @@ mdb_txn_renew0(MDB_txn *txn) env->me_live_reader = 1; } @@ -56,8 +56,8 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache nr = ti->mti_numreaders; for (i=0; imti_readers[i].mr_pid == 0) -@@ -2528,7 +2542,20 @@ mdb_txn_renew0(MDB_txn *txn) - } +@@ -2563,7 +2577,20 @@ mdb_txn_renew0(MDB_txn *txn) + txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */ } else { if (ti) { - LOCK_MUTEX_W(env); @@ -78,7 +78,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache txn->mt_txnid = ti->mti_txnid; meta = env->me_metas[txn->mt_txnid & 1]; -@@ -4330,6 +4357,12 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl) +@@ -4458,6 +4485,12 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl) pthread_mutexattr_t mattr; if ((rc = pthread_mutexattr_init(&mattr)) diff --git a/automake.diff b/automake.diff index ca96099..83cbb4e 100644 --- a/automake.diff +++ b/automake.diff @@ -50,7 +50,7 @@ hoops. But it is a tie IMO, and so, the casting vote shall be the AM route. --- /dev/null +++ liblmdb/configure.ac @@ -0,0 +1,15 @@ -+AC_INIT([liblmdb], [0.9.14], [http://symas.com/mdb/]) ++AC_INIT([liblmdb], [0.9.16], [http://symas.com/mdb/]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) diff --git a/baselibs.conf b/baselibs.conf index 058ba02..1048676 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -liblmdb-0_9_14 +liblmdb-0_9_16 diff --git a/lmdb-0.9.14.tar.bz2 b/lmdb-0.9.14.tar.bz2 deleted file mode 100644 index d937587..0000000 --- a/lmdb-0.9.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4270349036526e7fb759d9753cb4474451046577e401cdb66b224513854f630 -size 104535 diff --git a/lmdb-0.9.16.tar.bz2 b/lmdb-0.9.16.tar.bz2 new file mode 100644 index 0000000..a1a6cac --- /dev/null +++ b/lmdb-0.9.16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:458a4b33902285147238d1378ad1f1490080594e6875be52aae0cb5feb34c6ac +size 106682 diff --git a/lmdb.changes b/lmdb.changes index c5f2661..9852c2a 100644 --- a/lmdb.changes +++ b/lmdb.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sat Oct 24 18:20:27 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 0.9.16: +* Fix cursor EOF bug (ITS#8190) +* Fix handling of subDB records (ITS#8181) +* Fix mdb_midl_shrink() usage (ITS#8200) + - Changes since 0.9.15: +* Fix txn init (ITS#7961,#7987) +* Fix MDB_PREV_DUP (ITS#7955,#7671) +* Fix compact of empty env (ITS#7956) +* Fix mdb_copy file mode +* Fix mdb_env_close() after failed mdb_env_open() +* Fix mdb_rebalance collapsing root (ITS#8062) +* Fix mdb_load with large values (ITS#8066) +* Fix to retry writes on EINTR (ITS#8106) +* Fix mdb_cursor_del on empty DB (ITS#8109) +* Fix MDB_INTEGERDUP key compare (ITS#8117) +* Fix error handling (ITS#7959,#8157,etc.) +* Fix race conditions (ITS#7969,7970) +* Added workaround for fdatasync bug in ext3fs + * Build: + * Don't use -fPIC for static lib + * Update .gitignore (ITS#7952,#7953) + * Cleanup for "make test" (ITS#7841), "make clean", mtest*.c + * Misc. Android/Windows cleanup + * Documentation + * Fix MDB_APPEND doc + * Fix MDB_MAXKEYSIZE doc (ITS#8156) + * Fix mdb_cursor_put,mdb_cursor_del EACCES description + * Fix mdb_env_sync(MDB_RDONLY env) doc (ITS#8021) + * Clarify MDB_WRITEMAP doc (ITS#8021) + * Clarify mdb_env_open doc + * Clarify mdb_dbi_open doc + ------------------------------------------------------------------- Fri Sep 18 07:45:59 UTC 2015 - dimstar@opensuse.org diff --git a/lmdb.spec b/lmdb.spec index dc0cf0e..f26a8b1 100644 --- a/lmdb.spec +++ b/lmdb.spec @@ -20,8 +20,8 @@ Name: lmdb Summary: Lightning Memory-Mapped Database Manager License: OLDAP-2.8 Group: Productivity/Databases/Tools -%define lname liblmdb-0_9_14 -Version: 0.9.14 +%define lname liblmdb-0_9_16 +Version: 0.9.16 Release: 0 Url: http://symas.com/mdb/