From 99427fcab8b0faed55e2017eb4c20619fdeefedd Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 3 Dec 2015 19:08:00 +0000
Subject: [PATCH 1/4] Return to releng

---
 libraries/liblmdb/CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index bf4486bef4..4168af3b55 100644
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -1,5 +1,7 @@
 LMDB 0.9 Change Log
 
+LMDB 0.9.18 Release Engineering
+
 LMDB 0.9.17 Release (2015/11/30)
 	Fix ITS#7377 catch calloc failure
 	Fix ITS#8237 regression from ITS#7589

From 8738e5e306a37220d9ee5fac1c32802eff0aa5ca Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Tue, 1 Dec 2015 13:48:29 +0000
Subject: [PATCH 2/4] ITS#8169 more Makefile tweaks

Fix prev commit, use all the same vars as main OpenLDAP makefiles
---
 libraries/liblmdb/Makefile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index dbb5d698fe..0940c496ea 100644
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -27,7 +27,12 @@ CFLAGS	= $(THREADS) $(OPT) $(W) $(XCFLAGS)
 LDLIBS	=
 SOLIBS	=
 prefix	= /usr/local
-mandir = $(prefix)/man
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+includedir = $(prefix)/include
+datarootdir = $(prefix)/share
+mandir = $(datarootdir)/man
 
 ########################################################################
 
@@ -39,13 +44,13 @@ 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
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(libdir)
+	mkdir -p $(DESTDIR)$(includedir)
+	mkdir -p $(DESTDIR)$(mandir)/man1
+	for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
+	for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
+	for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
 	for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
 
 clean:

From 19d135af54d185d0b5687af7cfd20986af406820 Mon Sep 17 00:00:00 2001
From: Sebastien Launay <sebastien@slaunay.fr>
Date: Thu, 3 Dec 2015 10:42:36 -0800
Subject: [PATCH 3/4] ITS#8330 Fix robust mutex detection for glibc 2.10 and
 2.11

pthread_mutexattr_setrobust and pthread_mutex_consistent are provided since 2.12 not 2.10:
https://sourceware.org/git/?p=glibc.git;a=commit;h=402cd98775db1478f64c9b0dbe00664b89eb2773
https://sourceware.org/git/?p=glibc.git;a=commit;h=78ee21859939ff75ccf8bbe00499b0c462df2e2d
---
 libraries/liblmdb/mdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 96c859efd9..f495d6c1f8 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -256,8 +256,8 @@ typedef SSIZE_T	ssize_t;
 #  define MDB_USE_ROBUST	0
 # else
 #  define MDB_USE_ROBUST	1
-/* glibc < 2.10 only provided _np API */
-#  if defined(__GLIBC__) && GLIBC_VER < 0x02000a
+/* glibc < 2.12 only provided _np API */
+#  if defined(__GLIBC__) && GLIBC_VER < 0x02000c
 #   define PTHREAD_MUTEX_ROBUST	PTHREAD_MUTEX_ROBUST_NP
 #   define pthread_mutexattr_setrobust(attr, flag)	pthread_mutexattr_setrobust_np(attr, flag)
 #   define pthread_mutex_consistent(mutex)	pthread_mutex_consistent_np(mutex)

From 14ce42f434170895373ea452e46f858f59e27dd9 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 3 Dec 2015 19:14:11 +0000
Subject: [PATCH 4/4] ITS#8169, #8330

---
 libraries/liblmdb/CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index 4168af3b55..4665e8666f 100644
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -1,6 +1,10 @@
 LMDB 0.9 Change Log
 
 LMDB 0.9.18 Release Engineering
+	Fix robust mutex detection on glibc 2.10-11 (ITS#8330)
+	Build
+		Additional makefile var tweaks (ITS#8169)
+	
 
 LMDB 0.9.17 Release (2015/11/30)
 	Fix ITS#7377 catch calloc failure