Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/databases.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -23,4 +23,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lmdb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mariadb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql.xml"/>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/db.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,5 +78,6 @@
       <xref linkend="tcl"/>,
       <xref linkend="openjdk"/> or <xref linkend="java"/>, and
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
+      <xref linkend="sharutils"/> (for the <command>uudecode</command> command
+      - Java bindings are required)
     </para>
 
@@ -149,26 +150,4 @@
     <title>Installation of Berkeley DB</title>
 
-    <!-- <note>
-      <para>
-        If you plan on installing <application>Berkeley DB</application> with
-        Java support, you should check the system for certain versions of
-       <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically,
-        if <application>JDK</application>-6 Update X and the
-        <command>uudecode</command> program from the
-        <application>GMime</application> program is on the system, the build
-        will fail (unless you run the modified <command>./configure</command>
-        command shown below). You can run two commands
-        (<command>javac -version</command> and
-        <command>uudecode -&#45;version</command>) to determine what versions are
-        installed. You can also download and run a shell script from
-        <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert you
-        to a non-working condition. If the identified programs exist on the
-        system, you must modify the <command>./configure</command> command as
-        shown below.
-      </para>
-
-<screen><userinput>uudecode="no" ../dist/configure -&#45;(use the parameters shown below)</userinput></screen>
-    </note> -->
-
     <para>
       Install <application>Berkeley DB</application> by running the following
@@ -183,8 +162,4 @@
                   --enable-cxx       &amp;&amp;
 make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
 
     <para>
Index: server/databases/lmdb.xml
===================================================================
--- server/databases/lmdb.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
+++ server/databases/lmdb.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY lmdb-download-http "https://github.com/LMDB/lmdb/archive/LMDB_&lmdb-version;.tar.gz">
+  <!ENTITY lmdb-download-ftp  " ">
+  <!ENTITY lmdb-md5sum        "8a5501c8b8535ddd6de67e95a8633aff">
+  <!ENTITY lmdb-size          "136 KB">
+  <!ENTITY lmdb-buildsize     "7.2 MB">
+  <!ENTITY lmdb-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="lmdb" xreflabel="lmdb-&lmdb-version;">
+  <?dbhtml filename="lmdb.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>lmdb-&lmdb-version;</title>
+
+  <indexterm zone="lmdb">
+    <primary sortas="a-lmdb">lmdb</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to lmdb</title>
+
+    <para>
+      The <application>lmdb</application> package is a fast, compact, key-value
+      embedded data store.  It uses memory-mapped files, so it has the read
+      performance of a pure in-memory database while still offering the
+      persistence of standard disk-based databases, and is only limited to the
+      size of the virtual address space
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&lmdb-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lmdb-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lmdb-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lmdb-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lmdb-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lmdb-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/lmdb"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of lmdb</title>
+
+    <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|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.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<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>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          mdb_copy, mdb_dump, mdb_load, and mdb_stat
+        </seg>
+        <seg>
+          liblmdb.so
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+<!--  TODO
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lmdb_copy">
+        <term><command>lmdb_copy</command></term>
+        <listitem>
+          <para>
+            A tool to copy an LMDB environment.
+          </para>
+          <indexterm zone="lmdb lmdb_copy">
+            <primary sortas="b-lmdb_copy">lmdb_copy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/mariadb.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -7,8 +7,8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "956561f3798d1fe8dfbe4b665287a87a">
-  <!ENTITY mariadb-size          "54 MB">
-  <!ENTITY mariadb-buildsize     "1.4 GB">
-  <!ENTITY mariadb-time          "10 SBU (with tests)">
+  <!ENTITY mariadb-md5sum        "9aa4d68b24c1ddd8cb56923a920684b3">
+  <!ENTITY mariadb-size          "53 MB">
+  <!ENTITY mariadb-buildsize     "1.6 GB (with tests)">
+  <!ENTITY mariadb-time          "3.8 SBU, (with tests - all using parallelism=4)">
 ]>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -122,5 +122,5 @@
     <warning>
       <para>
