From db2d98f7a9d866f0fa4445d0b96c74ba16302d70 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Sat, 5 Feb 2022 17:15:38 +0800
Subject: [PATCH] man-db: update to man-db-2.10.0 (#5002)

---
 chapter01/changelog.xml |  4 ++++
 chapter08/man-db.xml    | 42 +++++++++++++++++++++++++----------------
 packages.ent            |  6 +++---
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ebaeacf7..155b12f50 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,10 @@
     <listitem>
       <para>2022-02-04</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to man-db-2.10.0.  Fixes
+          <ulink url="&lfs-ticket-root;5002">#5002</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Move OpenSSL before Kmod and enable OpenSSL
           for Kmod build.</para>
diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml
index b60e417e8..642a4e1df 100644
--- a/chapter08/man-db.xml
+++ b/chapter08/man-db.xml
@@ -43,24 +43,24 @@
 
     <para>Prepare Man-DB for compilation:</para>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                        \
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                         \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
-            --sysconfdir=/etc                    \
-            --disable-setuid                     \
-            --enable-cache-owner=bin             \
-            --with-browser=/usr/bin/lynx         \
-            --with-vgrind=/usr/bin/vgrind        \
+            --sysconfdir=/etc                     \
+            --disable-setuid                      \
+            --enable-cache-owner=bin              \
+            --with-browser=/usr/bin/lynx          \
+            --with-vgrind=/usr/bin/vgrind         \
             --with-grap=/usr/bin/grap</userinput></screen>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                        \
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                         \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
-            --sysconfdir=/etc                    \
-            --disable-setuid                     \
-            --enable-cache-owner=bin             \
-            --with-browser=/usr/bin/lynx         \
-            --with-vgrind=/usr/bin/vgrind        \
-            --with-grap=/usr/bin/grap            \
-            --with-systemdtmpfilesdir=           \
+            --sysconfdir=/etc                     \
+            --disable-setuid                      \
+            --enable-cache-owner=bin              \
+            --with-browser=/usr/bin/lynx          \
+            --with-vgrind=/usr/bin/vgrind         \
+            --with-grap=/usr/bin/grap             \
+            --with-systemdtmpfilesdir=            \
             --with-systemdsystemunitdir=</userinput></screen>
 
     <variablelist>
@@ -306,8 +306,8 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
-        manpath, and whatis</seg>
+        <seg>accessdb, apropos (link to whatis), catman, lexgrog, man,
+        man-recode, mandb, manpath, and whatis</seg>
         <seg>libman.so and libmandb.so (both in /usr/lib/man-db)</seg>
         <seg>/usr/lib/man-db, /usr/libexec/man-db,
         and /usr/share/doc/man-db-&man-db-version;</seg>
@@ -373,6 +373,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="man-recode">
+        <term><command>man-recode</command></term>
+        <listitem>
+          <para>Converts manual pages to another encoding</para>
+          <indexterm zone="ch-system-man-db man-recode">
+            <primary sortas="b-man-recode">man-recode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mandb">
         <term><command>mandb</command></term>
         <listitem>
diff --git a/packages.ent b/packages.ent
index 3201f4871..b3bb37721 100644
--- a/packages.ent
+++ b/packages.ent
@@ -467,10 +467,10 @@
 <!ENTITY make-fin-du "13 MB">
 <!ENTITY make-fin-sbu "0.6 SBU">
 
-<!ENTITY man-db-version "2.9.4">
-<!ENTITY man-db-size "1,865 KB">
+<!ENTITY man-db-version "2.10.0">
+<!ENTITY man-db-size "1,844 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "6e233a555f7b9ae91ce7cd0faa322bce">
+<!ENTITY man-db-md5 "96009cd422f2e62b01b8c4de0f5691f1">
 <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
 <!ENTITY man-db-fin-du "38 MB">
 <!ENTITY man-db-fin-sbu "0.4 SBU">