Merged r8469, r8470, r8471, r8472, r8473, r8474, r8478, r8479, r8480, r8481, r8482, r8483, r8484, r8485, r8486, r8487, r8488, r8489, r8490, r8491, r8492, r8493, r8494, r8495, r8500, r8501 from trunk to jh branch

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

chapter01/changelog.xml

@@ -36,6 +36,136 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-03-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Added <parameter>--sysconfdir</parameter>
+          parameter to Man-db's configure command so that
+          <filename>man_db.conf</filename> is installed in <filename
+          class="directory">/etc</filename>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-03-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated bzip2 to 1.0.5, fixes CVE-2008-1372.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-02-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Corrected typo in name of ru-ms keymap.</para>
+	  <para>[ken] - Updated Kbd to 1.13.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-02-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add --libexecdir parameter to Man-db's configure
+          command so that <command>globbing</command> and
+          <command>manconv</command> are installed into /usr/libexec/man-db.
+          Fixes <ulink url="&lfs-ticket-root;2153">#2153</ulink>.  Also, remove
+          the --enable-mb-groff parameter, as this is now detected
+          automatically.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated Grep to 2.5.3, thanks to Matthew for the fix
+	  for automated builds.</para>
+	  <para>[ken] - Updated Flex to 2.5.34.</para>
+	  <para>[ken] - Updated Module-Init-Tools to 3.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-02-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to latest upstream Vim patches.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Tcl-8.4.18. Fixes
+          <ulink url="&lfs-ticket-root;2146">#2146</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-pages-2.78. Fixes
+          <ulink url="&lfs-ticket-root;2152">#2152</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-DB-2.5.1. Fixes
+          <ulink url="&lfs-ticket-root;2148">#2148</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Linux-2.6.24.2. Fixes
+          <ulink url="&lfs-ticket-root;2147">#2147</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Now that <command>mktemp</command> is installed by
+          Coreutils in chapter 5, there is no need to fix up GCC's
+          <command>gccbug</command> in chapter 6.  Thanks to Greg Schafer for
+          the report.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Findutils-4.2.33. Fixes
+          <ulink url="&lfs-ticket-root;2151">#2151</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to E2fsprogs-1.40.6. Fixes
+          <ulink url="&lfs-ticket-root;2149">#2149</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-02-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Added a patch to fix a known issue in the Automake
+          test suite. Fixes
+          <ulink url="&lfs-ticket-root;2143">#2143</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-pages-2.77. Fixes
+          <ulink url="&lfs-ticket-root;2142">#2142</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Libtool-1.5.26. Fixes
+          <ulink url="&lfs-ticket-root;2141">#2141</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to GCC-4.2.3. Fixes
+          <ulink url="&lfs-ticket-root;2140">#2140</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Coreutils-6.10. Removed Mktemp-1.5 as
+          Coreutils provides its own implementation now. Removed the coreutils
+          binary suppression patch as the configure script can now be given a
+          list of programs not to install. Fixes
+          <ulink url="&lfs-ticket-root;2133">#2133</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to E2fsprogs-1.40.5. Fixes
+          <ulink url="&lfs-ticket-root;2138">#2138</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-01-29</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -71,9 +71,9 @@
     <listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Flex &flex-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>
@@ -86,9 +86,9 @@
     <listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
@@ -107,18 +107,18 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Less &less-version;</para>
     </listitem>
     <listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Libtool &libtool-version;</para>
-    </listitem> -->
+    </listitem>
     <listitem>
       <para>Linux &linux-version;</para>
     </listitem>
@@ -137,9 +137,9 @@
     <!--<listitem>
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Module-Init-Tools &module-init-tools-version;</para>
-    </listitem-->
+    </listitem>
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
@@ -212,6 +212,18 @@
       <para>&bash-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&grep-debian-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&grep-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&module-init-manpages-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
@@ -245,10 +257,22 @@
       <para>gcc-4.1.2-specs-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>grep-2.5.1-redhat_fixes-2.patch</para>
+   </listitem>
+
+   <listitem>
+     <para>kbd-1.12-gcc4_fixes-1.patch</para>
+   </listitem>
+
     <listitem>
       <para>man-db-2.4.4-fixes-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>module-init-tools-3.2.2-modprobe-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>readline-5.4-fixes-4.patch</para>
     </listitem>

chapter02/creatingfilesystem.xml