-        MariaDB and MySQL cannot be installed on the same system without 
+        MariaDB and MySQL cannot be installed on the same system without
         extensive changes to the build configuration of one of the two applications.
       </para>
@@ -183,5 +183,5 @@
 
     <para>
-      <command>sed -i ...</command>: This command sets correct installation
+      <command>sed -i ...</command>: Set correct installation
       directory for some components.
     </para>
@@ -282,17 +282,17 @@
 #bdb_max_lock = 10000
 
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /srv/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /srv/mysql
+# InnoDB tables are now used by default
+innodb_data_home_dir = /srv/mysql
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_log_group_home_dir = /srv/mysql
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
+innodb_buffer_pool_size = 16M
+innodb_additional_mem_pool_size = 2M
 # Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
+innodb_log_file_size = 5M
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
 
 [mysqldump]
@@ -391,6 +391,6 @@
         <seg>
           aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          innochecksum, msql2mysql, my_print_defaults, myisam_ftdump,
-          myisamchk, myisamlog, myisampack, mysql, mysql_client_test,
+          innochecksum, msql2mysql, my_print_defaults, myisam_ftdump, myisamchk,
+          myisamlog, myisampack, mysql, mysql_client_test,
           mysql_client_test_embedded, mysql_config, mysql_convert_table_format,
           mysql_embedded, mysql_find_rows, mysql_fix_extensions,
@@ -401,17 +401,17 @@
           mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow, mysqlslap,
           mysqltest, mysqltest_embedded, mytop, perror, replace,
-          resolve_stack_dump and resolveip
+          resolve_stack_dump, resolveip, wsrep_sst_common, wsrep_sst_mysqldump,
+          wsrep_sst_rsync, wsrep_sst_xtrabackup, and wsrep_sst_xtrabackup-v2
         </seg>
         <seg>
-          libmysqlclient.{so,a}, libmysqlclient_r.{so,a},
-          libmysqld.{so,a} and libmysqlservices.a
+          libmysqlclient.{so,a},
+          libmysqlclient_r.{so,a} (symbolic links to libmysqlclient.{so,a}),
+          libmysqld.{so,a}, libmysqlservices.a,
+          and several under /usr/lib/mysql/plugin/
         </seg>
         <seg>
           /etc/mysql,
-          /srv/mysql,
-          /usr/include/mysql,
-          /usr/lib/mysql,
-          /usr/share/doc/mariadb-&mariadb-version; and
-          /usr/share/mysql
+          /usr/{include,lib,share}/mysql, and
+          /usr/share/doc/mariadb-&mariadb-version;
         </seg>
       </seglistitem>
@@ -420,4 +420,5 @@
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
+<!--
     <para>
       Descriptions of all the programs and libraries would be several
@@ -426,5 +427,5 @@
       url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
     </para>
-
+-->
     <para>
       The <application>Perl</application> DBI modules must be installed
