From 44884aec35698bebf309e0ad417b7719f8f69d7b Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 1 Dec 2015 17:27:08 +0000
Subject: [PATCH] Update to lmdb-0.9.7

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16702 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 server/databases/lmdb.xml          | 35 ++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5add54e1c4..22c0e839c5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>December 1st, 2015</para>
       <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to lmdb-0.9.7.  Fixes 
+         <ulink url="&blfs-ticket-root;7195">#7195</ulink>.</para>
+        </listitem>
        <listitem>
          <para>[fernando] - Update to lua-5.3.2. Added optional "Basic tests".
          Fixes <ulink url="&blfs-ticket-root;7193">#7193</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index f9ec6cbd58..c6d7f00109 100644
--- a/packages.ent
+++ b/packages.ent
@@ -425,7 +425,7 @@
 
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.1.26">
-<!ENTITY lmdb-version                 "0.9.16">
+<!ENTITY lmdb-version                 "0.9.17">
 <!ENTITY mariadb-version              "10.1.9">
 <!ENTITY postgresql-version           "9.4.5">
 <!ENTITY sqlite-version               "3.9.2">
diff --git a/server/databases/lmdb.xml b/server/databases/lmdb.xml
index 11d1a7f459..74a679f44c 100644
--- a/server/databases/lmdb.xml
+++ b/server/databases/lmdb.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY lmdb-download-http "https://github.com/LMDB/lmdb/archive/LMDB_&lmdb-version;.tar.gz">
   <!ENTITY lmdb-download-ftp  " ">
-  <!ENTITY lmdb-md5sum        "0de89730b8f3f5711c2b3a4ba517b648">
-  <!ENTITY lmdb-size          "128 KB">
-  <!ENTITY lmdb-buildsize     "5.4 MB">
+  <!ENTITY lmdb-md5sum        "8a5501c8b8535ddd6de67e95a8633aff">
+  <!ENTITY lmdb-size          "136 KB">
+  <!ENTITY lmdb-buildsize     "7.2 MB">
   <!ENTITY lmdb-time          "less than 0.1 SBU">
 ]>
 
@@ -81,17 +81,17 @@
   <sect2 role="installation">
     <title>Installation of lmdb</title>
 
-    <note><para>This package extracts to lmdb-LMDB_0.9.16.</para></note>
+    <note><para>This package extracts to lmdb-LMDB_&lmdb-version;.</para></note>
 
     <para>
       Install <application>lmdb</application> by running the following
       commands:
     </para>
 
-<screen><userinput>cd libraries/liblmdb               &amp;&amp;
-sed -i 's|/man/|/share&amp;|' Makefile &amp;&amp;
-
-make</userinput></screen>
+<screen><userinput>cd libraries/liblmdb                     &amp;&amp;
+sed -i 's|prefix)/man|mandir)|' Makefile &amp;&amp;
+make                                     &amp;&amp;
+sed -i 's| liblmdb.a||'         Makefile</userinput></screen>
 
     <para>
       This package does not come with a test suite.
@@ -101,10 +101,27 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
+<screen role="root"><userinput>make prefix=/usr mandir=/usr/share/man install</userinput></screen>
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed ... prefix ... Makefile</command>: The Makefile creates the 
+      man pages directory during install if it is not present.  
+      This fixes the directory location.
+    </para>
+
+    <para>
+      <command>sed ... liblmdb.a ... Makefile</command>: The package executables
+      use a static library so it must be created.  This command suppresses installation
+      of the static library.
+    </para>
+
+  </sect2>  
+
   <sect2 role="content">
     <title>Contents</title>