@@ -42,13 +42,13 @@
 <screen role="nodump"><userinput>debugfs -R feature /dev/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
 
     <para>If the output contains features other than
-    <option>has_journal</option>, <option>dir_index</option>,
-    <option>filetype</option>, <option>large_file</option>,
-    <option>resize_inode</option>, <option>sparse_super</option> or
-    <option>needs_recovery</option>, then your host
-    system may have custom enhancements.  In that case, to avoid later problems,
-    you should compile the stock E2fsprogs package and use the resulting binaries
-    to re-create the filesystem on your LFS partition:</para>
+    <option>has_journal</option>, <option>ext_attr</option>,
+    <option>resize_inode</option>, <option>dir_index</option>,
+    <option>filetype</option>, <option>sparse_super</option>,
+    <option>large_file</option> or <option>needs_recovery</option>, then your
+    host system may have custom enhancements.  In that case, to avoid later
+    problems, you should compile the stock E2fsprogs package and use the
+    resulting binaries to re-create the filesystem on your LFS partition:</para>
 
 <screen role="nodump"><userinput>cd /tmp
 tar -xjvf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2

chapter03/patches.xml

@@ -18,6 +18,14 @@
 
   <variablelist role="materials">
 
+    <varlistentry>
+      <term>Automake Test Suite Patch - <token>&automake-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
+        <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
@@ -50,14 +58,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Coreutils Suppress Uptime, Kill, Su Patch - <token>&coreutils-suppress-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&coreutils-suppress-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-suppress-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
       <listitem>
@@ -83,7 +83,15 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Grep RedHat Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
+      <term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>;</term>
+      <listitem>
+	<para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para>
+	<para>MD5 sum: <literal>&grep-debian-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Grep Upstream Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
         <para>MD5 sum: <literal>&grep-fixes-patch-md5;</literal></para>
@@ -123,26 +131,10 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Kbd GCC-4.x Fix Patch - <token>&kbd-gcc4_fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kbd-gcc4_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-gcc4_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&mktemp-tempfile-patch;"/></para>
-        <para>MD5 sum: <literal>&mktemp-tempfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Module-init-tools Patch - <token>&module-init-modprobe-patch-size;</token>:</term>
+      <term>Module-init-tools Man-Pages Patch - <token>&module-init-manpages-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&module-init-modprobe-patch;"/></para>
-        <para>MD5 sum: <literal>&module-init-modprobe-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&module-init-manpages-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-manpages-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

chapter05/coreutils.xml

@@ -43,18 +43,22 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>The version of the function <quote>futimens</quote> used
-    by Coreutils is incompatible with the version that current
-    Glibc provides, so we'll rename the function:</para>
+    <para>Prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="pre">for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \
-   cp -v $file{,.orig}
-   sed 's/futimens/gl_&amp;/' $file.orig &gt; $file
-done</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools --enable-install-program=hostname</userinput></screen>
 
-    <para>Prepare Coreutils for compilation:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
-<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
+      <varlistentry>
+        <term><envar>--enable-install-program=hostname</envar></term>
+        <listitem>
+          <para>This enables the <command>hostname</command> binary to be built
+          and installed &ndash; it is disabled by default but is required by the
+          Perl test suite.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 

chapter05/perl.xml

@@ -73,10 +73,10 @@ sed 's/command /command[ -]/' makedepend.SH.orig &gt; makedepend.SH</userinput><
 
     </variablelist>
 
-    <para>Only a few of the utilities contained in this package need to be
-    built:</para>
+    <para>Only a few of the utilities contained in this package, and one of its
+    libraries need to be built:</para>
 
-<screen><userinput remap="make">make perl utilities</userinput></screen>
+<screen><userinput remap="make">make perl utilities ext/Errno/pm_to_blib</userinput></screen>
 
     <para>Although Perl comes with a test suite, it is not recommended to
     run it at this point. Only part of Perl was built and running

chapter06/automake.xml

@@ -41,6 +41,12 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
+    <para>Patch a test in the Automake test suite to fix an issue that occurs
+    when running the tests as <systemitem class="username">root</systemitem>:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen>
+
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

chapter06/chapter06.xml

@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="psmisc.xml"/>

chapter06/coreutils.xml