@@ -433,4 +434,624 @@
     </para>
 
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="aria_chk-mariadb">
+        <term><command>aria_chk</command></term>
+        <listitem>
+          <para>
+            is used to check, repair, optimize, sort and get information
+            about Aria tables.
+          </para>
+          <indexterm zone="mariadb aria_chk-mariadb">
+            <primary sortas="b-aria_chk-mariadb">aria_chk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aria_dump_log-mariadb">
+        <term><command>aria_dump_log</command></term>
+        <listitem>
+          <para>
+            is a tool to dump content of Aria log pages.
+          </para>
+          <indexterm zone="mariadb aria_dump_log-mariadb">
+            <primary sortas="b-aria_dump_log-mariadb">aria_dump_log</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aria_ftdump-mariadb">
+        <term><command>aria_ftdump</command></term>
+        <listitem>
+          <para>
+            displays full-text index information.
+          </para>
+          <indexterm zone="mariadb aria_ftdump-mariadb">
+            <primary sortas="b-aria_ftdump-mariadb">aria_ftdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aria_pack-mariadb">
+        <term><command>aria_pack</command></term>
+        <listitem>
+          <para>
+            is a tool to generate compressed, read-only Aria tables.
+          </para>
+          <indexterm zone="mariadb aria_pack-mariadb">
+            <primary sortas="b-aria_pack-mariadb">aria_pack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aria_read_log-mariadb">
+        <term><command>aria_read_log</command></term>
+        <listitem>
+          <para>
+            displays Aria log file contents.
+          </para>
+          <indexterm zone="mariadb aria_read_log-mariadb">
+            <primary sortas="b-aria_read_log-mariadb">aria_read_log</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="innochecksum-mariadb">
+        <term><command>innochecksum</command></term>
+        <listitem>
+          <para>
+            prints checksums for InnoDB files.
+          </para>
+          <indexterm zone="mariadb innochecksum-mariadb">
+            <primary sortas="b-innochecksum-mariadb">innochecksum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="msql2mysql-mariadb">
+        <term><command>msql2mysql</command></term>
+        <listitem>
+          <para>
+            is a tool to convert mSQL programs for use with MySQL.
+          </para>
+          <indexterm zone="mariadb msql2mysql-mariadb">
+            <primary sortas="b-msql2mysql-mariadb">msql2mysql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="my_print_defaults-mariadb">
+        <term><command>my_print_defaults</command></term>
+        <listitem>
+          <para>
+            displays the options from option groups of option files.
+          </para>
+          <indexterm zone="mariadb my_print_defaults-mariadb">
+            <primary sortas="b-my_print_defaults-mariadb">my_print_defaults</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisam_ftdump-mariadb">
+        <term><command>myisam_ftdump</command></term>
+        <listitem>
+          <para>
+            displays information about FULLTEXT indexes in MyISAM tables.
+          </para>
+          <indexterm zone="mariadb myisam_ftdump-mariadb">
+            <primary sortas="b-myisam_ftdump-mariadb">myisam_ftdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisamchk-mariadb">
+        <term><command>myisamchk</command></term>
+        <listitem>
+          <para>
+            gets information about your database tables or checks, repairs,
+            or optimizes them.
+          </para>
+          <indexterm zone="mariadb myisamchk-mariadb">
+            <primary sortas="b-myisamchk-mariadb">myisamchk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisamlog-mariadb">
+        <term><command>myisamlog</command></term>
+        <listitem>
+          <para>
+            displays MyISAM log file contents.
+          </para>
+          <indexterm zone="mariadb myisamlog-mariadb">
+            <primary sortas="b-myisamlog-mariadb">myisamlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisampack-mariadb">
+        <term><command>myisampack</command></term>
+        <listitem>
+          <para>
+            is a tool for compressing MyISAM tables.
+          </para>
+          <indexterm zone="mariadb myisampack-mariadb">
+            <primary sortas="b-myisampack-mariadb">myisampack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql-mariadb">
+        <term><command>mysql</command></term>
+        <listitem>
+          <para>
+             is a simple SQL shell with input line editing capabilities.
+          </para>
+          <indexterm zone="mariadb mysql-mariadb">
+            <primary sortas="b-mysql-mariadb">mysql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_client_test-mariadb">
+        <term><command>mysql_client_test</command></term>
+        <listitem>
+          <para>
+            is used for testing aspects of the MySQL client API that cannot be
+            tested using mysqltest and its test language.
+          </para>
+          <indexterm zone="mariadb mysql_client_test-mariadb">
+            <primary sortas="b-mysql_client_test-mariadb">mysql_client_test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_client_test_embedded-mariadb">
+        <term><command>mysql_client_test_embedded</command></term>
+        <listitem>
+          <para>
+            is a tool to test client API for embedded server.
+          </para>
+          <indexterm zone="mariadb mysql_client_test_embedded-mariadb">
+            <primary sortas="b-mysql_client_test_embedded-mariadb">mysql_client_test_embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_config-mariadb">
+        <term><command>mysql_config</command></term>
+        <listitem>
+          <para>
+            provides you with useful information for compiling your MySQL
+            client and connecting it to MySQL.
+          </para>
+          <indexterm zone="mariadb mysql_config-mariadb">
+            <primary sortas="b-mysql_config-mariadb">mysql_config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_convert_table_format-mariadb">
+        <term><command>mysql_convert_table_format</command></term>
+        <listitem>
+          <para>
+            converts the tables in a database to use a particular storage
+            engine.
+          </para>
+          <indexterm zone="mariadb mysql_convert_table_format-mariadb">
+            <primary sortas="b-mysql_convert_table_format-mariadb">mysql_convert_table_format</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_embedded-mariadb">
+        <term><command>mysql_embedded</command></term>
+        <listitem>
+          <para>
+            is a MySQL client statically linked to
+            libmysqld.
+          </para>
+          <indexterm zone="mariadb mysql_embedded-mariadb">
+            <primary sortas="b-mysql_embedded-mariadb">mysql_embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_find_rows-mariadb">
+        <term><command>mysql_find_rows</command></term>
+        <listitem>
+          <para>
+            reads files containing SQL statements and extracts statements that
+            match a given regular expression or that contain USE db_name or
+            SET statements.
+          </para>
+          <indexterm zone="mariadb mysql_find_rows-mariadb">
+            <primary sortas="b-mysql_find_rows-mariadb">mysql_find_rows</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_fix_extensions-mariadb">
+        <term><command>mysql_fix_extensions</command></term>
+        <listitem>
+          <para>
+            converts the extensions for MyISAM (or ISAM ) table files to
+            their canonical forms.
+          </para>
+          <indexterm zone="mariadb mysql_fix_extensions-mariadb">
+            <primary sortas="b-mysql_fix_extensions-mariadb">mysql_fix_extensions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_install_db-mariadb">
+        <term><command>mysql_install_db</command></term>
+        <listitem>
+          <para>
+            initializes the MySQL data directory and creates the system
+            tables that it contains, if they do not exist.
+          </para>
+          <indexterm zone="mariadb mysql_install_db-mariadb">
+            <primary sortas="b-mysql_install_db-mariadb">mysql_install_db</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_plugin-mariadb">
+        <term><command>mysql_plugin</command></term>
+        <listitem>
+          <para>
+            is a utility that enable MySQL administrators to manage which
+            plugins a MySQL server loads.
+          </para>
+          <indexterm zone="mariadb mysql_plugin-mariadb">
+            <primary sortas="b-mysql_plugin-mariadb">mysql_plugin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_secure_installation-mariadb">
+        <term><command>mysql_secure_installation</command></term>
+        <listitem>
+          <para>
+            is a tool to improve MySQL installation security.
+          </para>
+          <indexterm zone="mariadb mysql_secure_installation-mariadb">
+            <primary sortas="b-mysql_secure_installation-mariadb">mysql_secure_installation</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_setpermission-mariadb">
+        <term><command>mysql_setpermission</command></term>
+        <listitem>
+          <para>
+            sets permissions in the MySQL grant tables.
+          </para>
+          <indexterm zone="mariadb mysql_setpermission-mariadb">
+            <primary sortas="b-mysql_setpermission-mariadb">mysql_setpermission</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_tzinfo_to_sql-mariadb">
+        <term><command>mysql_tzinfo_to_sql</command></term>
+        <listitem>
+          <para>
+            loads the time zone tables in the mysql database.
+          </para>
+          <indexterm zone="mariadb mysql_tzinfo_to_sql-mariadb">
+            <primary sortas="b-mysql_tzinfo_to_sql-mariadb">mysql_tzinfo_to_sql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_upgrade-mariadb">
+        <term><command>mysql_upgrade</command></term>
+        <listitem>
+          <para>
+            examines all tables in all databases for incompatibilities with
+            the current version of MySQL Server.
+          </para>
+          <indexterm zone="mariadb mysql_upgrade-mariadb">
+            <primary sortas="b-mysql_upgrade-mariadb">mysql_upgrade</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_waitpid-mariadb">
+        <term><command>mysql_waitpid</command></term>
+        <listitem>
+          <para>
+            signals a process to terminate and waits for the process to exit.
+          </para>
+          <indexterm zone="mariadb mysql_waitpid-mariadb">
+            <primary sortas="b-mysql_waitpid-mariadb">mysql_waitpid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_zap-mariadb">
+        <term><command>mysql_zap</command></term>
+        <listitem>
+          <para>
+            is a tool to kill processes that match a pattern.
+          </para>
+          <indexterm zone="mariadb mysql_zap-mariadb">
+            <primary sortas="b-mysql_zap-mariadb">mysql_zap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlaccess-mariadb">
+        <term><command>mysqlaccess</command></term>
+        <listitem>
+          <para>
+            checks the access privileges for a host name, user name, and
+            database combination.
+          </para>
+          <indexterm zone="mariadb mysqlaccess-mariadb">
+            <primary sortas="b-mysqlaccess-mariadb">mysqlaccess</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqladmin-mariadb">
+        <term><command>mysqladmin</command></term>
+        <listitem>
+          <para>
+            is a client for performing administrative operations.
+          </para>
+          <indexterm zone="mariadb mysqladmin-mariadb">
+            <primary sortas="b-mysqladmin-mariadb">mysqladmin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlbinlog-mariadb">
+        <term><command>mysqlbinlog</command></term>
+        <listitem>
+          <para>
+            read binary log files.
+          </para>
+          <indexterm zone="mariadb mysqlbinlog-mariadb">
+            <primary sortas="b-mysqlbinlog-mariadb">mysqlbinlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlbug-mariadb">
+        <term><command>mysqlbug</command></term>
+        <listitem>
+          <para>
+            is a tool to generate bug report.
+          </para>
+          <indexterm zone="mariadb mysqlbug-mariadb">
+            <primary sortas="b-mysqlbug-mariadb">mysqlbug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlcheck-mariadb">
+        <term><command>mysqlcheck</command></term>
+        <listitem>
+          <para>
+            performs table maintenance: It checks, repairs, optimizes,
+            or analyzes tables.
+          </para>
+          <indexterm zone="mariadb mysqlcheck-mariadb">
+            <primary sortas="b-mysqlcheck-mariadb">mysqlcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqld-mariadb">
+        <term><command>mysqld</command></term>
+        <listitem>
+          <para>
+            is the MySQL server daemon.
+          </para>
+          <indexterm zone="mariadb mysqld-mariadb">
+            <primary sortas="b-mysqld-mariadb">mysqld</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqld_multi-mariadb">
+        <term><command>mysqld_multi</command></term>
+        <listitem>
+          <para>
+            is designed to manage several mysqld processes that listen for
+            connections on different Unix socket files and TCP/IP ports.
+          </para>
+          <indexterm zone="mariadb mysqld_multi-mariadb">
+            <primary sortas="b-mysqld_multi-mariadb">mysqld_multi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqld_safe-mariadb">
+        <term><command>mysqld_safe</command></term>
+        <listitem>
+          <para>
+             is the recommended way to start a mysqld server on Unix
+             and NetWare.
+          </para>
+          <indexterm zone="mariadb mysqld_safe-mariadb">
+            <primary sortas="b-mysqld_safe-mariadb">mysqld_safe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqldump-mariadb">
+        <term><command>mysqldump</command></term>
+        <listitem>
+          <para>
+            is a backup program.
+          </para>
+          <indexterm zone="mariadb mysqldump-mariadb">
+            <primary sortas="b-mysqldump-mariadb">mysqldump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqldumpslow-mariadb">
+        <term><command>mysqldumpslow</command></term>
+        <listitem>
+          <para>
+            parses MySQL slow query log files and prints a summary of their
+            contents.
+          </para>
+          <indexterm zone="mariadb mysqldumpslow-mariadb">
+            <primary sortas="b-mysqldumpslow-mariadb">mysqldumpslow</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlhotcopy-mariadb">
+        <term><command>mysqlhotcopy</command></term>
+        <listitem>
+          <para>
+            locks the table, flush the table and then performs a copy of
+            the database.
+          </para>
+          <indexterm zone="mariadb mysqlhotcopy-mariadb">
+            <primary sortas="b-mysqlhotcopy-mariadb">mysqlhotcopy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlimport-mariadb">
+        <term><command>mysqlimport</command></term>
+        <listitem>
+          <para>
+            reads a range of data formats, and inserts the data into a
+            database.
+          </para>
+          <indexterm zone="mariadb mysqlimport-mariadb">
+            <primary sortas="b-mysqlimport-mariadb">mysqlimport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlshow-mariadb">
+        <term><command>mysqlshow</command></term>
+        <listitem>
+          <para>
+            shows the structure of a MariaDB database.
+          </para>
+          <indexterm zone="mariadb mysqlshow-mariadb">
+            <primary sortas="b-mysqlshow-mariadb">mysqlshow</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqlslap-mariadb">
+        <term><command>mysqlslap</command></term>
+        <listitem>
+          <para>
+            is a diagnostic program designed to emulate client load for a
+            MySQL server and to report the timing of each stage.
+          </para>
+          <indexterm zone="mariadb mysqlslap-mariadb">
+            <primary sortas="b-mysqlslap-mariadb">mysqlslap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqltest-mariadb">
+        <term><command>mysqltest</command></term>
+        <listitem>
+          <para>
+            runs a test case against a MySQL server and optionally compares
+            the output with a result file.
+          </para>
+          <indexterm zone="mariadb mysqltest-mariadb">
+            <primary sortas="b-mysqltest-mariadb">mysqltest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysqltest_embedded-mariadb">
+        <term><command>mysqltest_embedded</command></term>
+        <listitem>
+          <para>
+            is similar to the <command>mysqltest</command> command but is built
+            with support for the libmysqld embedded server.
+          </para>
+          <indexterm zone="mariadb mysqltest_embedded-mariadb">
+            <primary sortas="b-mysqltest_embedded-mariadb">mysqltest_embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mytop-mariadb">
+        <term><command>mytop</command></term>
+        <listitem>
+          <para>
+            is a console-based tool for monitoring the threads and overall
+            performance of a MySQL server.
+          </para>
+          <indexterm zone="mariadb mytop-mariadb">
+            <primary sortas="b-mytop-mariadb">mytop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="perror-mariadb">
+        <term><command>perror</command></term>
+        <listitem>
+          <para>
+            is a utility that displays descriptions for system or storage
+            engine error codes.
+          </para>
+          <indexterm zone="mariadb perror-mariadb">
+            <primary sortas="b-perror-mariadb">perror</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="replace-mariadb">
+        <term><command>replace</command></term>
+        <listitem>
+          <para>
+            is a MariaDB/MySQL extension to the SQL standard.
+          </para>
+          <indexterm zone="mariadb replace-mariadb">
+            <primary sortas="b-replace-mariadb">replace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="resolve_stack_dump-mariadb">
+        <term><command>resolve_stack_dump</command></term>
+        <listitem>
+          <para>
+            resolves a numeric stack dump to symbols.
+          </para>
+          <indexterm zone="mariadb resolve_stack_dump-mariadb">
+            <primary sortas="b-resolve_stack_dump-mariadb">resolve_stack_dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="resolveip-mariadb">
+        <term><command>resolveip</command></term>
+        <listitem>
+          <para>
+            is a utility for resolving IP addresses to host names and
+            vice versa.
+          </para>
+          <indexterm zone="mariadb resolveip-mariadb">
+            <primary sortas="b-resolveip-mariadb">resolveip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
   </sect2>
 
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/postgresql.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -7,8 +7,8 @@
   <!ENTITY postgresql-download-http "http://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-md5sum        "1fe952c44ed26d7e6a335cf991a9c1c6">
