From 2767b171c9cf8381858fbfa28300620685fe8c9a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 17 Sep 2009 20:39:34 +0000
Subject: [PATCH] Upgrade to Man-DB-2.5.6. Fixes #2481.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 43f5906a0..efea2d293 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
    
+    <listitem>
+      <para>2009-09-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgraded to Man-DB-2.5.6. Fixes
+          <ulink url="&lfs-ticket-root;2481">#2481</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-09-11</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 682dc513f..828a40f22 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -127,9 +127,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>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d9a9a83ee..feef01888 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -138,14 +138,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Man-DB Testsuite Patch - <token>&man-db-testsuite-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&man-db-testsuite-patch;"/></para>
-        <para>MD5 sum: <literal>&man-db-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Patch Carriage Return Fix Patch - <token>&patch-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index a032c0424..4aea8c5e4 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -41,12 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
 
-    <para>Apply a patch to fix a problem with the testsuite, which doesn't
-    expect <command>col</command> to be UTF-8 aware, which Util-Linux-NG's
-    version is:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&man-db-testsuite-patch;</userinput></screen>
-
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
diff --git a/general.ent b/general.ent
index e7532d9b4..31e6355a7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090911">
-<!ENTITY releasedate "September 11, 2009">
+<!ENTITY version "SVN-20090917">
+<!ENTITY releasedate "September 17, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 7c21dd87a..39a5cfd62 100644
--- a/packages.ent
+++ b/packages.ent
@@ -343,10 +343,10 @@
 <!ENTITY make-ch6-du "9.7 MB">
 <!ENTITY make-ch6-sbu "0.3 SBU">
 
-<!ENTITY man-db-version "2.5.5">
-<!ENTITY man-db-size "1,903 KB">
+<!ENTITY man-db-version "2.5.6">
+<!ENTITY man-db-size "2,045 KB">
 <!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "ca382dd934fc8b9e9a64d13354be48cf">
+<!ENTITY man-db-md5 "69585b19c5600a863f1a0d7b7f283975">
 <!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 d0aba391b..17f16ebfa 100644
--- a/patches.ent
+++ b/patches.ent
@@ -74,11 +74,6 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
 
-<!ENTITY man-db-testsuite-patch "man-db-&man-db-version;-fix_testsuite-1.patch">
-<!ENTITY man-db-testsuite-patch-md5 "0b23eeba6d8b130078cbee38ff22c621">
-<!ENTITY man-db-testsuite-patch-size "1 KB">
-
-
 <!ENTITY patch-fixes-patch "patch-&patch-version;-fixes-1.patch">
 <!ENTITY patch-fixes-patch-md5 "a2f0901f42e87ad3d5fefbccee6a09f4">
 <!ENTITY patch-fixes-patch-size "1.7 KB">