Upgrade to Man-DB-2.5.9. Fixes #2797.

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

7 files changed, 22 insertions, 45 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bc7e23f25..1d1d52f7e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
     <listitem>
+      <para>2010-12-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Man-DB-2.5.9. Fixes
+          <ulink url="&lfs-ticket-root;2797">#2797</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2010-11-18</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 536f62b0c..8195ae49b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -130,9 +130,9 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
@@ -281,6 +281,10 @@
     </listitem>
 
     <listitem>
+      <para>man-db-2.5.7-fix_man_assertion-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>perl-5.12.1-libc-1.patch</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index cb883502d..f9306b7c5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -130,22 +130,6 @@
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Linux Memory Model Locking Patch - <token>&linux-mm_locking-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&linux-mm_locking-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-mm_locking-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-    <varlistentry>
-      <term>Man-DB Upstream Fix Assertion Patch - <token>&man-db-upstream_fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&man-db-upstream_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&man-db-upstream_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry>
       <term>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
@@ -155,14 +139,6 @@
       </listitem>
     </varlistentry>
 
-    <!-- <varlistentry>
-      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry> -->
-
     <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index e6df1aade..393e3e2d3 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
 
-    <para>First apply the following patch to fix problems when viewing
-    some man pages:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&man-db-upstream_fixes-patch;</userinput></screen>
-
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
@@ -104,7 +99,7 @@
     encoded with.  In addition to this, Man-DB correctly determines if manual
     pages installed in that directory are UTF-8 encoded.</para>
 
-    <!-- Origin: man-db-2.5.7/src/encodings.c -->
+    <!-- Origin: man-db-2.5.9/lib/encodings.c -->
     <table>
 <title>Expected character encoding of legacy 8-bit manual pages</title>
       <?dbfo table-width="6in" ?>
diff --git a/general.ent b/general.ent
index 1e072150c..908dfea22 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20101118">
-<!ENTITY releasedate "November 18, 2010">
+<!ENTITY version "SVN-20101213">
+<!ENTITY releasedate "December 13, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index aa019b88f..6385701f9 100644
--- a/packages.ent
+++ b/packages.ent
@@ -342,10 +342,10 @@
 <!ENTITY make-ch6-du "9.7 MB">
 <!ENTITY make-ch6-sbu "0.3 SBU">
 
-<!ENTITY man-db-version "2.5.7">
-<!ENTITY man-db-size "2,123 KB">
+<!ENTITY man-db-version "2.5.9">
+<!ENTITY man-db-size "2,312 KB">
 <!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "eef0d8c8e54894e4e050e2176bb1d88d">
+<!ENTITY man-db-md5 "9841394f5c5fe7e2dd2e0c5fb4766d0f">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "22 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
diff --git a/patches.ent b/patches.ent
index cf7c46326..649eadf89 100644
--- a/patches.ent
+++ b/patches.ent
@@ -70,14 +70,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!--
-<!ENTITY linux-mm_locking-patch "linux-&linux-version;-mm_locking-1.patch">
-<!ENTITY linux-mm_locking-patch-md5 "f139404228d3cc92bcf41d5f146e1a1b">
-<!ENTITY linux-mm_locking-patch-size "1.4 KB">-->
-
-<!ENTITY man-db-upstream_fixes-patch "man-db-&man-db-version;-fix_man_assertion-1.patch">
-<!ENTITY man-db-upstream_fixes-patch-md5 "a2d7e211160564c13296476cb5f05574">
-<!ENTITY man-db-upstream_fixes-patch-size "3.9 KB">
 
 <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
 <!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">