From 487d7c1794f0d1b7ac82d6776d243e5bbff03697 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 28 Oct 2006 22:08:11 +0000
Subject: [PATCH] Upgrade to Berkeley-DB-4.5.20

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7839 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 ++++
 chapter01/whatsnew.xml  |  7 +++++--
 chapter03/patches.xml   |  8 --------
 chapter06/db.xml        |  4 ----
 packages.ent            | 10 +++++-----
 patches.ent             |  5 -----
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index edc0d07d7..4fdae4f55 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2006-10-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Berkeley DB-4.5.20, including dropping
+          the now unnecessary &quot;fixes&quot; patch.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Coreutils-6.4.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ed343842a..697714916 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -31,9 +31,9 @@
     <listitem>
       <para>Bash &bash-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Berkeley DB &db-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Binutils &binutils-version;</para>
     </listitem>
@@ -218,6 +218,9 @@
     <listitem>
       <para>bash-3.1-fixes-8.patch </para>
     </listitem>
+    <listitem>
+      <para>db-4.4.20-fixes-1.patch </para>
+    </listitem>
     <listitem>
       <para>glibc-2.3.6-inotify-1.patch </para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 9d6b4cc1f..f48c1074e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -66,14 +66,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Database (Berkeley) 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>Diffutils Internationalization Fixes Patch - <token>&diffutils-i18n-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/db.xml b/chapter06/db.xml
index e0a0cbfc1..367f85e65 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -55,10 +55,6 @@
   <sect2 role="installation">
     <title>Installation of Berkeley DB</title>
 
-    <para>Patch the package to eliminate potential trap events:</para>
-
-<screen><userinput>patch -Np1 -i ../&db-fixes-patch;</userinput></screen>
-
     <para>Prepare Berkeley DB for compilation:</para>
 
 <screen><userinput>cd build_unix &amp;&amp;
diff --git a/packages.ent b/packages.ent
index ee3ba8c41..ef216ab79 100644
--- a/packages.ent
+++ b/packages.ent
@@ -82,11 +82,11 @@
 <!ENTITY coreutils-ch6-du "72.4 MB">
 <!ENTITY coreutils-ch6-sbu "1.0 SBU">
 
-<!ENTITY db-version "4.4.20">
-<!ENTITY db-size "7,767 KB">
-<!ENTITY db-url "http://downloads.sleepycat.com/db-&db-version;.tar.gz">
-<!ENTITY db-md5 "d84dff288a19186b136b0daf7067ade3">
-<!ENTITY db-home "http://dev.sleepycat.com/">
+<!ENTITY db-version "4.5.20">
+<!ENTITY db-size "9,064 KB">
+<!ENTITY db-url "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
+<!ENTITY db-md5 "b0f1c777708cb8e9d37fb47e7ed3312d">
+<!ENTITY db-home "http://www.oracle.com/technology/software/products/berkeley-db/index.html">
 <!ENTITY db-ch6-du "77 MB">
 <!ENTITY db-ch6-sbu "1.2 SBU">
 
diff --git a/patches.ent b/patches.ent
index 34b9cfcf6..8862804c3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -28,11 +28,6 @@
 <!ENTITY coreutils-uname-patch-size "4.6 KB">
 
 
-<!ENTITY db-fixes-patch "db-&db-version;-fixes-1.patch">
-<!ENTITY db-fixes-patch-md5 "32b28d1d1108dfcd837fe10c4eb0fbad">
-<!ENTITY db-fixes-patch-size "3.8 KB">
-
-
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
 <!ENTITY diffutils-i18n-patch-size "18 KB">