Hello community, here is the log from the commit of package lmdb for openSUSE:Factory checked in at 2016-02-18 11:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmdb (Old) and /work/SRC/openSUSE:Factory/.lmdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmdb" Changes: -------- --- /work/SRC/openSUSE:Factory/lmdb/lmdb.changes 2015-12-13 09:38:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lmdb.new/lmdb.changes 2016-02-18 12:35:27.000000000 +0100 @@ -1,0 +2,51 @@ +Mon Feb 1 13:01:34 UTC 2016 - [email protected] + +- Renamed patches + 0002-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch + -> 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch + automake.diff + -> 0002-Autoconf-files.patch + +0003-Optimization-Define-correct-cacheline-size-on-HPUX.patch + +- Dropped patch (upstream) + 0001-Patch-for-LMDB-to-use-robust-mutexes.patch + +- Update to 0.9.17 + Fix ITS#7377 catch calloc failure + Fix ITS#8237 regression from ITS#7589 + Fix ITS#8238 page_split for DUPFIXED pages + Fix ITS#8221 MDB_PAGE_FULL on delete/rebalance + Fix ITS#8258 rebalance/split assert + Fix ITS#8263 cursor_put cursor tracking + Fix ITS#8264 cursor_del cursor tracking + Fix ITS#8310 cursor_del cursor tracking + Fix ITS#8299 mdb_del cursor tracking + Fix ITS#8300 mdb_del cursor tracking + Fix ITS#8304 mdb_del cursor tracking + Fix ITS#7771 fakepage cursor tracking + Fix ITS#7789 ensure mapsize >= pages in use + Fix ITS#7971 mdb_txn_renew0() new reader slots + Fix ITS#7969 use __sync_synchronize on non-x86 + Fix ITS#8311 page_split from update_key + Fix ITS#8312 loose pages in nested txn + Fix ITS#8313 mdb_rebalance dummy cursor + Fix ITS#8315 dirty_room in nested txn + Fix ITS#8323 dirty_list in nested txn + Fix ITS#8316 page_merge cursor tracking + Fix ITS#8321 cursor tracking + Fix ITS#8319 mdb_load error messages + Fix ITS#8320 mdb_load plaintext input + Added mdb_txn_id() (ITS#7994) + Added robust mutex support + Miscellaneous cleanup/simplification + Build + Create install dirs if needed (ITS#8256) + Fix ThreadProc decl on Win32/MSVC (ITS#8270) + Added ssize_t typedef for MSVC (ITS#8067) + Use ANSI apis on Windows (ITS#8069) + Use O_SYNC if O_DSYNC,MDB_DSYNC are not defined (ITS#7209) + Allow passing AR to make (ITS#8168) + Allow passing mandir to make install (ITS#8169) + +------------------------------------------------------------------- Old: ---- 0001-Patch-for-LMDB-to-use-robust-mutexes.patch 0002-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch LMDB_0.9.16.tar.gz automake.diff New: ---- 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch 0002-Autoconf-files.patch LMDB_0.9.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmdb.spec ++++++ --- /var/tmp/diff_new_pack.aqbBk0/_old 2016-02-18 12:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.aqbBk0/_new 2016-02-18 12:35:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lmdb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,22 @@ Summary: Lightning Memory-Mapped Database Manager License: OLDAP-2.8 Group: Productivity/Databases/Tools -%define lname liblmdb-0_9_16 -Version: 0.9.16 +%define lname liblmdb-0_9_17 +Version: 0.9.17 Release: 0 Url: http://symas.com/mdb/ #Git-Clone: git://git.openldap.org/openldap mdb.master Source: https://github.com/LMDB/lmdb/archive/LMDB_%version.tar.gz Source99: baselibs.conf -Patch1: automake.diff -Patch2: 0001-Patch-for-LMDB-to-use-robust-mutexes.patch -Patch3: 0002-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch -Patch4: liblmdb-implicit-decl.patch + +# PATCH-FIX-UPSTREAM - debugging tools (https://github.com/kacfengine/lmdb) +Patch1: 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch +# PATCH-FIX-UPSTREAM - configure.ac, Makefile.am, etc. +Patch2: 0002-Autoconf-files.patch +# PATCH-FIX-OPENSUSE - Implicit declaration of atol() +Patch3: liblmdb-implicit-decl.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.10 @@ -79,36 +83,33 @@ the liblmdb library. %prep -%setup -qn lmdb-LMDB_%version/libraries/liblmdb -# PATCH-FIX-OPENSUSE - autotools files, [email protected] +%setup -qn lmdb-LMDB_%version %patch1 -p1 -# PATCH-FIX-UPSTREAM - prevent deadlock when process holding db lock dies, [email protected] %patch2 -p1 -# PATCH-FIX-OPENSUSE - debugging tools (https://github.com/kacfengine/lmdb) %patch3 -p1 -# PATCH-FIX-OPENSUSE - Implicit declaration of atol() -%patch4 -p1 %build +cd libraries/liblmdb mkdir -p m4 autoreconf -fi %configure --disable-static make %{?_smp_mflags} V=1 %install +cd libraries/liblmdb make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la +(cd %buildroot/%_libdir; mv liblmdb.so liblmdb-%version.so; ln -s liblmdb-%version.so liblmdb.so) %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) -%doc CHANGES -%doc COPYRIGHT -%doc LICENSE +%doc libraries/liblmdb/CHANGES +%doc libraries/liblmdb/COPYRIGHT +%doc libraries/liblmdb/LICENSE %{_bindir}/* -%doc %{_mandir}/man1/* %files -n %lname %defattr(-,root,root) ++++++ 0002-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch -> 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch ++++++ --- /work/SRC/openSUSE:Factory/lmdb/0002-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch 2014-09-12 10:03:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lmdb.new/0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch 2016-02-18 12:35:27.000000000 +0100 @@ -1,5 +1,21 @@ +From 1701892d066c626bbd82c9340d6b442f733c33a1 Mon Sep 17 00:00:00 2001 +From: Kristian Amlie <[email protected]> +Date: Mon, 28 Jul 2014 11:28:38 +0200 +Subject: [PATCH 1/4] Add extra tools and CFEngine modifications for LMDB. + +--- + libraries/liblmdb/lmdump.c | 128 +++++++++++++++++++++++++++ + libraries/liblmdb/lmmgr.c | 201 +++++++++++++++++++++++++++++++++++++++++++ + libraries/liblmdb/mdb_copy.c | 2 +- + 3 files changed, 330 insertions(+), 1 deletion(-) + create mode 100644 libraries/liblmdb/lmdump.c + create mode 100644 libraries/liblmdb/lmmgr.c + +diff --git a/libraries/liblmdb/lmdump.c b/libraries/liblmdb/lmdump.c +new file mode 100644 +index 000000000000..0e3ee4bb61c2 --- /dev/null -+++ liblmdb/lmdump.c ++++ b/libraries/liblmdb/lmdump.c @@ -0,0 +1,128 @@ +/* lmdump.c - Lmdb database dumper + Has three modes : @@ -129,8 +145,11 @@ + + return 0; +} +diff --git a/libraries/liblmdb/lmmgr.c b/libraries/liblmdb/lmmgr.c +new file mode 100644 +index 000000000000..1137d8dc388a --- /dev/null -+++ liblmdb/lmmgr.c ++++ b/libraries/liblmdb/lmmgr.c @@ -0,0 +1,201 @@ +/* +lmmgr.c : Add, remove or manage the maxreaders value of a given database file @@ -333,14 +352,19 @@ + + return 1; +} ---- liblmdb.orig/Makefile.am -+++ liblmdb/Makefile.am -@@ -5,7 +5,7 @@ AM_CFLAGS = -W -Wall -Wno-unused-paramet - AM_CPPFLAGS = -include config.h - LDADD = liblmdb.la +diff --git a/libraries/liblmdb/mdb_copy.c b/libraries/liblmdb/mdb_copy.c +index f37ccbcc213e..bbe43bf601ae 100644 +--- a/libraries/liblmdb/mdb_copy.c ++++ b/libraries/liblmdb/mdb_copy.c +@@ -32,7 +32,7 @@ int main(int argc,char * argv[]) + int rc; + MDB_env *env; + const char *progname = argv[0], *act; +- unsigned flags = MDB_RDONLY; ++ unsigned flags = MDB_NOSUBDIR|MDB_RDONLY; + unsigned cpflags = 0; --bin_PROGRAMS = mdb_copy mdb_stat -+bin_PROGRAMS = mdb_copy mdb_stat lmdump lmmgr - check_PROGRAMS = mtest mtest2 mtest3 mtest4 mtest5 - man_MANS = mdb_copy.1 mdb_stat.1 - include_HEADERS = lmdb.h + for (; argc > 1 && argv[1][0] == '-'; argc--, argv++) { +-- +2.7.0 + ++++++ 0002-Autoconf-files.patch ++++++ >From 8e9182f6252eeb8e2390de814f4d1e9db2485edc Mon Sep 17 00:00:00 2001 From: Kristian Amlie <[email protected]> Date: Wed, 18 Feb 2015 09:40:20 +0100 Subject: [PATCH 2/4] Autoconf files. --- libraries/liblmdb/Makefile | 111 ----------------------------------------- libraries/liblmdb/Makefile.am | 11 ++++ libraries/liblmdb/configure.ac | 42 ++++++++++++++++ libraries/liblmdb/mdb.c | 6 +++ 4 files changed, 59 insertions(+), 111 deletions(-) delete mode 100644 libraries/liblmdb/Makefile create mode 100644 libraries/liblmdb/Makefile.am create mode 100644 libraries/liblmdb/configure.ac diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile deleted file mode 100644 index dbb5d698fee7..000000000000 --- a/libraries/liblmdb/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -# Makefile for liblmdb (Lightning memory-mapped database library). - -######################################################################## -# Configuration. The compiler options must enable threaded compilation. -# -# Preprocessor macros (for CPPFLAGS) of interest... -# Note that the defaults should already be correct for most -# platforms; you should not need to change any of these. -# Read their descriptions in mdb.c if you do: -# -# - MDB_USE_POSIX_SEM -# - MDB_DSYNC -# - MDB_FDATASYNC -# - MDB_FDATASYNC_WORKS -# - MDB_USE_PWRITEV -# - MDB_USE_ROBUST -# -# There may be other macros in mdb.c of interest. You should -# read mdb.c before changing any of them. -# -CC = gcc -AR = ar -W = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized -THREADS = -pthread -OPT = -O2 -g -CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) -LDLIBS = -SOLIBS = -prefix = /usr/local -mandir = $(prefix)/man - -######################################################################## - -IHDRS = lmdb.h -ILIBS = liblmdb.a liblmdb.so -IPROGS = mdb_stat mdb_copy mdb_dump mdb_load -IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 -PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5 -all: $(ILIBS) $(PROGS) - -install: $(ILIBS) $(IPROGS) $(IHDRS) - mkdir -p $(DESTDIR)$(prefix)/bin - mkdir -p $(DESTDIR)$(prefix)/lib - mkdir -p $(DESTDIR)$(prefix)/include - mkdir -p $(DESTDIR)$(prefix)/man/man1 - for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done - for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done - for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done - for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done - -clean: - rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb - -test: all - rm -rf testdb && mkdir testdb - ./mtest && ./mdb_stat testdb - -liblmdb.a: mdb.o midl.o - $(AR) rs $@ mdb.o midl.o - -liblmdb.so: mdb.lo midl.lo -# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) - $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) - -mdb_stat: mdb_stat.o liblmdb.a -mdb_copy: mdb_copy.o liblmdb.a -mdb_dump: mdb_dump.o liblmdb.a -mdb_load: mdb_load.o liblmdb.a -mtest: mtest.o liblmdb.a -mtest2: mtest2.o liblmdb.a -mtest3: mtest3.o liblmdb.a -mtest4: mtest4.o liblmdb.a -mtest5: mtest5.o liblmdb.a -mtest6: mtest6.o liblmdb.a - -mdb.o: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c - -midl.o: midl.c midl.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c - -mdb.lo: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@ - -midl.lo: midl.c midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@ - -%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ - -%.o: %.c lmdb.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - -COV_FLAGS=-fprofile-arcs -ftest-coverage -COV_OBJS=xmdb.o xmidl.o - -coverage: xmtest - for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ - gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ - rm -rf testdb; mkdir testdb; ./x$$j; done - gcov xmdb.c - gcov xmidl.c - -xmtest: mtest.o xmdb.o xmidl.o - gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) - -xmdb.o: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@ - -xmidl.o: midl.c midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c midl.c -o $@ diff --git a/libraries/liblmdb/Makefile.am b/libraries/liblmdb/Makefile.am new file mode 100644 index 000000000000..d3a4a4c99c5d --- /dev/null +++ b/libraries/liblmdb/Makefile.am @@ -0,0 +1,11 @@ +lib_LTLIBRARIES = liblmdb.la +liblmdb_la_SOURCES = mdb.c midl.c +liblmdb_la_LDFLAGS=-no-undefined -avoid-version + +bin_PROGRAMS = mdb_stat mdb_copy lmdump lmmgr +mdb_stat_LDADD = liblmdb.la +mdb_copy_LDADD = liblmdb.la +lmdump_LDADD = liblmdb.la +lmmgr_LDADD = liblmdb.la + +include_HEADERS = lmdb.h diff --git a/libraries/liblmdb/configure.ac b/libraries/liblmdb/configure.ac new file mode 100644 index 000000000000..3db22516634b --- /dev/null +++ b/libraries/liblmdb/configure.ac @@ -0,0 +1,42 @@ +AC_INIT([hello], [1.0]) # good +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([foreign]) + +AC_PROG_CC + +# Use either new LT_INIT or old AC_DISABLE_STATIC/AC_PROG_LIBTOOL macros +m4_ifdef([LT_INIT], + [LT_INIT([disable-static])], + [AC_DISABLE_STATIC + AC_PROG_LIBTOOL]) + +AC_ARG_WITH([pthread], [Path to pthread]) +AS_IF([test -n "$with_pthread"], + [LDFLAGS+=" -L$with_pthread/lib"] +) +AC_CHECK_LIB([pthread], [pthread_mutex_lock]) +AC_CHECK_LIB([pthreadGC2], [pthread_mutex_lock]) +AS_IF([test "$ac_cv_lib_pthread" = "no" && test "$ac_cv_lib_pthreadGC2" = "no"], +[ + AC_MSG_ERROR([Could not find pthreads library]) +]) +AC_CHECK_FUNCS([pthread_mutexattr_settype]) +AC_CHECK_FUNC([pthread_mutexattr_setrobust], +[ + AC_MSG_CHECKING([whether pthread_mutexattr_setrobust can be used on this platform]) + AS_CASE([$target_os], + [*solaris*], + [ + # Disable pthread_mutexattr_setrobust on Solaris, it is reported as + # existing on Solaris 11, but known to be broken. + AC_MSG_RESULT([no]) + ], + [ + AC_DEFINE([HAVE_PTHREAD_MUTEXATTR_SETROBUST]) + AC_MSG_RESULT([yes]) + ]) +]) + +AC_CONFIG_SRCDIR([mdb.c]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 96c859efd9bd..695d11602a13 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -220,6 +220,12 @@ typedef SSIZE_T ssize_t; #define MDB_DEVEL 0 #endif +#ifdef HAVE_PTHREAD_MUTEXATTR_SETROBUST +#define MDB_USE_ROBUST 1 +#else +#define MDB_USE_ROBUST 0 +#endif + /** Wrapper around __func__, which is a C99 feature */ #if __STDC_VERSION__ >= 199901L # define mdb_func_ __func__ -- 2.7.0 ++++++ LMDB_0.9.16.tar.gz -> LMDB_0.9.17.tar.gz ++++++ ++++ 3585 lines of diff (skipped) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.aqbBk0/_old 2016-02-18 12:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.aqbBk0/_new 2016-02-18 12:35:28.000000000 +0100 @@ -1 +1 @@ -liblmdb-0_9_16 +liblmdb-0_9_17 ++++++ liblmdb-implicit-decl.patch ++++++ --- /var/tmp/diff_new_pack.aqbBk0/_old 2016-02-18 12:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.aqbBk0/_new 2016-02-18 12:35:28.000000000 +0100 @@ -1,5 +1,5 @@ ---- liblmdb.orig/lmmgr.c -+++ liblmdb/lmmgr.c +--- a/libraries/liblmdb.orig/lmmgr.c ++++ b/libraries/liblmdb/lmmgr.c @@ -3,6 +3,7 @@ lmmgr.c : Add, remove or manage the maxr */ #include <stdio.h>