@@ -41,12 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>The version of the function <quote>futimens</quote> used
-    by Coreutils is incompatible with the version that current
-    Glibc provides, so we'll rename the function:</para>
-
-<screen><userinput remap="pre">sed -i 's/futimens/gl_&amp;/' src/{copy,touch}.c lib/utimens.{c,h}</userinput></screen>
-
     <para>A known issue with the <command>uname</command> program from
     this package is that the <parameter>-p</parameter> switch always
     returns <computeroutput>unknown</computeroutput>. The following patch
@@ -56,11 +50,6 @@
  i?86 | x86_64) patch -Np1 -i ../&coreutils-uname-patch; ;;
 esac</userinput></screen>
 
-    <para>Prevent Coreutils from installing binaries that will be installed by
-    other packages later:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
-
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
     fixes this non-compliance and other internationalization-related bugs:</para>
@@ -80,7 +69,20 @@ esac</userinput></screen>
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-no-install-program=kill</parameter></term>
+        <listitem>
+          <para>The purpose of this switch is to prevent Coreutils from
+          installing binaries that will be installed by other packages later.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 
@@ -102,6 +104,11 @@ esac</userinput></screen>
 
 <screen><userinput remap="test">echo "dummy:x:1000:nobody" &gt;&gt; /etc/group</userinput></screen>
 
+    <para>Fix some of the permissions so that the non-root user can compile and
+    run the tests:</para>
+
+<screen><userinput remap="test">chown -v nobody gnulib-tests/.deps</userinput></screen>
+
     <para>Now run the tests:</para>
 
 <screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>

chapter06/flex.xml

@@ -49,9 +49,10 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <para>The testsuite in this version of Flex does nothing useful before it
+    ends with an error.</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<!--<screen><userinput remap="test">make check</userinput></screen>-->
 
     <para>Install the package:</para>
 

chapter06/gcc.xml

@@ -68,14 +68,6 @@ esac</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
 
-    <para>GCC provides a <command>gccbug</command> script which detects at
-    compile time whether mktemp is present, and hardcodes the result in a test.
-    This will cause the script to fall back to using less random names for
-    temporary files.  We will be installing mktemp later, so the following sed
-    will simulate its presence:</para>
-
-<screen><userinput remap="pre">sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 

chapter06/grep.xml

@@ -41,14 +41,17 @@
     <title>Installation of Grep</title>
 
     <para>The current Grep package has many bugs, especially in the support of
-    multibyte locales. RedHat fixed some of them with the following patch:</para>
+    multibyte locales. The following consolidated patch from Debian fixes some of them,
+    improves the number of individual tests which are passed, and much improves the
+    speed in UTF-8 locales:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&grep-debian-patch;</userinput></screen>
 
-    <para>In order for the tests added by this patch to pass, the permissions for
-    the test file have to be changed:</para>
+    <para>Upstream have fixed some of the documentation, and changed some of the
+    tests and the expected results in the newest test scripts.  This means that
+    not so many of the individual tests fail:</para>
 
-<screen><userinput remap="pre">chmod +x tests/fmbtest.sh</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
 
     <para>Prepare Grep for compilation:</para>
 
@@ -60,7 +63,14 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make check || true</userinput></screen>
+
+    <para>There are known test failures in the <command>foad1.sh</command> and
+    <command>fmbtest.sh</command> tests.  The &quot;|| true&quot; construct is
+    used to avoid build automated build scripts failing due to the test failures.
+    A good run will show 2 failures from 14 tests, but if you look at the
+    output you will see in excess of forty individual tests which failed - these
+    are all in the new tests added since the previous version.</para>
 
     <para>Install the package:</para>
 

chapter06/kbd.xml

@@ -49,11 +49,6 @@
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
-    <para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered
-    when compiling with GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
-
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --datadir=/lib/kbd</userinput></screen>

chapter06/man-db.xml

@@ -71,20 +71,12 @@ EOF</userinput></screen>
 
     <para>Prepare Man-DB for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+    --disable-setuid</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
-        <term><parameter>--enable-mb-groff</parameter></term>
-        <listitem>
-          <para>This tells the <command>man</command> program to use the
-          <quote>ascii8</quote> and <quote>nippon</quote> Groff devices for
-          formatting non-ISO-8859-1 manual pages.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--disable-setuid</parameter></term>
         <listitem>

