From 18fd33b46962d5b3920363d0e6739f1f63a7f063 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 12 Oct 2011 21:34:45 +0000
Subject: Upgrade to Module-Init-Tools-3.16. Fixes #2882.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index abca98c2f..46dc49f01 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-10-12</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Module-Init-Tools-3.16. Fixes
+          <ulink url="&lfs-ticket-root;2882">#2882</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Glibc-2.14.1. Fixes
           <ulink url="&lfs-ticket-root;2940">#2940</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c61ba28b5..e22426ae2 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -148,9 +148,9 @@
     <!--<listitem>
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Module-Init-Tools &module-init-tools-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>MPC &mpc-version;</para>
     </listitem>
@@ -254,6 +254,9 @@
     <listitem>
       <para>libpipeline-&libpipeline-version;</para>
     </listitem>
+    <listitem>
+      <para>&module-init-tools-man-patch;</para>
+    </listitem>
     <listitem>
       <para>&mpfr-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index b100a5959..48bbc4034 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -131,6 +131,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Module Init Tools - <token>&module-init-tools-man-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&module-init-tools-man-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-tools-man-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>MPFR Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 54fc310e2..aff6383c0 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -41,10 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>To avoid a problem with regenerating the man pages when not needed, 
-    first rewrite a file that just points to another man page:</para>
+    <para>Apply a patch that contains the generated man pages that were missing
+    from the released source tarball:</para>
 
-<screen><userinput remap="pre">echo '.so man5/modprobe.conf.5' > modprobe.d.5</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&module-init-tools-man-patch;</userinput></screen>
 
     <para>The test suite of this package is geared towards the needs of its
     Maintainer. The command <command>make check</command> builds a specially
@@ -53,14 +53,15 @@
     <command>make clean</command> command is required to clean up the source
     tree before recompiling for normal use):</para>
 
-<screen><userinput remap="test">./configure
+<screen><userinput remap="test">DOCBOOKTOMAN=/bin/true ./configure
 make check
+sed -i -e 's@../../configure@DOCBOOKTOMAN=/bin/true &amp;@' tests/runtests
 ./tests/runtests
 make clean</userinput></screen>
 
     <para>Prepare Module-Init-Tools for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/ --enable-zlib-dynamic --mandir=/usr/share/man</userinput></screen>
+<screen><userinput remap="configure">DOCBOOKTOMAN=/bin/true ./configure --prefix=/ --enable-zlib-dynamic --mandir=/usr/share/man</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 743769493..7291f89fa 100644
--- a/packages.ent
+++ b/packages.ent
@@ -375,10 +375,10 @@
 <!ENTITY man-pages-ch6-du "21 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY module-init-tools-version "3.12">
-<!ENTITY module-init-tools-size "917 KB">
+<!ENTITY module-init-tools-version "3.16">
+<!ENTITY module-init-tools-size "224 KB">
 <!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "8b2257ce9abef74c4a44d825d23140f3">
+<!ENTITY module-init-tools-md5 "bc44832c6e41707b8447e2847d2019f5">
 <!ENTITY module-init-tools-home "https://modules.wiki.kernel.org/index.php/Module_init_tools_3_12">
 <!ENTITY module-init-tools-ch6-du "8.6 MB">
 <!ENTITY module-init-tools-ch6-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 4c602cc48..4b696c4a5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -70,6 +70,11 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
 
+<!ENTITY module-init-tools-man-patch "module-init-tools-&module-init-tools-version;-man_pages-1.patch">
+<!ENTITY module-init-tools-man-patch-md5 "e90aa105293df7b8691fd8ac697cefc9">
+<!ENTITY module-init-tools-man-patch-size "44 KB">
+
+
 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
 <!ENTITY mpfr-fixes-patch-md5 "66305450989c2633b9346900e9a5d9a3">
 <!ENTITY mpfr-fixes-patch-size "9 KB">
-- 
cgit v1.2.3-54-g00ecf