-  <!ENTITY postgresql-size          "17 MB">
-  <!ENTITY postgresql-buildsize     "194 MB">
-  <!ENTITY postgresql-time          "1.3 SBU">
+  <!ENTITY postgresql-md5sum        "e58fffe9359e311ead94490a06b7147c">
+  <!ENTITY postgresql-size          "18 MB">
+  <!ENTITY postgresql-buildsize     "233 MB (with tests)">
+  <!ENTITY postgresql-time          "1.6 SBU (with tests)">
 ]>
 
@@ -34,5 +34,5 @@
     from the Berkeley Postgres database management system.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -107,4 +107,14 @@
     </para>
 
+    <para>Tests must be run as unprivileged user, because they need to
+    start a temporary server, and this is prevented as root user. For
+    the same reason, you need to stop all PostgreSQL servers if any is
+    running. If a previous version of PostgreSQL is installed, it may be
+    necessary to use <emphasis>--disable-rpath</emphasis> with
+    <emphasis>configure</emphasis> to avoid failures, but <command>it is
+    not recommended</command> to install the binaries created using this
+    switch. To test the results, issue: <command>make
+    check</command>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -117,16 +127,8 @@
 <screen role="nodump/"><userinput>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable> install</userinput></screen>
 
-    <warning>
-      <para>This package contains a known security hole that allows other
-      users on the same machine to gain access to an operating system account
-      while it is doing "make check": CVE-2014-0067. Tests must be run after
-      install, with postgresql server down, as unprivileged user.</para>
-    </warning>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para><emphasis>If you only intend to use <application>PostgreSQL</application>
-    as a client to connect to a server on another machine, your installation is
-    complete and you should not run the remaining commands.</emphasis></para>
+    <para><emphasis>If you only intend to use
+    <application>PostgreSQL</application> as a client to connect to a server on
+    another machine, your installation is complete and you should not run the
+    remaining commands.</emphasis></para>
 
     <!-- 'Upgrading' seems to only ever exist in the docs for *previous* version -->