chapter06/mktemp.xml

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <sect1info condition="script">
-    <productname>mktemp</productname>
-    <productnumber>&mktemp-version;</productnumber>
-    <address>&mktemp-url;</address>
-  </sect1info>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Mktemp package contains programs used to create secure temporary
-    files in shell scripts.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&mktemp-ch6-sbu;</seg>
-        <seg>&mktemp-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <para>Many scripts still use the deprecated
-    <command>tempfile</command> program, which has functionality similar
-    to <command>mktemp</command>. Patch Mktemp to include a
-    <command>tempfile</command> wrapper:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
-
-    <para>Prepare Mktemp for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr --with-libc</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-libc</parameter></term>
-        <listitem>
-          <para>This causes the <command>mktemp</command> program to use the
-          <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
-          functions from the system C library instead of its own implementation
-          of them. </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install
-make install-tempfile</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-mktemp" role="content">
-    <title>Contents of Mktemp</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>mktemp and tempfile</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mktemp">
-        <term><command>mktemp</command></term>
-        <listitem>
-          <para>Creates temporary files in a secure manner; it is used in
-          scripts</para>
-          <indexterm zone="ch-system-mktemp mktemp">
-            <primary sortas="b-mktemp">mktemp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tempfile">
-        <term><command>tempfile</command></term>
-        <listitem>
-          <para>Creates temporary files in a less secure manner than
-          <command>mktemp</command>; it is installed for
-          backwards-compatibility</para>
-          <indexterm zone="ch-system-mktemp tempfile">
-            <primary sortas="b-tempfile">tempfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

chapter06/module-init-tools.xml

@@ -41,18 +41,23 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>First correct a potential problem when modules are specified
-    using regular expressions:</para>
+    <para>The tarball only contains sgml source for the manpages. The following
+    patch contains the result of processing this through <command>docbook2man</command>
+    (see <ulink url="&blfs-root;view/svn/pst/docbook-utils.html"/>)
+    which we do not build as part of a basic LFS installation:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&module-init-modprobe-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&module-init-manpages-patch;</userinput></screen>
 
-    <para>Issue the following commands to perform the tests (note that the
-    <command>make distclean</command> command is required to clean up the source
-    tree, as the source gets recompiled as part of the testing process):</para>
+    <para>The testsuite of this package is geared towards the needs of its
+    Maintainer. The command <command>make check</command> builds a specially
+    wrapped version of modprobe which is useless for normal operation. To run
+    this, issue the following commands (note that the <command>make clean</command>
+    command is required to clean up the source tree before recompiling for
+    normal use):</para>
 
 <screen><userinput remap="test">./configure
 make check
-make distclean</userinput></screen>
+make clean</userinput></screen>
 
     <para>Prepare Module-Init-Tools for compilation:</para>
 

chapter07/console.xml

@@ -191,7 +191,7 @@ EOF</userinput></screen>
 <literal># Begin /etc/sysconfig/console
 
 UNICODE="1"
-KEYMAP="ru_ms"
+KEYMAP="ru-ms"
 LEGACY_CHARSET="koi8-r"
 FONT="LatArCyrHeb-16"
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20080129">
-<!ENTITY releasedate "January 29, 2007">
+<!ENTITY version "SVN-JH-20080402">
+<!ENTITY releasedate "April 2, 2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 

packages.ent

@@ -60,20 +60,20 @@
 <!ENTITY bison-ch6-du "12.3 MB">
 <!ENTITY bison-ch6-sbu "0.2 SBU">
 
-<!ENTITY bzip2-version "1.0.4">
-<!ENTITY bzip2-size "822 KB">
+<!ENTITY bzip2-version "1.0.5">
+<!ENTITY bzip2-size "8,228 KB">
 <!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "fc310b254f6ba5fbb5da018f04533688">
+<!ENTITY bzip2-md5 "3c15a0c8d1d3ee1c46a1634d00617b1a">
 <!ENTITY bzip2-home "http://www.bzip.org/">
-<!ENTITY bzip2-ch5-du "4.2 MB">
+<!ENTITY bzip2-ch5-du "4.8 MB">
 <!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
-<!ENTITY bzip2-ch6-du "5.3 MB">
+<!ENTITY bzip2-ch6-du "6.5 MB">
 <!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY coreutils-version "6.9">
