Index: chapter06/db.xml
===================================================================
--- chapter06/db.xml	(revision 0e3cef86ae6c475fbf1ab382ab142c290be6f65e)
+++ chapter06/db.xml	(revision 3271442dbf07bcad2cfffd3a9fdddd4362117bc3)
@@ -5,11 +5,11 @@
 ]>
 <sect1 id="ch-system-db" role="wrap">
-<title>DB-&db-version;</title>
+<title>Berkeley DB-&db-version;</title>
 <?dbhtml filename="db.html"?>
 
-<indexterm zone="ch-system-db"><primary sortas="a-DB">Berkeley DB</primary></indexterm>
+<indexterm zone="ch-system-db"><primary sortas="a-Berkeley-DB">Berkeley DB</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The DB package contains programs and utilities used by many other
+<para>The Berkeley DB package contains programs and utilities used by many other
 applications for database related functions.</para>
 
@@ -17,5 +17,5 @@
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>1.0 SBU</seg><seg>74 MB</seg></seglistitem>
+<seglistitem><seg>1.2 SBU</seg><seg>78 MB</seg></seglistitem>
 </segmentedlist>
 
@@ -25,10 +25,20 @@
 Diffutils, GCC, Glibc, Make and Sed.</seg></seglistitem>
 </segmentedlist>
+
+<tip>
+<title>Extra functionality for Berkeley DB in BLFS</title>
+<para>There are instructions to build this package in the BLFS book if you                          need to build the RPC server or additional language bindings. The                                   
+additional language bindings will require additional packages to be                                 
+installed. The BLFS instructions are located at 
+<ulink url="&blfs-root;view/svn/server/databases.html#db"/>
+for suggested installation instructions.</para>
+</tip>
+
 </sect2>
 
 <sect2 role="installation">
-<title>Installation of DB</title>
-
-<para>Prepare DB for compilation:</para>
+<title>Installation of Berkeley DB</title>
+
+<para>Prepare Berkeley DB for compilation:</para>
 
 <screen><userinput>cd build_unix &amp;&amp;
@@ -40,5 +50,5 @@
 <varlistentry>
 <term><parameter>--enable-compat185</parameter></term>
-<listitem><para>This option enables building DB 1.85 compatibility API.</para></listitem>
+<listitem><para>This option enables building Berkeley DB 1.85 compatibility API.</para></listitem>
 </varlistentry>
 
@@ -51,15 +61,5 @@
 <para>Compile the package:</para>
 
-<screen><userinput>make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</parameter></term>
-<listitem><para>These variables work around a bug in the <command>configure</command>
-script that causes the DB libraries not to link against NPTL libraries</para></listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>make</userinput></screen>
 
 <para>It is not possible to test the package meaningfully, because that
@@ -81,5 +81,5 @@
 </variablelist>
 
-<para>Fix the permissions on the installed documentation files:</para>
+<para>Fix the ownerships of the installed files:</para>
 
 <screen><userinput>chown root:root /usr/bin/db_* \
@@ -90,5 +90,5 @@
 
 
-<sect2 id="contents-db" role="content"><title>Contents of DB</title>
+<sect2 id="contents-db" role="content"><title>Contents of Berkeley DB</title>
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 0e3cef86ae6c475fbf1ab382ab142c290be6f65e)
+++ chapter06/gcc.xml	(revision 3271442dbf07bcad2cfffd3a9fdddd4362117bc3)
@@ -54,4 +54,12 @@
 <screen><userinput>sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
 
+<para>GCC provides a <command>gccbug</command> script which detects at
+compile time whether mktemp is present, and hardcodes the result in a test.
+This will cause the script to fall back to using less random names for
+temporary files.  We will be installing mktemp later, so the following sed
+will simulate its presence.</para>
+
+<screen>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</screen>
+
 <para>The GCC documentation recommends building GCC outside of the source
 directory in a dedicated build directory:</para>
Index: chapter06/iproute2.xml
===================================================================
--- chapter06/iproute2.xml	(revision 0e3cef86ae6c475fbf1ab382ab142c290be6f65e)
+++ chapter06/iproute2.xml	(revision 3271442dbf07bcad2cfffd3a9fdddd4362117bc3)
@@ -26,5 +26,5 @@
       <segtitle>&dependencies;</segtitle>
       <seglistitem>
-        <seg>DB, GCC, Glibc, Make, and Linux-Headers</seg>
+        <seg>Berkeley DB, GCC, Glibc, Make, and Linux-Headers</seg>
       </seglistitem>
     </segmentedlist>
@@ -60,5 +60,5 @@
     <screen><userinput>make SBINDIR=/sbin install</userinput></screen>
     
-    <para>The <command>arpd</command> binary links against the DB libraries
+    <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,
Index: chapter06/man-db.xml
===================================================================
--- chapter06/man-db.xml	(revision 0e3cef86ae6c475fbf1ab382ab142c290be6f65e)
+++ chapter06/man-db.xml	(revision 3271442dbf07bcad2cfffd3a9fdddd4362117bc3)
@@ -21,6 +21,6 @@
 <segmentedlist>
 <segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Gawk, GCC, DB,
-Glibc, Gettext, Grep, Make, and Sed</seg></seglistitem>
+<seglistitem><seg>Bash, Berkeley DB, Binutils, Coreutils, Gawk, GCC,
+Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 </segmentedlist>
 </sect2>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision 0e3cef86ae6c475fbf1ab382ab142c290be6f65e)
+++ chapter06/perl.xml	(revision 3271442dbf07bcad2cfffd3a9fdddd4362117bc3)
@@ -21,5 +21,5 @@
 <segmentedlist>
 <segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, DB, Diffutils,
+<seglistitem><seg>Bash, Berkeley DB, Binutils, Coreutils, Diffutils,
 Gawk, GCC, Glibc, Grep, Iana-Etc, Make, Patch, and Sed</seg></seglistitem>
 </segmentedlist>
@@ -28,4 +28,10 @@
 <sect2 role="installation">
 <title>Installation of Perl</title>
+
+<para>First create a basic <filename>/etc/hosts</filename> file which will be
+referenced in one of Perl's configuration files as well as being used used by
+the testsuite if you run that.</para>
+
+<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
 <para>To have full control over the way Perl is set up, run the
@@ -50,10 +56,4 @@
 
 <screen><userinput>make</userinput></screen>
-
-<para>To run the test suite, first create a basic
-<filename>/etc/hosts</filename> file which is needed by a couple of the tests to
-resolve the network name localhost:</para>
-
-<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
 <para>Now run the tests, if desired:</para>