@@ -277,21 +279,21 @@
         <seg>
           clusterdb, createdb, createlang, createuser, dropdb, droplang,
-          dropuser, ecpg, initdb, pg_basebackup, pg_config, pg_controldata,
-          pg_ctl, pg_dump, pg_dumpall, pg_isready, pg_receivexlog,
-          pg_recvlogical, pg_resetxlog, pg_restore, pltcl_delmod,
-          pltcl_listmod, pltcl_loadmod, postgres, postmaster (deprecated),
-          psql, reindexdb, vacuumdb, and optionally (in contrib/) oid2name,
-          pg_archivecleanup, pgbench, pg_standby, pg_test_fsync,
-          pg_test_timing, pg_upgrade, pg_xlogdump, vacuumlo, and many others
+          dropuser, ecpg, initdb, pg_archivecleanup, pg_basebackup, pg_config,
+          pg_controldata, pg_ctl, pg_dump, pg_dumpall, pg_isready,
+          pg_receivexlog, pg_recvlogical, pg_resetxlog, pg_restore, pg_rewind,
+          pg_test_fsync, pg_test_timing, pg_upgrade, pg_xlogdump, pgbench,
+          pltcl_delmod, pltcl_listmod, pltcl_loadmod, postgres, postmaster
+          (deprecated), psql, reindexdb, vacuumdb, and optionally (in contrib/)
+          oid2name, pg_standby, vacuumlo, and many others
         </seg>
         <seg>
           libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a, libpgport.a,