-<!ENTITY coreutils-size "5,258 KB">
-<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2">
-<!ENTITY coreutils-md5 "c9607d8495f16e98906e7ed2d9751a06">
+<!ENTITY coreutils-version "6.10">
+<!ENTITY coreutils-size "8,978 KB">
+<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
+<!ENTITY coreutils-md5 "eca0de1bf7389694305d7e52cd76a472">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "67.6 MB">
 <!ENTITY coreutils-ch5-sbu "0.5 SBU">
@@ -109,10 +109,10 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.40.4">
-<!ENTITY e2fsprogs-size "3,954 KB">
+<!ENTITY e2fsprogs-version "1.40.6">
+<!ENTITY e2fsprogs-size "3,977 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "124d744bdf9d443591eb8193c085944b">
+<!ENTITY e2fsprogs-md5 "d219b7be4f7170400c646f5611c0b702">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch5-du "31.2 MB">
 <!ENTITY e2fsprogs-ch5-sbu "0.4 SBU">
@@ -130,31 +130,31 @@
 
 <!ENTITY file-version "4.23">
 <!ENTITY file-size "551 KB">
-<!ENTITY file-url "ftp://ftp.gw.com/mirrors/pub/unix/file/file-&file-version;.tar.gz">
+<!ENTITY file-url "ftp://ftp.gw.com/mirrors/unix/file/file-&file-version;.tar.gz">
 <!ENTITY file-md5 "014a69979a8d5225a6ca2bcc4d7e967e">
 <!ENTITY file-home " ">
 <!ENTITY file-ch6-du "7.9 MB">
 <!ENTITY file-ch6-sbu "0.1 SBU">
 
-<!ENTITY findutils-version "4.2.32">
-<!ENTITY findutils-size "1,398 KB">
+<!ENTITY findutils-version "4.2.33">
+<!ENTITY findutils-size "1,421 KB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "aaa6beeb41a6f04963dff58f24a55b96">
+<!ENTITY findutils-md5 "b7e35aa175778c84942b1fee4144988b">
 <!ENTITY findutils-home "&gnu-software;findutils/">
 <!ENTITY findutils-ch5-du "13.6 MB">
 <!ENTITY findutils-ch5-sbu "0.2 SBU">
 <!ENTITY findutils-ch6-du "13.6 MB">
 <!ENTITY findutils-ch6-sbu "0.2 SBU">
 
-<!ENTITY flex-version "2.5.33">
-<!ENTITY flex-size "680 KB">
+<!ENTITY flex-version "2.5.34">
+<!ENTITY flex-size "1,225 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "343374a00b38d9e39d1158b71af37150">
+<!ENTITY flex-md5 "fbdabda79de417b863970eb03c0f53a3">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!ENTITY flex-ch5-du "8.4 MB">
 <!ENTITY flex-ch5-sbu "0.1 SBU">
-<!ENTITY flex-ch6-du "8.4 MB">
-<!ENTITY flex-ch6-sbu "0.1 SBU">
+<!ENTITY flex-ch6-du "10.1 MB">
+<!ENTITY flex-ch6-sbu "0.2 SBU">
 
 <!ENTITY gawk-version "3.1.6">
 <!ENTITY gawk-size "1,818 KB">
@@ -166,10 +166,10 @@
 <!ENTITY gawk-ch6-du "18.2 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.2.2">
-<!ENTITY gcc-size "43,110 KB">
+<!ENTITY gcc-version "4.2.3">
+<!ENTITY gcc-size "43,413 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "7ae33781417a35a2eb03ee098a9f4490">
+<!ENTITY gcc-md5 "ef2a4d9991b3644115456ea05b2b8163">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "655 MB">
 <!ENTITY gcc-ch5p1-sbu "9.2 SBU">
@@ -203,14 +203,14 @@
 <!ENTITY glibc-libidn-md5 "226809992fb1f3dc6ea23e0f26952ea4">
 <!ENTITY glibc-libidn-home " ">
 
-<!ENTITY grep-version "2.5.1a">
-<!ENTITY grep-size "516 KB">
+<!ENTITY grep-version "2.5.3">
+<!ENTITY grep-size "604 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
+<!ENTITY grep-md5 "27061ce1fde82876970b6549a156da8b">
 <!ENTITY grep-home "&gnu-software;grep/">
-<!ENTITY grep-ch5-du "4.8 MB">
+<!ENTITY grep-ch5-du "6.9 MB">
 <!ENTITY grep-ch5-sbu "0.1 SBU">
