Merge r8505 and r8506 from trunk to jh branch

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

chapter01/changelog.xml

@@ -42,6 +42,10 @@
         <listitem>
           <para>[jhuntwork] - Updated to linux-2.6.24.4, fixes #2157.</para>
         </listitem>
+        <listitem>
+          <para>[jhuntwork] - Added an upstream patch for db-4.6.21, thanks
+          Randy McMurchy for the report. Fixes #2164.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
@@ -71,6 +75,8 @@
       <itemizedlist>
         <listitem>
           <para>[ken] - Corrected typo in name of ru-ms keymap.</para>
+        </listitem>
+        <listitem>
 	  <para>[ken] - Updated Kbd to 1.13.</para>
         </listitem>
       </itemizedlist>
@@ -96,7 +102,11 @@
         <listitem>
           <para>[ken] - Updated Grep to 2.5.3, thanks to Matthew for the fix
 	  for automated builds.</para>
+        </listitem>
+        <listitem>
 	  <para>[ken] - Updated Flex to 2.5.34.</para>
+        </listitem>
+        <listitem>
 	  <para>[ken] - Updated Module-Init-Tools to 3.4.</para>
         </listitem>
       </itemizedlist>

chapter01/whatsnew.xml

@@ -212,6 +212,10 @@
       <para>&bash-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&db-fixes-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&grep-debian-patch;</para>
     </listitem>

chapter03/patches.xml

@@ -34,6 +34,14 @@
       </listitem>
     </varlistentry>
 
+    <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>Binutils Texinfo Version Patch - <token>&binutils-configure-patch-size;</token>:</term>
       <listitem>

chapter06/db.xml

@@ -61,6 +61,10 @@
   <sect2 role="installation">
     <title>Installation of Berkeley DB</title>
 
+    <para>There is an upstream patch for Berkeley DB that fixes a race condition. Apply it:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&db-fixes-patch;</userinput></screen>
+
     <para>Prepare Berkeley DB for compilation:</para>
 
 <screen><userinput remap="configure">cd build_unix

patches.ent

@@ -29,6 +29,9 @@
 <!ENTITY coreutils-uname-patch-md5 "c05b735710fbd62239588c07084852a0">
 <!ENTITY coreutils-uname-patch-size "4.6 KB">
 
+<!ENTITY db-fixes-patch "db-&diffutils-version;-fixes-1.patch">
+<!ENTITY db-fixes-patch-md5 "0e1f3a1db6c3ab10f79c4d6dff0c8f31">
+<!ENTITY db-fixes-patch-size "2.3 KB">
 
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">