-          libpgtypes.{so,a}, and libpq.{so,a}
+          libpgtypes.{so,a}, libpq.{so,a}, various charset modules, and
+          optionally programming language modules under /usr/lib/postgresql
         </seg>
         <seg>
           /usr/include/{libpq,postgresql},
           /usr/lib/postgresql,
-          /usr/share/doc/postgresql-&postgresql-version;,
-          /usr/share/postgresql, and
+          /usr/share/{doc/postgresql-&postgresql-version;,postgresql}, and
           /srv/pgsql
         </seg>
@@ -538,4 +540,15 @@
           <indexterm zone="postgresql pg_restore">
             <primary sortas="b-pg_restore">pg_restore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_rewind">
+        <term><command>pg_rewind</command></term>
+        <listitem>
+          <para>synchronizes a PostgreSQL data directory with another data
+          directory that was forked from the first one.</para>
+          <indexterm zone="postgresql pg_rewind">
+            <primary sortas="b-pg_rewind">pg_rewind</primary>
           </indexterm>
         </listitem>
Index: server/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/sqlite.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -5,17 +5,17 @@
   %general-entities;
 
-  <!ENTITY sqlite-dl-version    "3090200">
-  <!ENTITY sqlite-doc-version   "3090200">
-
-  <!ENTITY sqlite-download-http "https://www.sqlite.org/2015/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
+  <!ENTITY sqlite-dl-version    "3100200">
+  <!ENTITY sqlite-doc-version   "3100200">
+
+  <!ENTITY sqlite-download-http "http://sqlite.org/2016/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
   <!ENTITY sqlite-download-ftp  " ">