-<!ENTITY grep-ch6-du "4.8 MB">
+<!ENTITY grep-ch6-du "7.2 MB">
 <!ENTITY grep-ch6-sbu "0.1 SBU">
 
 <!ENTITY groff-version "1.18.1.4">
@@ -263,12 +263,12 @@
 <!ENTITY iproute2-ch6-du "4.8 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
 
-<!ENTITY kbd-version "1.12">
-<!ENTITY kbd-size "618 KB">
-<!ENTITY kbd-url "&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2">
-<!ENTITY kbd-md5 "069d1175b4891343b107a8ac2b4a39f6">
+<!ENTITY kbd-version "1.13">
+<!ENTITY kbd-size "652 KB">
+<!ENTITY kbd-url "http://ftp.altlinux.com/pub/people/legion/kbd/kbd-&kbd-version;.tar.bz2">
+<!ENTITY kbd-md5 "2639fdfe2412b29cbf6936d7db91cee3">
 <!ENTITY kbd-home " ">
-<!ENTITY kbd-ch6-du "12.3 MB">
+<!ENTITY kbd-ch6-du "12.5 MB">
 <!ENTITY kbd-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY less-version "418">
@@ -287,22 +287,22 @@
 <!ENTITY lfs-bootscripts-ch7-du "0.4 MB">
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libtool-version "1.5.24">
-<!ENTITY libtool-size "2,851 KB">
+<!ENTITY libtool-version "1.5.26">
+<!ENTITY libtool-size "2,893 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
-<!ENTITY libtool-md5 "d0071c890101fcf4f2be8934a37841b0">
+<!ENTITY libtool-md5 "aa9c5107f3ec9ef4200eb6556f3b3c29">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-ch6-du "16.6 MB">
 <!ENTITY libtool-ch6-sbu "0.1 SBU">
 
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-minor-version "24">
-<!ENTITY linux-patch-version "">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "45,642 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-size "45,640 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "3f23ad4b69d0a552042d1ed0f4399857">
+<!ENTITY linux-md5 "dd573a2fae55624ed92fa49c17583964">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
@@ -332,18 +332,18 @@
 <!ENTITY make-ch6-du "9.6 MB">
 <!ENTITY make-ch6-sbu "0.1 SBU">
 
-<!ENTITY man-db-version "2.5.0">
-<!ENTITY man-db-size "955 KB">
+<!ENTITY man-db-version "2.5.1">
+<!ENTITY man-db-size "1,624 KB">
 <!ENTITY man-db-url "http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "c23b59726cebe0e0820ced2becf5f52d">
+<!ENTITY man-db-md5 "e592eefd14679575b776f60c6a48e781">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "9 MB">
 <!ENTITY man-db-ch6-sbu "0.2 SBU">
 
-<!ENTITY man-pages-version "2.76">
-<!ENTITY man-pages-size "1,816 KB">
+<!ENTITY man-pages-version "2.78">
+<!ENTITY man-pages-size "1,823 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "788354eb0ab1fad2eab69ae671c5e68d">
+<!ENTITY man-pages-md5 "0b58773dbdc6eaeecadfad65b66bfb9a">
 <!ENTITY man-pages-home " ">
 <!ENTITY man-pages-ch6-du "37.4 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -356,12 +356,12 @@
 <!ENTITY mktemp-ch6-du "0.4 MB">
 <!ENTITY mktemp-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY module-init-tools-version "3.2.2">
-<!ENTITY module-init-tools-size "166 KB">
-<!ENTITY module-init-tools-url "http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "a1ad0a09d3231673f70d631f3f5040e9">
-<!ENTITY module-init-tools-home "http://www.kerneltools.org/">
-<!ENTITY module-init-tools-ch6-du "7 MB">
+<!ENTITY module-init-tools-version "3.4">
+<!ENTITY module-init-tools-size "186 KB">
+<!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
+<!ENTITY module-init-tools-md5 "db6ac059e80e8dd4389dbe81ee61f3c6">
+<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
+<!ENTITY module-init-tools-ch6-du "8 MB">
 <!ENTITY module-init-tools-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY ncurses-version "5.6">
@@ -466,10 +466,10 @@
 <!ENTITY tar-ch6-du "19.9 MB">
 <!ENTITY tar-ch6-sbu "0.3 SBU">
 
