From f7b8c6d7db725427a24c1b8bf992c612e0f97d0f Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 14 Aug 2011 22:33:16 +0000
Subject: Upgrade to GDBM-1.9.1. Fixes #2913.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9585 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 ++++
 chapter01/whatsnew.xml  |  4 ++--
 chapter06/gdbm.xml      | 29 +++++++++++++++++------------
 packages.ent            |  6 +++---
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d0227a625..7c096e27f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-08-14</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Update to GDBM-1.9.1. Fixes
+          <ulink url="&lfs-ticket-root;2913">#2913</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Update to Diffutils-3.1. Fixes
           <ulink url="&lfs-ticket-root;2912">#2912</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5e925edac..9e84bcc05 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -82,9 +82,9 @@
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>GDBM &gdbm-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
index 612b5d53d..83b0e05df 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -45,28 +45,33 @@
 
     <para>Prepare GDBM for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-libgdbm-compat</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><envar>--enable-libgdbm-compat</envar></term>
+        <listitem>
+          <para>This switch enables the libgdbm compatibility library to be
+          built, as some packages outside of LFS may require the older DBM
+          routines it provides.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>In addition, install the DBM and NDBM compatibility headers, as some
-    packages outside of LFS may look for these older dbm routines:</para>
-
-<screen><userinput remap="install">make install-compat</userinput></screen>
-
-    <para>Fix a minor installation issue by manually adding GDBM to the
-    <command>info</command> table of contents:</para>
-
-<screen><userinput remap="install">install-info --dir-file=/usr/info/dir /usr/info/gdbm.info</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-gdbm" role="content">
diff --git a/packages.ent b/packages.ent
index 64919414e..48371249e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -173,10 +173,10 @@
 <!ENTITY gcc-ch6-du "1.7 GB">
 <!ENTITY gcc-ch6-sbu "47 SBU">
 
-<!ENTITY gdbm-version "1.8.3">
-<!ENTITY gdbm-size "223 KB">
+<!ENTITY gdbm-version "1.9.1">
+<!ENTITY gdbm-size "542 KB">
 <!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5 "1d1b1d5c0245b1c00aff92da751e9aa1">
+<!ENTITY gdbm-md5 "59f6e4c4193cb875964ffbe8aa384b58">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-ch5-du "2.7 MB">
 <!ENTITY gdbm-ch5-sbu "0.1 SBU">
-- 
cgit v1.2.3-54-g00ecf