Remove Berkeley DB; Man-DB uses GDBM now. Fixes #2440.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8962 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

10 files changed, 32 insertions, 83 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index d4b853efd..624b35aaf 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -115,34 +115,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Berkeley DB dependency info -->
-  <bridgehead renderas="sect2" id="bdb-dep">Berkeley DB</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Not run. Requires Tcl installed on the final system</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Binutils dependency info -->
   <bridgehead renderas="sect2" id="binutils-dep">Binutils</bridgehead>
 
@@ -961,7 +933,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Berkeley DB, Binutils, Bzip2, Coreutils, Flex, GCC, Gettext,
+         <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
          Glibc, Grep, Groff, Gzip, Less, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d4ef7f405..02d1d2a35 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,18 @@
 -->
 
     <listitem>
+      <para>2009-07-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove Berkeley DB, as Man-DB prefers GDBM and the
+          only other program that requires bdb is arpd, which is specialist
+          enough to be catered for by BLFS.  Thanks to Randy McMurchy for the
+          report. Fixes <ulink url="&lfs-ticket-root;2440">#2440</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2009-07-16</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 97e919409..65c13a802 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -286,6 +286,12 @@
       <para>coreutils-6.12-uname-1.patch</para>
     </listitem>
     <listitem>
+      <para>db-4.7.25</para>
+    </listitem>
+    <listitem>
+      <para>db-4.7.25-upstream_fixes-1.patch</para>
+    </listitem>
+    <listitem>
       <para>glibc-2.8-20080929-iconv_tests-1.patch</para>
     </listitem>
     <listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 2cd622eb9..23bf32ab4 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -42,15 +42,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Berkeley DB (&db-version;) - <token>&db-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&db-home;"/></para>
-        <para>Download: <ulink url="&db-url;"/></para>
-        <para>MD5 sum: <literal>&db-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&binutils-home;"/></para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index db230fc40..508b9afc7 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,14 +19,6 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Berkeley DB Upstream Fixes Patch - <token>&db-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&db-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&db-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3b14b217c..37ef12918 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -26,7 +26,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index b1e7374b4..aabafa2e9 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -41,6 +41,16 @@
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
 
+    <para>The <command>arpd</command> binary included in this package is
+    dependent on Berkeley DB.  Because <command>arpd</command> is not a very
+    common requirement on a base Linux system, remove the dependency on Berkeley    DB by applying the <command>sed</command> command below.  If the
+    <command>arpd</command> binary is needed, instructions for compiling
+    Berkeley DB can be found in the BLFS Book at
+    <ulink url="&blfs-root;view/svn/server/databases.html#db"/>.
+    </para>
+
+<screen><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make DESTDIR=</userinput></screen>
@@ -73,14 +83,6 @@
 <screen><userinput remap="install">make DESTDIR= SBINDIR=/sbin MANDIR=/usr/share/man \
      DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
-    <para>The <command>arpd</command> binary links against the Berkeley DB
-    libraries that reside in <filename class="directory">/usr</filename> and
-    uses a database in <filename>/var/lib/arpd/arpd.db</filename>. Thus,
-    according to the FHS, it must be in <filename
-    class="directory">/usr/sbin</filename>. Move it there:</para>
-
-    <screen><userinput remap="install">mv -v /sbin/arpd /usr/sbin</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-iproute2" role="content">
@@ -90,7 +92,7 @@
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>arpd, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
+        <seg>ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc.</seg>
       </seglistitem>
@@ -101,18 +103,6 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="arpd">
-        <term><command>arpd</command></term>
-        <listitem>
-          <para>Userspace ARP daemon, useful in really large networks, where the
-          kernelspace ARP implementation is insufficient, or when setting up a
-          honeypot</para>
-          <indexterm zone="ch-system-iproute2 arpd">
-            <primary sortas="b-arpd">arpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ctstat">
         <term><command>ctstat</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index ee656d039..61550f7d7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090716">
-<!ENTITY releasedate "July  16, 2009">
+<!ENTITY version "SVN-20090718">
+<!ENTITY releasedate "July 18, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ce3986f2c..5453e6487 100644
--- a/packages.ent
+++ b/packages.ent
@@ -77,14 +77,6 @@
 <!ENTITY coreutils-ch6-du "98 MB testsuite included">
 <!ENTITY coreutils-ch6-sbu "3.2 SBU testsuite included">
 
-<!ENTITY db-version "4.7.25">
-<!ENTITY db-size "12,817 KB">
-<!ENTITY db-url "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-<!ENTITY db-md5 "ec2b87e833779681a0c3a814aa71359e">
-<!ENTITY db-home "http://www.oracle.com/technology/software/products/berkeley-db/index.html">
-<!ENTITY db-ch6-du "113 MB">
-<!ENTITY db-ch6-sbu "1.8 SBU">
-
 <!ENTITY dejagnu-version "1.4.4">
 <!ENTITY dejagnu-size "1,055 KB">
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
diff --git a/patches.ent b/patches.ent
index f44198324..8457dc80c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -21,11 +21,6 @@
 <!ENTITY coreutils-uname-patch-size "4.4 KB">
 
 
-<!ENTITY db-fixes-patch "db-&db-version;-upstream_fixes-1.patch">
-<!ENTITY db-fixes-patch-md5 "dfe0d2a27439454fbafdeeef65fefade">
-<!ENTITY db-fixes-patch-size "1.9 KB">
-
-
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
 <!ENTITY diffutils-i18n-patch-size "18 KB">