-<!ENTITY tcl-version "8.4.17">
-<!ENTITY tcl-size "3,567 KB">
+<!ENTITY tcl-version "8.4.18">
+<!ENTITY tcl-size "3,568 KB">
 <!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "d2af2c45189c8c7fd1bfdd2a19b0fa30">
+<!ENTITY tcl-md5 "7d8bc95036f797b1a2b62a5a382d2cc1">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
 <!ENTITY tcl-ch5-du "24 MB">
 <!ENTITY tcl-ch5-sbu "0.3 SBU">

patches.ent

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
+<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
+<!ENTITY automake-test-patch-md5 "4d8aa269951bb3cd876d2bb663cb04cc">
+<!ENTITY automake-test-patch-size "3 KB">
+
+
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-7.patch">
 <!ENTITY bash-fixes-patch-md5 "63ca4c26a1ae0c4a5b7da910d611d534">
 <!ENTITY bash-fixes-patch-size "55 KB">
@@ -17,12 +22,8 @@
 
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "806ce5bcb16a763a77bea411ec5ff637">
-<!ENTITY coreutils-i18n-patch-size "101 KB">
-
-<!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
-<!ENTITY coreutils-suppress-patch-md5 "e8ae92cdec364ca2a318f5c4c77bf032">
-<!ENTITY coreutils-suppress-patch-size "13 KB">
+<!ENTITY coreutils-i18n-patch-md5 "791df67d25a45d846c1af4dadf2612c8">
+<!ENTITY coreutils-i18n-patch-size "102 KB">
 
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 <!ENTITY coreutils-uname-patch-md5 "c05b735710fbd62239588c07084852a0">
@@ -39,9 +40,13 @@
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
 
-<!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">
-<!ENTITY grep-fixes-patch-md5 "2c67910be2d0a54714f63ce350e6d8a6">
-<!ENTITY grep-fixes-patch-size "55 KB">
+<!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
+<!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
+<!ENTITY grep-debian-patch-size "27 KB">
+
+<!ENTITY grep-fixes-patch "grep-&grep-version;-upstream_fixes-1.patch">
+<!ENTITY grep-fixes-patch-md5 "44f9c5e7df7746e6115be47e5a068ab8">
+<!ENTITY grep-fixes-patch-size "5.8 KB">
 
 
 <!ENTITY groff-debian-patch "groff-&groff-version;-debian_fixes-1.patch">
@@ -59,21 +64,17 @@
 
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
-<!ENTITY kbd-backspace-patch-md5 "692c88bb76906d99cc20446fadfb6499">
-<!ENTITY kbd-backspace-patch-size "11 KB">
-
-<!ENTITY kbd-gcc4_fixes-patch "kbd-&kbd-version;-gcc4_fixes-1.patch">
-<!ENTITY kbd-gcc4_fixes-patch-md5 "615bc1e381ab646f04d8045751ed1f69">
-<!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
+<!ENTITY kbd-backspace-patch-md5 "fe51ec685687ce9d29463d786ba0c2d4">
+<!ENTITY kbd-backspace-patch-size "13 KB">
 
 
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB">
 
-<!ENTITY module-init-modprobe-patch "module-init-tools-&module-init-tools-version;-modprobe-1.patch">
-<!ENTITY module-init-modprobe-patch-md5 "f1e452fdf3b8d7ef60148125e390c3e8">
-<!ENTITY module-init-modprobe-patch-size "1.2 KB">
+<!ENTITY module-init-manpages-patch "module-init-tools-&module-init-tools-version;-manpages-1.patch">
+<!ENTITY module-init-manpages-patch-md5 "2271047586981ae23adf01cc13d97791">
+<!ENTITY module-init-manpages-patch-size "35 KB">
 
 
 <!ENTITY ncurses-coverity-patch "ncurses-&ncurses-version;-coverity_fixes-1.patch">
@@ -101,9 +102,9 @@
 <!ENTITY udev-usbid-patch-size "3.2 KB">
 
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-5.patch">
-<!ENTITY vim-fixes-patch-md5 "61c8c6d7f6b56aa6fd0eb30081b36998">
-<!ENTITY vim-fixes-patch-size "308 KB">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-6.patch">
+<!ENTITY vim-fixes-patch-md5 "a1e9ed80bac0ac8175bc3ed89867ca2e">
+<!ENTITY vim-fixes-patch-size "422 KB">
 
 <!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
 <!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">