-  <!ENTITY sqlite-md5sum        "bc4eb5b3fc5efcb6e059794306cac1ca">
-  <!ENTITY sqlite-size          "2.2 MB">
-  <!ENTITY sqlite-buildsize     "73 MB (with Documentation)">
-  <!ENTITY sqlite-time          "0.5 SBU">
-
-  <!ENTITY sqlite-docs-download "https://www.sqlite.org/2015/sqlite-doc-&sqlite-doc-version;.zip">
-  <!ENTITY sqlite-docs-md5sum   "edc091d50cb97880ebebd9d961e37c17">
-  <!ENTITY sqlite-docs-size     "5.1 MB">
+  <!ENTITY sqlite-md5sum        "adaa31593bb5605ec6d6f34f81b43008">
+  <!ENTITY sqlite-size          "2.3 MB">
+  <!ENTITY sqlite-buildsize     "73 MB (with Optional Documentation)">
+  <!ENTITY sqlite-time          "0.3 SBU">
+
+  <!ENTITY sqlite-docs-download "http://sqlite.org/2016/sqlite-doc-&sqlite-doc-version;.zip">
+  <!ENTITY sqlite-docs-md5sum   "08f301085279c2e4451f7dd568342943">
+  <!ENTITY sqlite-docs-size     "5.2 MB">
 ]>
 
@@ -103,4 +103,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink> and
       <xref linkend="unzip"/> (required to unzip the documentation)
     </para>
@@ -136,6 +137,7 @@
             -DSQLITE_ENABLE_COLUMN_METADATA=1     \
             -DSQLITE_ENABLE_UNLOCK_NOTIFY=1       \
-            -DSQLITE_SECURE_DELETE=1" &amp;&amp;
-make</userinput></screen>
+            -DSQLITE_SECURE_DELETE=1              \
+            -DSQLITE_ENABLE_DBSTAT_VTAB=1" &amp;&amp;
+make -j1</userinput></screen>
 
     <para>
@@ -168,7 +170,9 @@
       <parameter>CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1
       -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE
-      -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"</parameter>: Applications such as
-      <application>Firefox</application> require secure delete and enable unlock
-      notify to be turned on. The only way to do this is to include them in the
+      -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1"</parameter>:
+      Applications such as <application>Firefox</application> require secure
+      delete and enable unlock notify to be turned on.  Since
+      <application>firefox-41</application> the dbstat virtual table is also
+      required. The only way to do this is to include them in the
       CFLAGS. By default, these are set to <literal>"-g -O2"</literal> so we
       specify that to preserve those settings. You may, of course, wish to omit
