Merged revisions from trunk to jh branch:

r8410, r8411, r8412, r8413, r8414, r8415, r8416, r8417, r8418, r8419, r8420, r8421, r8422, r8423, r8424, r8426, r8427, r8429, r8430, r8431, r8432, r8433, r8434, r8435, r8436, r8437, r8438, r8439, r8440, r8441, r8442, r8443, r8444, r8445, r8446, r8447, r8448, r8449, r8450, r8451, r8452, r8453, r8454, r8455, r8456, r8457, r8458, r8459, r8460 git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8461 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
author: Jeremy Huntwork <jhuntwork@linuxfromscratch.org> 2008-01-26 23:35:18 +0000
committer: Jeremy Huntwork <jhuntwork@linuxfromscratch.org> 2008-01-26 23:35:18 +0000
commit: 9ed7b54facb06a3d949ed3ec37bb7bdc94ed8488 (patch)
tree: 4af40a307b9cd8506a2b5b71629f65e40230220e
parent: 7336a40779c2ab4b78faf1ead6f7bf5efa808330 (diff)
31 files changed, 1404 insertions, 395 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 58b5e3601..d391e1cc4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,211 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-01-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Replaced Util-Linux-2.12r, with
+          Util-Linux-NG-2.13.1. Fixes
+          <ulink url="&lfs-ticket-root;2077">#2077</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Tcl-8.4.17. Fixes
+          <ulink url="&lfs-ticket-root;2131">#2131</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-Pages-2.76. Fixes
+          <ulink url="&lfs-ticket-root;2129">#2129</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Linux-2.6.23.14. Fixes
+          <ulink url="&lfs-ticket-root;2128">#2128</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-01-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add Perl to the list of host requirements, as it is
+          required by Glibc.  Thanks to Ben Collver for the report.  Fixes
+          <ulink url="&lfs-ticket-root;2112">#2112</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Mention <command>strace</command> as another means
+          of logging installed files, and correct the URL of the Linux Standard
+          Base specifications. Fixes
+          <ulink url="&lfs-ticket-root;2073">#2073</ulink> and
+          <ulink url="&lfs-ticket-root;2130">#2130</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2008-01-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to latest upstream fixes for Vim.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Less-418.  Fixes
+          <ulink url="&lfs-ticket-root;2124">#2124</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to File-4.23.  Fixes
+          <ulink url="&lfs-ticket-root;2125">#2125</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to E2fsprogs-1.40.4.  Fixes
+          <ulink url="&lfs-ticket-root;2123">#2123</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-12-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to latest upstream fixes for Readline.
+          Fixes <ulink url="&lfs-ticket-root;2122">#2122</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-Pages-2.74. Fixes
+          <ulink url="&lfs-ticket-root;2119">#2119</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Linux-2.6.23.12. Fixes
+          <ulink url="&lfs-ticket-root;2118">#2118</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to latest upstream fixes for Bash. Fixes
+          <ulink url="&lfs-ticket-root;2121">#2121</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-12-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to latest upstream fixes for Vim. Fixes
+          <ulink url="&lfs-ticket-root;2108">#2108</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Texinfo-4.11. Fixes
+          <ulink url="&lfs-ticket-root;2074">#2074</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Psmisc-22.6. Fixes
+          <ulink url="&lfs-ticket-root;2104">#2104</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-Pages-2.70. Fixes
+          <ulink url="&lfs-ticket-root;2110">#2110</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Man-DB-2.5.0. Fixes
+          <ulink url="&lfs-ticket-root;2109">#2109</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Linux-2.6.23.9. Fixes
+          <ulink url="&lfs-ticket-root;2106">#2106</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Less-416. Fixes
+          <ulink url="&lfs-ticket-root;2105">#2105</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to Gettext-0.17. Fixes
+          <ulink url="&lfs-ticket-root;2103">#2103</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Removed the modifications to Gawk's config.h as
+          Gawk-3.1.6 fixes the bug that they were working around.  Fixes
+          <ulink url="&lfs-ticket-root;2107">#2107</ulink>. Thanks to Erik-Jan
+          for the report.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Removed the modifications to Gawk's config.h as
+          Gawk-3.1.6 fixes the bug that they were working around.  Fixes
+          <ulink url="&lfs-ticket-root;2107">#2107</ulink>. Thanks to Erik-Jan
+          for the report.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgraded to E2fsprogs-1.40.3.  Fixes
+          <ulink url="&lfs-ticket-root;2116">#2116</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+     <listitem>
+      <para>2007-11-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fixed test for Debian binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-10-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Removed obsolete note from Creating Symlinks section
+          about continuation lines in udev rules.  Changed dailout group
+          to uucp for udev rule compatability.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to the latest upstream patches for
+          Vim.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Add a patch to fix a segfault in usb_id.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Tcl-8.4.16. Fixes
+          <ulink url="&lfs-ticket-root;2084">#2084</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Tar-1.19. Fixes
+          <ulink url="&lfs-ticket-root;2090">#2090</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Man-Pages-2.67. Fixes
+          <ulink url="&lfs-ticket-root;2078">#2078</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-2.6.23.1. Fixes
+          <ulink url="&lfs-ticket-root;2088">#2088</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Less-409. Fixes
+          <ulink url="&lfs-ticket-root;2087">#2087</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to IPRoute2-2.6.23. Fixes
+          <ulink url="&lfs-ticket-root;2091">#2091</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Glibc-2.7. Fixes
+          <ulink url="&lfs-ticket-root;2095">#2095</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to GCC-4.2.2. Fixes
+          <ulink url="&lfs-ticket-root;2089">#2089</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Gawk-3.1.6. Fixes
+          <ulink url="&lfs-ticket-root;2098">#2098</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to DB-4.6.21. Fixes
+          <ulink url="&lfs-ticket-root;2086">#2086</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
      <listitem>
       <para>2007-10-06</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 46c44940f..c0c19f993 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -59,30 +59,30 @@
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>File &file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Flex &flex-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gawk &gawk-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>
@@ -104,15 +104,15 @@
     <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Less &less-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
     </listitem>
@@ -128,9 +128,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>
@@ -152,9 +152,9 @@
     <!--<listitem>
       <para>Procps &procps-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Psmisc &psmisc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Readline &readline-version;</para>
     </listitem>-->
@@ -170,24 +170,24 @@
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tar &tar-version;</para>
     </listitem>
     <listitem>
       <para>TCL &tcl-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Texinfo &texinfo-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Udev &udev-version;</para>
     </listitem>-->
     <listitem>
       <para>&udev-config;</para>
     </listitem>
-    <!--<listitem>
-      <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    <listitem>
+      <para>Util-Linux-NG &util-linux-ng-version;</para>
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
@@ -217,6 +217,10 @@
     </listitem>
 
     <listitem>
+      <para>&udev-usbid-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&vim-fixes-patch;</para>
     </listitem>
 
@@ -234,10 +238,18 @@
     </listitem>
 
     <listitem>
+      <para>gawk-3.1.5-segfault_fix-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>gcc-4.1.2-specs-1.patch</para>
     </listitem>
 
     <listitem>
+      <para>man-db-2.4.4-fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>readline-5.4-fixes-4.patch</para>
     </listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 41fcdfce1..fd51aa359 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -543,11 +543,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
+      <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&util-linux-home;"/></para>
-        <para>Download: <ulink url="&util-linux-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
+        <para>Home page: <ulink url="&util-linux-ng-home;"/></para>
+        <para>Download: <ulink url="&util-linux-ng-url;"/></para>
+        <para>MD5 sum: <literal>&util-linux-ng-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 222ddce96..e36a9e512 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -27,6 +27,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Binutils Texinfo Version Patch - <token>&binutils-configure-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-configure-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-configure-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
@@ -75,14 +83,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gawk Segfault Patch - <token>&gawk-segfault-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gawk-segfault-patch;"/></para>
-        <para>MD5 sum: <literal>&gawk-segfault-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Grep RedHat Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
@@ -131,14 +131,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Man-DB Fix Patch - <token>&man-db-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&man-db-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&man-db-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>
@@ -186,36 +178,12 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&texinfo-multibyte-patch;"/></para>
-        <para>MD5 sum: <literal>&texinfo-multibyte-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-
-    <varlistentry>
-      <term>Texinfo Tempfile Fix Patch - <token>&texinfo-tempfile_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&texinfo-tempfile_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&texinfo-tempfile_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux Cramfs Patch - <token>&util-linux-cramfs-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&util-linux-cramfs-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-cramfs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry>
-      <term>Util-linux Lseek Patch - <token>&util-linux-lseek-patch-size;</token>:</term>
+      <term>Udev usb_id Segfault Patch - <token>&udev-usbid-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&util-linux-lseek-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-lseek-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&udev-usbid-patch;"/></para>
+        <para>MD5 sum: <literal>&udev-usbid-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 75dbc608c..48028e103 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -111,9 +111,9 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
 
   </caution>
 
-  <note><para>Building TCL in the next section will serve as an additional check that
-  the toolchain has been built properly.  If TCL fails to build, it is an
+  <note><para>Building Tcl in the next section will serve as an additional check that
+  the toolchain has been built properly.  If Tcl fails to build, it is an
   indication that something has gone wrong with the Binutils, GCC, or Glibc
-  installation, but not with TCL itself.</para></note>
+  installation, but not with Tcl itself.</para></note>
 
 </sect1>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index f037c3641..6644c2250 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -48,6 +48,11 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
+    <para>Binutils does not recognize versions of Texinfo newer than 4.9.  Fix
+    this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index d0c7a5ac5..7cfcb6421 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,6 +43,11 @@
   <sect2 role="installation">
     <title>Re-installation of Binutils</title>
 
+    <para>Binutils does not recognize versions of Texinfo newer than 4.9.  Fix
+    this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 830c85c0a..0340c16dd 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -28,6 +28,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
@@ -42,7 +43,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changingowner.xml"/>
 
diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml
new file mode 100644
index 000000000..6023c756c
--- /dev/null
+++ b/chapter05/e2fsprogs.xml
@@ -0,0 +1,72 @@
+<?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-tools-e2fsprogs" role="wrap">
+  <?dbhtml filename="e2fsprogs.html"?>
+
+  <sect1info condition="script">
+    <productname>e2fsprogs</productname>
+    <productnumber>&e2fsprogs-version;</productnumber>
+    <address>&e2fsprogs-url;</address>
+  </sect1info>
+
+  <title>E2fsprogs-&e2fsprogs-version;</title>
+
+  <indexterm zone="ch-tools-e2fsprogs">
+    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/e2fsprogs.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&e2fsprogs-ch5-sbu;</seg>
+        <seg>&e2fsprogs-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of E2fsprogs</title>
+
+    <para>The E2fsprogs documentation recommends that the package be built in
+    a subdirectory of the source tree: </para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd build</userinput></screen>
+
+    <para>Prepare E2fsprogs for compilation:</para>
+
+<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the static libraries and headers required by Udev:</para>
+
+<screen><userinput remap="install">make install-libs</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-e2fsprogs" role="."/></para>
+  </sect2>
+
+</sect1>
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 9a2ac64a3..bdb99149a 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -47,16 +47,6 @@
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
 
-    <para>Due to a bug in the <command>configure</command> script, Gawk fails
-    to detect certain aspects of locale support in Glibc. This bug leads to,
-    e.g., Gettext testsuite failures. Work around this issue by appending the
-    missing macro definitions to <filename>config.h</filename>:</para>
-
-<screen><userinput remap="configure">cat &gt;&gt; config.h &lt;&lt; "EOF"
-<literal>#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1</literal>
-EOF</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
new file mode 100644
index 000000000..19a4b3770
--- /dev/null
+++ b/chapter05/util-linux-ng.xml
@@ -0,0 +1,76 @@
+<?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-tools-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <sect1info condition="script">
+    <productname>util-linux-ng</productname>
+    <productnumber>&util-linux-ng-version;</productnumber>
+    <address>&util-linux-ng-url;</address>
+  </sect1info>
+
+  <title>Util-linux-ng-&util-linux-ng-version;</title>
+
+  <indexterm zone="ch-tools-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/util-linux-ng.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&util-linux-ng-ch5-sbu;</seg>
+        <seg>&util-linux-ng-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Util-linux-ng</title>
+
+    <para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
+
+    <para>Only a few of the utilities contained in this package need to be
+    built:</para>
+
+<screen><userinput remap="make">make -C mount mount umount
+make -C text-utils more</userinput></screen>
+
+    <para>This package comes with a test suite, but running it will cause all of
+    the binaries to be built and tested.  If you still wish to run the tests,
+    issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+    <para>Copy these programs to the temporary tools directory:</para>
+
+<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-utillinux" role="."/></para>
+
+  </sect2>
+
+</sect1>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index d3708733f..073d2a1c6 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -5,19 +5,19 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
+<sect1 id="ch-tools-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
 
   <sect1info condition="script">
-    <productname>util-linux</productname>
-    <productnumber>&util-linux-version;</productnumber>
-    <address>&util-linux-url;</address>
+    <productname>util-linux-ng</productname>
+    <productnumber>&util-linux-ng-version;</productnumber>
+    <address>&util-linux-ng-url;</address>
   </sect1info>
 
-  <title>Util-linux-&util-linux-version;</title>
+  <title>Util-linux-ng-&util-linux-ng-version;</title>
 
-  <indexterm zone="ch-tools-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
+  <indexterm zone="ch-tools-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
     <secondary>tools</secondary>
   </indexterm>
 
@@ -33,29 +33,19 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&util-linux-ch5-sbu;</seg>
-        <seg>&util-linux-ch5-du;</seg>
+        <seg>&util-linux-ng-ch5-sbu;</seg>
+        <seg>&util-linux-ng-ch5-du;</seg>
       </seglistitem>
     </segmentedlist>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <para>Util-linux does not use the freshly installed headers and libraries
-    from the <filename class="directory">/tools</filename> directory by default.
-    This is fixed by altering the configure script:</para>
-
-<screen><userinput remap="pre">sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
+    <title>Installation of Util-linux-ng</title>
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure</userinput></screen>
-
-    <para>Compile some support routines:</para>
-
-<screen><userinput remap="make">make -C lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
 
     <para>Only a few of the utilities contained in this package need to be
     built:</para>
@@ -63,7 +53,11 @@
 <screen><userinput remap="make">make -C mount mount umount
 make -C text-utils more</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package comes with a test suite, but running it will cause all of
+    the binaries to be built and tested.  If you still wish to run the tests,
+    issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Copy these programs to the temporary tools directory:</para>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 535fd506e..e930742dd 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,6 +56,11 @@ Ask your system administrator to create more.</computeroutput></screen>
     <para>This issue needs to be resolved before running the test suites
     for Binutils and GCC.</para>
 
+    <para>Binutils does not recognize versions of Texinfo newer than 4.9.  Fix
+    this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index e012ea8bc..58ed24716 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -66,7 +66,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="strippingagain.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 249306d97..4913d7d91 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -83,7 +83,7 @@ daemon:x:6:
 floppy:x:7:
 disk:x:8:
 lp:x:9:
-dialout:x:10:
+uucp:x:10:
 audio:x:11:
 video:x:12:
 utmp:x:13:
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 898f66a29..3c5c4b28e 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -40,26 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Gawk</title>
 
-    <para>Under some circumstances, Gawk-&gawk-version;  attempts to free a
-    chunk of memory that was not allocated. This bug is fixed by the following
-    patch:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&gawk-segfault-patch;</userinput></screen>
-
     <para>Prepare Gawk for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
 
-    <para>Due to a bug in the <command>configure</command> script, Gawk fails
-    to detect certain aspects of locale support in Glibc. This bug leads to,
-    e.g., Gettext testsuite failures. Work around this issue by appending the
-    missing macro definitions to <filename>config.h</filename>:</para>
-
-<screen><userinput remap="configure">cat &gt;&gt; config.h &lt;&lt; "EOF"
-<literal>#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1</literal>
-EOF</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 872d8c38c..1934f0fbe 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
 
-    <para>The installation of two manual pages is broken and results in
-    dangling symlinks. Fix this with the following command:</para>
-
-<screen><userinput remap="pre">sed -i -e '/tc-bfifo.8/d' -e '/tc-pfifo.8/s/pbfifo/bfifo/' Makefile</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make SBINDIR=/sbin</userinput></screen>
@@ -65,7 +60,14 @@
 
     </variablelist>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package comes with a testsuite, but due to assumptions it makes,
+    it is not possible to reliably run these tests from within the chroot
+    environment. If you wish to run these tests after booting into your new LFS
+    system, ensure you select <filename>/proc/config.gz</filename>
+    CONFIG_IKCONFIG_PROC (&quot;General setup&quot; -> &quot;Enable access to
+    .config through /proc/config.gz&quot;) support into your kernel then run
+    'make alltests' from the <filename class="directory">testsuite/</filename>
+    subdirectory.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index b50b02398..9d0d2143a 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -84,7 +84,7 @@ cp -rv dest/include/* /usr/include</userinput></screen>
           <para>The Linux API headers</para>
           <indexterm zone="ch-system-linux-headers linux-headers">
             <!-- No /*.h here to prevent a PDF line overflow -->
-            <primary sortas="e-/usr/include/{asm{,-generic},linux,mtd,rdma,sound}">/usr/include/{asm{,-generic},linux,mtd,rdma,sound}</primary>
+            <primary sortas="e-/usr/include/{asm{,-generic},linux,mtd,rdma,sound}">/usr/include/{asm{,-generic},linux,mtd,rdma,sound,video}</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index d72f23eb5..52de24fee 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -41,26 +41,16 @@
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
 
-    <para>Four adjustments need to be made to the sources of Man-DB.</para>
+    <para>Two adjustments need to be made to the sources of Man-DB.</para>
 
-    <para>The first one changes the location of translated manual pages that come
-    with Man-DB, in order for them to be accessible in both traditional and
-    UTF-8 locales:</para>
-
-<screen><userinput remap="pre">mv man/de{_DE.88591,}
-mv man/es{_ES.88591,}
-mv man/it{_IT.88591,}
-mv man/ja{_JP.eucJP,}
-sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
-
-    <para>The second change is a <command>sed</command> substitution to delete
+    <para>The first change is a <command>sed</command> substitution to delete
     the <quote>/usr/man</quote> and <quote>/usr/local/man</quote> lines in
     the <filename>man_db.conf</filename> file to prevent redundant results
     when using programs such as <command>whatis</command>:</para>
 
 <screen><userinput remap="pre">sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen>
 
-    <para>The third change accounts for programs that Man-DB should be able
+    <para>The second change accounts for programs that Man-DB should be able
     to find at runtime, but that haven't been installed yet:</para>
 
 <screen><userinput remap="pre">cat &gt;&gt; include/manconfig.h.in &lt;&lt; "EOF"
@@ -79,11 +69,6 @@ EOF</userinput></screen>
     manual pages. They are not part of LFS or BLFS, but you should be able
     to install them yourself after finishing LFS if you wish to do so.</para>
 
-    <para>Finally, patch the sources to fix output errors if the man page is
-    prematurely aborted by pressing the 'q' key:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&man-db-fixes-patch;</userinput></screen>
-
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen>
diff --git a/chapter06/pkgmgt.xml b/chapter06/pkgmgt.xml
index 7c82ca8b3..3b8d1aa95 100644
--- a/chapter06/pkgmgt.xml
+++ b/chapter06/pkgmgt.xml
@@ -12,12 +12,14 @@
 
   <para>Package Management is an often requested addition to the LFS Book. A
   Package Manager allows tracking the installation of files making it easy to
-  remove and upgrade packages. Before you begin to wonder, NO&mdash;this section
-  will not talk about nor recommend any particular package manager. What it
-  provides is a roundup of the more popular techniques and how they work. The
-  perfect package manager for you may be among these techniques or may be a
-  combination of two or more of these techniques. This section briefly mentions
-  issues that may arise when upgrading packages.</para>
+  remove and upgrade packages. As well as the binary and library files, a
+  package manager will handle the installation of configuration files.  Before
+  you begin to wonder, NO&mdash;this section will not talk about nor recommend
+  any particular package manager. What it provides is a roundup of the more
+  popular techniques and how they work. The perfect package manager for you may
+  be among these techniques or may be a combination of two or more of these
+  techniques. This section briefly mentions issues that may arise when upgrading
+  packages.</para>
 
   <para>Some reasons why no package manager is mentioned in LFS or BLFS
   include:</para>
@@ -182,9 +184,13 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
     </sect3>
 
     <sect3>
-      <title>LD_PRELOAD Based</title>
+      <title>Tracing Installation Scripts</title>
 
-      <para>In this approach, a library is preloaded before installation. During
+      <para>In this approach, the commands that the installation scripts perform
+      are recorded.  There are two techniques that one can use:</para>
+
+      <para>The <envar>LD_PRELOAD</envar> environment variable can be set to
+      point to a library to be preloaded before installation.  During
       installation, this library tracks the packages that are being installed by
       attaching itself to various executables such as <command>cp</command>,
       <command>install</command>, <command>mv</command> and tracking the system
@@ -195,6 +201,9 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
       ensure that the package manager does not break anything and logs all the
       appropriate files.</para>
 
+      <para>The second technique is to use <command>strace</command>, which
+      logs all system calls made during the execution of the installation
+      scripts.</para>
     </sect3>
 
     <sect3>
@@ -209,7 +218,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
       <para>This approach is used by most of the package managers found in the
       commercial distributions. Examples of package managers that follow this
       approach are RPM (which, incidentally, is required by the <ulink
-      url="http://lsbbook.gforge.freestandards.org/package.html#RPM">Linux
+      url="http://www.linux-foundation.org/en/Specifications">Linux
       Standard Base Specification</ulink>), pkg-utils, Debian's apt, and
       Gentoo's Portage system.  A hint describing how to adopt this style of
       package management for LFS systems is located at <ulink
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index a5dfa0a0d..dd91e51c4 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -50,8 +50,10 @@
 
     <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>Note that tests 26 and 29 are known to fail intermittently.</para>
+ 
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 69916295a..447580764 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,19 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>The <command>info</command> program makes assumptions such as that
-    a string occupies the same number of character cells on the screen and
-    bytes in memory and that one can break the string anywhere, which fail
-    in UTF-8 based locales. The patch below makes them valid by falling back
-    to English messages when a multibyte locale is in use:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen>
-
-    <para>Texinfo allows local users to overwrite arbitrary files via a symlink
-    attack on temporary files. Apply the following patch to fix this:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
-
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -64,7 +51,7 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 6f7b15b7f..8d7e820ae 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -57,6 +57,11 @@ ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
 ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
 ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
 
+    <para><command>usb_id</command> is known to segfault under certain kernel
+    configurations.  Fix the issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&udev-usbid-patch;</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make EXTRAS="`echo extras/*/`"</userinput></screen>
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
new file mode 100644
index 000000000..bf774a4e8
--- /dev/null
+++ b/chapter06/util-linux-ng.xml
@@ -0,0 +1,756 @@
+<?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-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <sect1info condition="script">
+    <productname>util-linux-ng</productname>
+    <productnumber>&util-linux-ng-version;</productnumber>
+    <address>&util-linux-ng-url;</address>
+  </sect1info>
+
+  <title>Util-linux-&util-linux-ng-version;</title>
+
+  <indexterm zone="ch-system-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Util-linux-ng package contains miscellaneous utility programs.
+    Among them are utilities for handling file systems, consoles, partitions,
+    and messages.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&util-linux-ng-ch6-sbu;</seg>
+        <seg>&util-linux-ng-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>FHS compliance notes</title>
+
+    <para>The FHS recommends using the <filename
+    class="directory">/var/lib/hwclock</filename> directory instead of the
+    usual <filename class="directory">/etc</filename> directory as the
+    location for the <filename>adjtime</filename> file. To make the
+    <command>hwclock</command> program FHS-compliant, run the
+    following:</para>
+
+<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+    -i $(grep -rl '/etc/adjtime' .)
+mkdir -pv /var/lib/hwclock</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Util-linux-ng</title>
+
+<screen><userinput remap="configure">./configure</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-utillinux" role="content">
+    <title>Contents of Util-linux-ng</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
+        colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat,
+        fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
+        ipcs, isosize, line, logger, look, losetup, mcookie, mkfs, mkfs.bfs,
+        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, pg, pivot_root,
+        ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
+        rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
+        swapoff (link to swapon), swapon, tailf, tunelp, ul, umount,
+        vidmode (link to rdev), whereis, and write</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="agetty">
+        <term><command>agetty</command></term>
+        <listitem>
+          <para>Opens a tty port, prompts for a login name,
+          and then invokes the <command>login</command> program</para>
+          <indexterm zone="ch-system-util-linux-ng agetty">
+            <primary sortas="b-agetty">agetty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arch">
+        <term><command>arch</command></term>
+        <listitem>
+          <para>Reports the machine's architecture</para>
+          <indexterm zone="ch-system-util-linux-ng arch">
+            <primary sortas="b-arch">arch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="blockdev">
+        <term><command>blockdev</command></term>
+        <listitem>
+          <para>Allows users to call block device ioctls from the command
+          line</para>
+          <indexterm zone="ch-system-util-linux-ng blockdev">
+            <primary sortas="b-blockdev">blockdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cal">
+        <term><command>cal</command></term>
+        <listitem>
+          <para>Displays a simple calendar</para>
+          <indexterm zone="ch-system-util-linux-ng cal">
+            <primary sortas="b-cal">cal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cfdisk">
+        <term><command>cfdisk</command></term>
+        <listitem>
+          <para>Manipulates the partition table of the given device</para>
+          <indexterm zone="ch-system-util-linux-ng cfdisk">
+            <primary sortas="b-cfdisk">cfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chkdupexe">
+        <term><command>chkdupexe</command></term>
+        <listitem>
+          <para>Finds duplicate executables</para>
+          <indexterm zone="ch-system-util-linux-ng chkdupexe">
+            <primary sortas="b-chkdupexe">chkdupexe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="col">
+        <term><command>col</command></term>
+        <listitem>
+          <para>Filters out reverse line feeds</para>
+          <indexterm zone="ch-system-util-linux-ng col">
+            <primary sortas="b-col">col</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colcrt">
+        <term><command>colcrt</command></term>
+        <listitem>
+          <para>Filters <command>nroff</command> output for terminals
+          that lack some capabilities, such as overstriking and half-lines</para>
+          <indexterm zone="ch-system-util-linux-ng colcrt">
+            <primary sortas="b-colcrt">colcrt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colrm">
+        <term><command>colrm</command></term>
+        <listitem>
+          <para>Filters out the given columns</para>
+          <indexterm zone="ch-system-util-linux-ng colrm">
+            <primary sortas="b-colrm">colrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="column">
+        <term><command>column</command></term>
+        <listitem>
+          <para>Formats a given file into multiple columns</para>
+          <indexterm zone="ch-system-util-linux-ng column">
+            <primary sortas="b-column">column</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ctrlaltdel">
+        <term><command>ctrlaltdel</command></term>
+        <listitem>
+          <para>Sets the function of the Ctrl+Alt+Del key combination to a
+          hard or a soft reset</para>
+          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
+            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cytune">
+        <term><command>cytune</command></term>
+        <listitem>
+          <para>Tunes the parameters of the serial line drivers for
+          Cyclades cards</para>
+          <indexterm zone="ch-system-util-linux-ng cytune">
+            <primary sortas="b-cytune">cytune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ddate">
+        <term><command>ddate</command></term>
+        <listitem>
+          <para>Gives the Discordian date or converts the given Gregorian date
+          to a Discordian one</para>
+          <indexterm zone="ch-system-util-linux-ng ddate">
+            <primary sortas="b-ddate">ddate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dmesg">
+        <term><command>dmesg</command></term>
+        <listitem>
+          <para>Dumps the kernel boot messages</para>
+          <indexterm zone="ch-system-util-linux-ng dmesg">
+            <primary sortas="b-dmesg">dmesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elvtune">
+        <term><command>elvtune</command></term>
+        <listitem>
+          <para>Tunes the performance and interactivity of a block
+          device</para>
+          <indexterm zone="ch-system-util-linux-ng elvtune">
+            <primary sortas="b-elvtune">elvtune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdformat">
+        <term><command>fdformat</command></term>
+        <listitem>
+          <para>Low-level formats a floppy disk</para>
+          <indexterm zone="ch-system-util-linux-ng fdformat">
+            <primary sortas="b-fdformat">fdformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdisk">
+        <term><command>fdisk</command></term>
+        <listitem>
+          <para>Manipulates the paritition table of the given device</para>
+          <indexterm zone="ch-system-util-linux-ng fdisk">
+            <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="flock">
+        <term><command>flock</command></term>
+        <listitem>
+          <para>Acquires a file lock and then executes a command with the lock
+          held</para>
+          <indexterm zone="ch-system-util-linux-ng flock">
+            <primary sortas="b-flock">flock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.cramfs">
+        <term><command>fsck.cramfs</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Cramfs file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
+            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.minix">
+        <term><command>fsck.minix</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Minix file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux-ng fsck.minix">
+            <primary sortas="b-fsck.minix">fsck.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getopt">
+        <term><command>getopt</command></term>
+        <listitem>
+          <para>Parses options in the given command line</para>
+          <indexterm zone="ch-system-util-linux-ng getopt">
+            <primary sortas="b-getopt">getopt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hexdump">
+        <term><command>hexdump</command></term>
+        <listitem>
+          <para>Dumps the given file in hexadecimal or in another given
+          format</para>
+          <indexterm zone="ch-system-util-linux-ng hexdump">
+            <primary sortas="b-hexdump">hexdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hwclock">
+        <term><command>hwclock</command></term>
+        <listitem>
+          <para>Reads or sets the system's hardware clock, also called
+          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
+          clock</para>
+          <indexterm zone="ch-system-util-linux-ng hwclock">
+            <primary sortas="b-hwclock">hwclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcrm">
+        <term><command>ipcrm</command></term>
+        <listitem>
+          <para>Removes the given Inter-Process Communication (IPC) resource</para>
+          <indexterm zone="ch-system-util-linux-ng ipcrm">
+            <primary sortas="b-ipcrm">ipcrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcs">
+        <term><command>ipcs</command></term>
+        <listitem>
+          <para>Provides IPC status information</para>
+          <indexterm zone="ch-system-util-linux-ng ipcs">
+            <primary sortas="b-ipcs">ipcs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isosize">
+        <term><command>isosize</command></term>
+        <listitem>
+          <para>Reports the size of an iso9660 file system</para>
+          <indexterm zone="ch-system-util-linux-ng isosize">
+            <primary sortas="b-isosize">isosize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="line">
+        <term><command>line</command></term>
+        <listitem>
+          <para>Copies a single line</para>
+          <indexterm zone="ch-system-util-linux-ng line">
+            <primary sortas="b-line">line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logger">
+        <term><command>logger</command></term>
+        <listitem>
+          <para>Enters the given message into the system log</para>
+          <indexterm zone="ch-system-util-linux-ng logger">
+            <primary sortas="b-logger">logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="look">
+        <term><command>look</command></term>
+        <listitem>
+          <para>Displays lines that begin with the given string</para>
+          <indexterm zone="ch-system-util-linux-ng look">
+            <primary sortas="b-look">look</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="losetup">
+        <term><command>losetup</command></term>
+        <listitem>
+          <para>Sets up and controls loop devices</para>
+          <indexterm zone="ch-system-util-linux-ng losetup">
+            <primary sortas="b-losetup">losetup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mcookie">
+        <term><command>mcookie</command></term>
+        <listitem>
+          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
+          <command>xauth</command></para>
+          <indexterm zone="ch-system-util-linux-ng mcookie">
+            <primary sortas="b-mcookie">mcookie</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs">
+        <term><command>mkfs</command></term>
+        <listitem>
+          <para>Builds a file system on a device (usually a hard disk
+          partition)</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs">
+            <primary sortas="b-mkfs">mkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.bfs">
+        <term><command>mkfs.bfs</command></term>
+        <listitem>
+          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
+            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.cramfs">
+        <term><command>mkfs.cramfs</command></term>
+        <listitem>
+          <para>Creates a cramfs file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
+            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.minix">
+        <term><command>mkfs.minix</command></term>
+        <listitem>
+          <para>Creates a Minix file system</para>
+          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
+            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkswap">
+        <term><command>mkswap</command></term>
+        <listitem>
+          <para>Initializes the given device or file to be used as a swap
+          area</para>
+          <indexterm zone="ch-system-util-linux-ng mkswap">
+            <primary sortas="b-mkswap">mkswap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="more">
+        <term><command>more</command></term>
+        <listitem>
+          <para>A filter for paging through text one screen at a time</para>
+          <indexterm zone="ch-system-util-linux-ng more">
+            <primary sortas="b-more">more</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount">
+        <term><command>mount</command></term>
+        <listitem>
+          <para>Attaches the file system on the given device to a specified
+          directory in the file-system tree</para>
+          <indexterm zone="ch-system-util-linux-ng mount">
+            <primary sortas="b-mount">mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="namei">
+        <term><command>namei</command></term>
+        <listitem>
+          <para>Shows the symbolic links in the given pathnames</para>
+          <indexterm zone="ch-system-util-linux-ng namei">
+            <primary sortas="b-namei">namei</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg">
+        <term><command>pg</command></term>
+        <listitem>
+          <para>Displays a text file one screen full at a time</para>
+          <indexterm zone="ch-system-util-linux-ng pg">
+            <primary sortas="b-pg">pg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pivot_root">
+        <term><command>pivot_root</command></term>
+        <listitem>
+          <para>Makes the given file system the new root file system of the
+          current process</para>
+          <indexterm zone="ch-system-util-linux-ng pivot_root">
+            <primary sortas="b-pivot_root">pivot_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ramsize">
+        <term><command>ramsize</command></term>
+        <listitem>
+          <para>Sets the size of the RAM disk in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng ramsize">
+            <primary sortas="b-ramsize">ramsize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="raw">
+        <term><command>raw</command></term>
+        <listitem>
+          <para>Used to bind a Linux raw character device to a block
+          device</para>
+          <indexterm zone="ch-system-util-linux-ng raw">
+            <primary sortas="b-raw">raw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rdev">
+        <term><command>rdev</command></term>
+        <listitem>
+          <para>Queries and sets the root device, among other things, in a
+          bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng rdev">
+            <primary sortas="b-rdev">rdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="readprofile">
+        <term><command>readprofile</command></term>
+        <listitem>
+          <para>Reads kernel profiling information</para>
+          <indexterm zone="ch-system-util-linux-ng readprofile">
+            <primary sortas="b-readprofile">readprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rename">
+        <term><command>rename</command></term>
+        <listitem>
+          <para>Renames the given files, replacing a given string with
+          another</para>
+          <indexterm zone="ch-system-util-linux-ng rename">
+            <primary sortas="b-rename">rename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="renice">
+        <term><command>renice</command></term>
+        <listitem>
+          <para>Alters the priority of running processes</para>
+          <indexterm zone="ch-system-util-linux-ng renice">
+            <primary sortas="b-renice">renice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rev">
+        <term><command>rev</command></term>
+        <listitem>
+          <para>Reverses the lines of a given file</para>
+          <indexterm zone="ch-system-util-linux-ng rev">
+            <primary sortas="b-rev">rev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rootflags">
+        <term><command>rootflags</command></term>
+        <listitem>
+          <para>Sets the rootflags in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng rootflags">
+            <primary sortas="b-rootflags">rootflags</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="script">
+        <term><command>script</command></term>
+        <listitem>
+          <para>Makes a typescript of a terminal session</para>
+          <indexterm zone="ch-system-util-linux-ng script">
+            <primary sortas="b-script">script</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfdprm">
+        <term><command>setfdprm</command></term>
+        <listitem>
+          <para>Sets user-provided floppy disk parameters</para>
+          <indexterm zone="ch-system-util-linux-ng setfdprm">
+            <primary sortas="b-setfdprm">setfdprm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setsid">
+        <term><command>setsid</command></term>
+        <listitem>
+          <para>Runs the given program in a new session</para>
+          <indexterm zone="ch-system-util-linux-ng setsid">
+            <primary sortas="b-setsid">setsid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setterm">
+        <term><command>setterm</command></term>
+        <listitem>
+          <para>Sets terminal attributes</para>
+          <indexterm zone="ch-system-util-linux-ng setterm">
+            <primary sortas="b-setterm">setterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfdisk">
+        <term><command>sfdisk</command></term>
+        <listitem>
+          <para>A disk partition table manipulator</para>
+          <indexterm zone="ch-system-util-linux-ng sfdisk">
+            <primary sortas="b-sfdisk">sfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapoff">
+        <term><command>swapoff</command></term>
+        <listitem>
+          <para>Disables devices and files for paging and swapping</para>
+          <indexterm zone="ch-system-util-linux-ng swapoff">
+            <primary sortas="b-swapoff">swapoff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapon">
+        <term><command>swapon</command></term>
+        <listitem>
+          <para>Enables devices and files for paging and swapping and
+          lists the devices and files currently in use</para>
+          <indexterm zone="ch-system-util-linux-ng swapon">
+            <primary sortas="b-swapon">swapon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tailf">
+        <term><command>tailf</command></term>
+        <listitem>
+          <para>Tracks the growth of a log file. Displays the last 10 lines
+          of a log file, then continues displaying any new entries in the
+          log file as they are created</para>
+          <indexterm zone="ch-system-util-linux-ng tailf">
+            <primary sortas="b-tailf">tailf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tunelp">
+        <term><command>tunelp</command></term>
+        <listitem>
+          <para>Tunes the parameters of the line printer</para>
+          <indexterm zone="ch-system-util-linux-ng tunelp">
+            <primary sortas="b-tunelp">tunelp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ul">
+        <term><command>ul</command></term>
+        <listitem>
+          <para>A filter for translating underscores into escape sequences
+          indicating underlining for the terminal in use</para>
+          <indexterm zone="ch-system-util-linux-ng ul">
+            <primary sortas="b-ul">ul</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umount">
+        <term><command>umount</command></term>
+        <listitem>
+          <para>Disconnects a file system from the system's file tree</para>
+          <indexterm zone="ch-system-util-linux-ng umount">
+            <primary sortas="b-umount">umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vidmode">
+        <term><command>vidmode</command></term>
+        <listitem>
+          <para>Sets the video mode in a bootable image</para>
+          <indexterm zone="ch-system-util-linux-ng vidmode">
+            <primary sortas="b-vidmode">vidmode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="whereis">
+        <term><command>whereis</command></term>
+        <listitem>
+          <para>Reports the location of the binary, source, and man page
+          for the given command</para>
+          <indexterm zone="ch-system-util-linux-ng whereis">
+            <primary sortas="b-whereis">whereis</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write">
+        <term><command>write</command></term>
+        <listitem>
+          <para>Sends a message to the given user <emphasis>if</emphasis> that
+          user has not disabled receipt of such messages</para>
+          <indexterm zone="ch-system-util-linux-ng write">
+            <primary sortas="b-write">write</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 9f6830f86..656127aa1 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -5,35 +5,35 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
+<sect1 id="ch-system-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
 
   <sect1info condition="script">
-    <productname>util-linux</productname>
-    <productnumber>&util-linux-version;</productnumber>
-    <address>&util-linux-url;</address>
+    <productname>util-linux-ng</productname>
+    <productnumber>&util-linux-ng-version;</productnumber>
+    <address>&util-linux-ng-url;</address>
   </sect1info>
 
-  <title>Util-linux-&util-linux-version;</title>
+  <title>Util-linux-&util-linux-ng-version;</title>
 
-  <indexterm zone="ch-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
+  <indexterm zone="ch-system-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Util-linux package contains miscellaneous utility programs. Among
-    them are utilities for handling file systems, consoles, partitions, and
-    messages.</para>
+    <para>The Util-linux-ng package contains miscellaneous utility programs.
+    Among them are utilities for handling file systems, consoles, partitions,
+    and messages.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&util-linux-ch6-sbu;</seg>
-        <seg>&util-linux-ch6-du;</seg>
+        <seg>&util-linux-ng-ch6-sbu;</seg>
+        <seg>&util-linux-ng-ch6-du;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -58,47 +58,13 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Util-linux fails to compile against newer versions of Linux kernel
-    headers. The following patches properly fix the problems:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&util-linux-cramfs-patch;
-patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
-
-    <para>Prepare Util-linux for compilation:</para>
-
 <screen><userinput remap="configure">./configure</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make parameters:</title>
-
-      <varlistentry>
-        <term><parameter>HAVE_KILL=yes</parameter></term>
-        <listitem>
-          <para>This prevents the <command>kill</command> program (already
-          installed by Procps) from being built and installed again.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>HAVE_SLN=yes</parameter></term>
-        <listitem>
-          <para>This prevents the <command>sln</command> program (a
-          statically linked version of <command>ln</command> already installed
-          by Glibc) from being built and installed again.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
+<screen><userinput remap="make">make</userinput></screen>
 
-<screen><userinput remap="install">make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>
 
@@ -131,7 +97,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Opens a tty port, prompts for a login name,
           and then invokes the <command>login</command> program</para>
-          <indexterm zone="ch-system-util-linux agetty">
+          <indexterm zone="ch-system-util-linux-ng agetty">
             <primary sortas="b-agetty">agetty</primary>
           </indexterm>
         </listitem>
@@ -141,7 +107,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>arch</command></term>
         <listitem>
           <para>Reports the machine's architecture</para>
-          <indexterm zone="ch-system-util-linux arch">
+          <indexterm zone="ch-system-util-linux-ng arch">
             <primary sortas="b-arch">arch</primary>
           </indexterm>
         </listitem>
@@ -152,7 +118,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Allows users to call block device ioctls from the command
           line</para>
-          <indexterm zone="ch-system-util-linux blockdev">
+          <indexterm zone="ch-system-util-linux-ng blockdev">
             <primary sortas="b-blockdev">blockdev</primary>
           </indexterm>
         </listitem>
@@ -162,7 +128,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>cal</command></term>
         <listitem>
           <para>Displays a simple calendar</para>
-          <indexterm zone="ch-system-util-linux cal">
+          <indexterm zone="ch-system-util-linux-ng cal">
             <primary sortas="b-cal">cal</primary>
           </indexterm>
         </listitem>
@@ -172,7 +138,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>cfdisk</command></term>
         <listitem>
           <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux cfdisk">
+          <indexterm zone="ch-system-util-linux-ng cfdisk">
             <primary sortas="b-cfdisk">cfdisk</primary>
           </indexterm>
         </listitem>
@@ -182,7 +148,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>chkdupexe</command></term>
         <listitem>
           <para>Finds duplicate executables</para>
-          <indexterm zone="ch-system-util-linux chkdupexe">
+          <indexterm zone="ch-system-util-linux-ng chkdupexe">
             <primary sortas="b-chkdupexe">chkdupexe</primary>
           </indexterm>
         </listitem>
@@ -192,7 +158,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>col</command></term>
         <listitem>
           <para>Filters out reverse line feeds</para>
-          <indexterm zone="ch-system-util-linux col">
+          <indexterm zone="ch-system-util-linux-ng col">
             <primary sortas="b-col">col</primary>
           </indexterm>
         </listitem>
@@ -203,7 +169,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Filters <command>nroff</command> output for terminals
           that lack some capabilities, such as overstriking and half-lines</para>
-          <indexterm zone="ch-system-util-linux colcrt">
+          <indexterm zone="ch-system-util-linux-ng colcrt">
             <primary sortas="b-colcrt">colcrt</primary>
           </indexterm>
         </listitem>
@@ -213,7 +179,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>colrm</command></term>
         <listitem>
           <para>Filters out the given columns</para>
-          <indexterm zone="ch-system-util-linux colrm">
+          <indexterm zone="ch-system-util-linux-ng colrm">
             <primary sortas="b-colrm">colrm</primary>
           </indexterm>
         </listitem>
@@ -223,7 +189,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>column</command></term>
         <listitem>
           <para>Formats a given file into multiple columns</para>
-          <indexterm zone="ch-system-util-linux column">
+          <indexterm zone="ch-system-util-linux-ng column">
             <primary sortas="b-column">column</primary>
           </indexterm>
         </listitem>
@@ -234,7 +200,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Sets the function of the Ctrl+Alt+Del key combination to a
           hard or a soft reset</para>
-          <indexterm zone="ch-system-util-linux ctrlaltdel">
+          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
             <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
           </indexterm>
         </listitem>
@@ -245,7 +211,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Tunes the parameters of the serial line drivers for
           Cyclades cards</para>
-          <indexterm zone="ch-system-util-linux cytune">
+          <indexterm zone="ch-system-util-linux-ng cytune">
             <primary sortas="b-cytune">cytune</primary>
           </indexterm>
         </listitem>
@@ -256,7 +222,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Gives the Discordian date or converts the given Gregorian date
           to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux ddate">
+          <indexterm zone="ch-system-util-linux-ng ddate">
             <primary sortas="b-ddate">ddate</primary>
           </indexterm>
         </listitem>
@@ -266,7 +232,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>dmesg</command></term>
         <listitem>
           <para>Dumps the kernel boot messages</para>
-          <indexterm zone="ch-system-util-linux dmesg">
+          <indexterm zone="ch-system-util-linux-ng dmesg">
             <primary sortas="b-dmesg">dmesg</primary>
           </indexterm>
         </listitem>
@@ -277,7 +243,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Tunes the performance and interactivity of a block
           device</para>
-          <indexterm zone="ch-system-util-linux elvtune">
+          <indexterm zone="ch-system-util-linux-ng elvtune">
             <primary sortas="b-elvtune">elvtune</primary>
           </indexterm>
         </listitem>
@@ -287,7 +253,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>fdformat</command></term>
         <listitem>
           <para>Low-level formats a floppy disk</para>
-          <indexterm zone="ch-system-util-linux fdformat">
+          <indexterm zone="ch-system-util-linux-ng fdformat">
             <primary sortas="b-fdformat">fdformat</primary>
           </indexterm>
         </listitem>
@@ -297,7 +263,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>fdisk</command></term>
         <listitem>
           <para>Manipulates the paritition table of the given device</para>
-          <indexterm zone="ch-system-util-linux fdisk">
+          <indexterm zone="ch-system-util-linux-ng fdisk">
             <primary sortas="b-fdisk">fdisk</primary>
           </indexterm>
         </listitem>
@@ -308,7 +274,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Acquires a file lock and then executes a command with the lock
           held</para>
-          <indexterm zone="ch-system-util-linux flock">
+          <indexterm zone="ch-system-util-linux-ng flock">
             <primary sortas="b-flock">flock</primary>
           </indexterm>
         </listitem>
@@ -319,7 +285,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Performs a consistency check on the Cramfs file system on the
           given device</para>
-          <indexterm zone="ch-system-util-linux fsck.cramfs">
+          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
             <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
           </indexterm>
         </listitem>
@@ -330,7 +296,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Performs a consistency check on the Minix file system on the
           given device</para>
-          <indexterm zone="ch-system-util-linux fsck.minix">
+          <indexterm zone="ch-system-util-linux-ng fsck.minix">
             <primary sortas="b-fsck.minix">fsck.minix</primary>
           </indexterm>
         </listitem>
@@ -340,7 +306,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>getopt</command></term>
         <listitem>
           <para>Parses options in the given command line</para>
-          <indexterm zone="ch-system-util-linux getopt">
+          <indexterm zone="ch-system-util-linux-ng getopt">
             <primary sortas="b-getopt">getopt</primary>
           </indexterm>
         </listitem>
@@ -351,7 +317,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Dumps the given file in hexadecimal or in another given
           format</para>
-          <indexterm zone="ch-system-util-linux hexdump">
+          <indexterm zone="ch-system-util-linux-ng hexdump">
             <primary sortas="b-hexdump">hexdump</primary>
           </indexterm>
         </listitem>
@@ -363,7 +329,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
           <para>Reads or sets the system's hardware clock, also called
           the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
           clock</para>
-          <indexterm zone="ch-system-util-linux hwclock">
+          <indexterm zone="ch-system-util-linux-ng hwclock">
             <primary sortas="b-hwclock">hwclock</primary>
           </indexterm>
         </listitem>
@@ -373,7 +339,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>ipcrm</command></term>
         <listitem>
           <para>Removes the given Inter-Process Communication (IPC) resource</para>
-          <indexterm zone="ch-system-util-linux ipcrm">
+          <indexterm zone="ch-system-util-linux-ng ipcrm">
             <primary sortas="b-ipcrm">ipcrm</primary>
           </indexterm>
         </listitem>
@@ -383,7 +349,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>ipcs</command></term>
         <listitem>
           <para>Provides IPC status information</para>
-          <indexterm zone="ch-system-util-linux ipcs">
+          <indexterm zone="ch-system-util-linux-ng ipcs">
             <primary sortas="b-ipcs">ipcs</primary>
           </indexterm>
         </listitem>
@@ -393,7 +359,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>isosize</command></term>
         <listitem>
           <para>Reports the size of an iso9660 file system</para>
-          <indexterm zone="ch-system-util-linux isosize">
+          <indexterm zone="ch-system-util-linux-ng isosize">
             <primary sortas="b-isosize">isosize</primary>
           </indexterm>
         </listitem>
@@ -403,7 +369,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>line</command></term>
         <listitem>
           <para>Copies a single line</para>
-          <indexterm zone="ch-system-util-linux line">
+          <indexterm zone="ch-system-util-linux-ng line">
             <primary sortas="b-line">line</primary>
           </indexterm>
         </listitem>
@@ -413,7 +379,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>logger</command></term>
         <listitem>
           <para>Enters the given message into the system log</para>
-          <indexterm zone="ch-system-util-linux logger">
+          <indexterm zone="ch-system-util-linux-ng logger">
             <primary sortas="b-logger">logger</primary>
           </indexterm>
         </listitem>
@@ -423,7 +389,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>look</command></term>
         <listitem>
           <para>Displays lines that begin with the given string</para>
-          <indexterm zone="ch-system-util-linux look">
+          <indexterm zone="ch-system-util-linux-ng look">
             <primary sortas="b-look">look</primary>
           </indexterm>
         </listitem>
@@ -433,7 +399,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>losetup</command></term>
         <listitem>
           <para>Sets up and controls loop devices</para>
-          <indexterm zone="ch-system-util-linux losetup">
+          <indexterm zone="ch-system-util-linux-ng losetup">
             <primary sortas="b-losetup">losetup</primary>
           </indexterm>
         </listitem>
@@ -444,7 +410,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Generates magic cookies (128-bit random hexadecimal numbers) for
           <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux mcookie">
+          <indexterm zone="ch-system-util-linux-ng mcookie">
             <primary sortas="b-mcookie">mcookie</primary>
           </indexterm>
         </listitem>
@@ -455,7 +421,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Builds a file system on a device (usually a hard disk
           partition)</para>
-          <indexterm zone="ch-system-util-linux mkfs">
+          <indexterm zone="ch-system-util-linux-ng mkfs">
             <primary sortas="b-mkfs">mkfs</primary>
           </indexterm>
         </listitem>
@@ -465,7 +431,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>mkfs.bfs</command></term>
         <listitem>
           <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.bfs">
+          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
             <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
           </indexterm>
         </listitem>
@@ -475,7 +441,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>mkfs.cramfs</command></term>
         <listitem>
           <para>Creates a cramfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.cramfs">
+          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
             <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
           </indexterm>
         </listitem>
@@ -485,7 +451,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>mkfs.minix</command></term>
         <listitem>
           <para>Creates a Minix file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.minix">
+          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
             <primary sortas="b-mkfs.minix">mkfs.minix</primary>
           </indexterm>
         </listitem>
@@ -496,7 +462,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Initializes the given device or file to be used as a swap
           area</para>
-          <indexterm zone="ch-system-util-linux mkswap">
+          <indexterm zone="ch-system-util-linux-ng mkswap">
             <primary sortas="b-mkswap">mkswap</primary>
           </indexterm>
         </listitem>
@@ -506,7 +472,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>more</command></term>
         <listitem>
           <para>A filter for paging through text one screen at a time</para>
-          <indexterm zone="ch-system-util-linux more">
+          <indexterm zone="ch-system-util-linux-ng more">
             <primary sortas="b-more">more</primary>
           </indexterm>
         </listitem>
@@ -517,7 +483,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Attaches the file system on the given device to a specified
           directory in the file-system tree</para>
-          <indexterm zone="ch-system-util-linux mount">
+          <indexterm zone="ch-system-util-linux-ng mount">
             <primary sortas="b-mount">mount</primary>
           </indexterm>
         </listitem>
@@ -527,7 +493,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>namei</command></term>
         <listitem>
           <para>Shows the symbolic links in the given pathnames</para>
-          <indexterm zone="ch-system-util-linux namei">
+          <indexterm zone="ch-system-util-linux-ng namei">
             <primary sortas="b-namei">namei</primary>
           </indexterm>
         </listitem>
@@ -537,7 +503,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>pg</command></term>
         <listitem>
           <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux pg">
+          <indexterm zone="ch-system-util-linux-ng pg">
             <primary sortas="b-pg">pg</primary>
           </indexterm>
         </listitem>
@@ -548,7 +514,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Makes the given file system the new root file system of the
           current process</para>
-          <indexterm zone="ch-system-util-linux pivot_root">
+          <indexterm zone="ch-system-util-linux-ng pivot_root">
             <primary sortas="b-pivot_root">pivot_root</primary>
           </indexterm>
         </listitem>
@@ -558,7 +524,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>ramsize</command></term>
         <listitem>
           <para>Sets the size of the RAM disk in a bootable image</para>
-          <indexterm zone="ch-system-util-linux ramsize">
+          <indexterm zone="ch-system-util-linux-ng ramsize">
             <primary sortas="b-ramsize">ramsize</primary>
           </indexterm>
         </listitem>
@@ -569,7 +535,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Used to bind a Linux raw character device to a block
           device</para>
-          <indexterm zone="ch-system-util-linux raw">
+          <indexterm zone="ch-system-util-linux-ng raw">
             <primary sortas="b-raw">raw</primary>
           </indexterm>
         </listitem>
@@ -580,7 +546,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Queries and sets the root device, among other things, in a
           bootable image</para>
-          <indexterm zone="ch-system-util-linux rdev">
+          <indexterm zone="ch-system-util-linux-ng rdev">
             <primary sortas="b-rdev">rdev</primary>
           </indexterm>
         </listitem>
@@ -590,7 +556,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>readprofile</command></term>
         <listitem>
           <para>Reads kernel profiling information</para>
-          <indexterm zone="ch-system-util-linux readprofile">
+          <indexterm zone="ch-system-util-linux-ng readprofile">
             <primary sortas="b-readprofile">readprofile</primary>
           </indexterm>
         </listitem>
@@ -601,7 +567,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Renames the given files, replacing a given string with
           another</para>
-          <indexterm zone="ch-system-util-linux rename">
+          <indexterm zone="ch-system-util-linux-ng rename">
             <primary sortas="b-rename">rename</primary>
           </indexterm>
         </listitem>
@@ -611,7 +577,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>renice</command></term>
         <listitem>
           <para>Alters the priority of running processes</para>
-          <indexterm zone="ch-system-util-linux renice">
+          <indexterm zone="ch-system-util-linux-ng renice">
             <primary sortas="b-renice">renice</primary>
           </indexterm>
         </listitem>
@@ -621,7 +587,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>rev</command></term>
         <listitem>
           <para>Reverses the lines of a given file</para>
-          <indexterm zone="ch-system-util-linux rev">
+          <indexterm zone="ch-system-util-linux-ng rev">
             <primary sortas="b-rev">rev</primary>
           </indexterm>
         </listitem>
@@ -631,7 +597,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>rootflags</command></term>
         <listitem>
           <para>Sets the rootflags in a bootable image</para>
-          <indexterm zone="ch-system-util-linux rootflags">
+          <indexterm zone="ch-system-util-linux-ng rootflags">
             <primary sortas="b-rootflags">rootflags</primary>
           </indexterm>
         </listitem>
@@ -641,7 +607,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>script</command></term>
         <listitem>
           <para>Makes a typescript of a terminal session</para>
-          <indexterm zone="ch-system-util-linux script">
+          <indexterm zone="ch-system-util-linux-ng script">
             <primary sortas="b-script">script</primary>
           </indexterm>
         </listitem>
@@ -651,7 +617,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>setfdprm</command></term>
         <listitem>
           <para>Sets user-provided floppy disk parameters</para>
-          <indexterm zone="ch-system-util-linux setfdprm">
+          <indexterm zone="ch-system-util-linux-ng setfdprm">
             <primary sortas="b-setfdprm">setfdprm</primary>
           </indexterm>
         </listitem>
@@ -661,7 +627,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>setsid</command></term>
         <listitem>
           <para>Runs the given program in a new session</para>
-          <indexterm zone="ch-system-util-linux setsid">
+          <indexterm zone="ch-system-util-linux-ng setsid">
             <primary sortas="b-setsid">setsid</primary>
           </indexterm>
         </listitem>
@@ -671,7 +637,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>setterm</command></term>
         <listitem>
           <para>Sets terminal attributes</para>
-          <indexterm zone="ch-system-util-linux setterm">
+          <indexterm zone="ch-system-util-linux-ng setterm">
             <primary sortas="b-setterm">setterm</primary>
           </indexterm>
         </listitem>
@@ -681,7 +647,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>sfdisk</command></term>
         <listitem>
           <para>A disk partition table manipulator</para>
-          <indexterm zone="ch-system-util-linux sfdisk">
+          <indexterm zone="ch-system-util-linux-ng sfdisk">
             <primary sortas="b-sfdisk">sfdisk</primary>
           </indexterm>
         </listitem>
@@ -691,7 +657,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>swapoff</command></term>
         <listitem>
           <para>Disables devices and files for paging and swapping</para>
-          <indexterm zone="ch-system-util-linux swapoff">
+          <indexterm zone="ch-system-util-linux-ng swapoff">
             <primary sortas="b-swapoff">swapoff</primary>
           </indexterm>
         </listitem>
@@ -702,7 +668,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Enables devices and files for paging and swapping and
           lists the devices and files currently in use</para>
-          <indexterm zone="ch-system-util-linux swapon">
+          <indexterm zone="ch-system-util-linux-ng swapon">
             <primary sortas="b-swapon">swapon</primary>
           </indexterm>
         </listitem>
@@ -714,7 +680,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
           <para>Tracks the growth of a log file. Displays the last 10 lines
           of a log file, then continues displaying any new entries in the
           log file as they are created</para>
-          <indexterm zone="ch-system-util-linux tailf">
+          <indexterm zone="ch-system-util-linux-ng tailf">
             <primary sortas="b-tailf">tailf</primary>
           </indexterm>
         </listitem>
@@ -724,7 +690,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>tunelp</command></term>
         <listitem>
           <para>Tunes the parameters of the line printer</para>
-          <indexterm zone="ch-system-util-linux tunelp">
+          <indexterm zone="ch-system-util-linux-ng tunelp">
             <primary sortas="b-tunelp">tunelp</primary>
           </indexterm>
         </listitem>
@@ -735,7 +701,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>A filter for translating underscores into escape sequences
           indicating underlining for the terminal in use</para>
-          <indexterm zone="ch-system-util-linux ul">
+          <indexterm zone="ch-system-util-linux-ng ul">
             <primary sortas="b-ul">ul</primary>
           </indexterm>
         </listitem>
@@ -745,7 +711,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>umount</command></term>
         <listitem>
           <para>Disconnects a file system from the system's file tree</para>
-          <indexterm zone="ch-system-util-linux umount">
+          <indexterm zone="ch-system-util-linux-ng umount">
             <primary sortas="b-umount">umount</primary>
           </indexterm>
         </listitem>
@@ -755,7 +721,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <term><command>vidmode</command></term>
         <listitem>
           <para>Sets the video mode in a bootable image</para>
-          <indexterm zone="ch-system-util-linux vidmode">
+          <indexterm zone="ch-system-util-linux-ng vidmode">
             <primary sortas="b-vidmode">vidmode</primary>
           </indexterm>
         </listitem>
@@ -766,7 +732,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Reports the location of the binary, source, and man page
           for the given command</para>
-          <indexterm zone="ch-system-util-linux whereis">
+          <indexterm zone="ch-system-util-linux-ng whereis">
             <primary sortas="b-whereis">whereis</primary>
           </indexterm>
         </listitem>
@@ -777,7 +743,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
         <listitem>
           <para>Sends a message to the given user <emphasis>if</emphasis> that
           user has not disabled receipt of such messages</para>
-          <indexterm zone="ch-system-util-linux write">
+          <indexterm zone="ch-system-util-linux-ng write">
             <primary sortas="b-write">write</primary>
           </indexterm>
         </listitem>
diff --git a/chapter07/console.xml b/chapter07/console.xml
index 5bacc045d..4b06d592f 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -183,7 +183,7 @@ EOF</userinput></screen>
     </listitem>
 
     <listitem>
-      <para>There is no pre-made UTF-8 Russian keyamp, therefore it has to be
+      <para>There is no pre-made UTF-8 Russian keymap, therefore it has to be
       produced by converting the existing KOI8-R keymap as illustrated
       below:</para>
 
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 3abd34932..4b0aafeed 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -128,7 +128,7 @@
 
     <para>Then write rules that create the symlinks, e.g.:</para>
 
-<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
+<screen role="nodump"><userinput>cat &gt; /etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; "EOF"
 <literal>
 # Persistent symlinks for webcam and tuner
 KERNEL=="video*", ATTRS{idProduct}=="1910", ATTRS{idVendor}=="0d81", \
@@ -138,18 +138,6 @@ KERNEL=="video*", ATTRS{device}=="0x036f", ATTRS{vendor}=="0x109e", \
 </literal>
 EOF</userinput></screen>
 
-    <note>
-      <para>Be aware that Udev does not recognize the backslash for line
-      continuation.  This example works properly because both the backslash
-      and newline are ignored by the shell.  This makes the shell send each
-      rule to cat on only one line.  (The shell ignores this sequence because
-      the EOF string used in the here-document redirection is not enclosed in
-      either double or single quotes.  For more details, see the bash(1)
-      manpage, and search it for "Here Documents".)</para>
-      <para>If modifying Udev rules with an editor, be sure to leave each
-      rule on one physical line.</para>
-    </note>
-
     <para>The result is that <filename>/dev/video0</filename> and
     <filename>/dev/video1</filename> devices still refer randomly to the tuner
     and the web camera (and thus should never be used directly), but there are
diff --git a/general.ent b/general.ent
index 7c2c1f857..83ba6eb3c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20071006">
-<!ENTITY releasedate "October 6, 2007">
+<!ENTITY version "SVN-JH-20080124">
+<!ENTITY releasedate "January 24, 2007">
 <!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 74dd87df5..7a348ad2c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -80,10 +80,10 @@
 <!ENTITY coreutils-ch6-du "72.4 MB">
 <!ENTITY coreutils-ch6-sbu "1.0 SBU">
 
-<!ENTITY db-version "4.6.19">
-<!ENTITY db-size "11,600 KB">
+<!ENTITY db-version "4.6.21">
+<!ENTITY db-size "11,603 KB">
 <!ENTITY db-url "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-<!ENTITY db-md5 "89c7390ff120d5ebf3eccc5f97249e79">
+<!ENTITY db-md5 "718082e7e35fc48478a2334b0bc4cd11">
 <!ENTITY db-home "http://www.oracle.com/technology/software/products/berkeley-db/index.html">
 <!ENTITY db-ch6-du "77 MB">
 <!ENTITY db-ch6-sbu "1.2 SBU">
@@ -109,11 +109,13 @@
 <!-- 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.2">
-<!ENTITY e2fsprogs-size "3,873 KB">
+<!ENTITY e2fsprogs-version "1.40.4">
+<!ENTITY e2fsprogs-size "3,954 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "130ce559a0f311ea2bc04a47b4982d0a">
+<!ENTITY e2fsprogs-md5 "124d744bdf9d443591eb8193c085944b">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
+<!ENTITY e2fsprogs-ch5-du "31.2 MB">
+<!ENTITY e2fsprogs-ch5-sbu "0.4 SBU">
 <!ENTITY e2fsprogs-ch6-du "31.2 MB">
 <!ENTITY e2fsprogs-ch6-sbu "0.4 SBU">
 
@@ -126,10 +128,10 @@
 <!ENTITY expect-ch5-du "4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "4.21">
-<!ENTITY file-size "538 KB">
+<!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-md5 "9e3503116f4269a1be70220ee2234b0e">
+<!ENTITY file-md5 "014a69979a8d5225a6ca2bcc4d7e967e">
 <!ENTITY file-home " ">
 <!ENTITY file-ch6-du "7.9 MB">
 <!ENTITY file-ch6-sbu "0.1 SBU">
@@ -154,20 +156,20 @@
 <!ENTITY flex-ch6-du "8.4 MB">
 <!ENTITY flex-ch6-sbu "0.1 SBU">
 
-<!ENTITY gawk-version "3.1.5">
-<!ENTITY gawk-size "1,716 KB">
+<!ENTITY gawk-version "3.1.6">
+<!ENTITY gawk-size "1,818 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2">
-<!ENTITY gawk-md5 "5703f72d0eea1d463f735aad8222655f">
+<!ENTITY gawk-md5 "c9926c0bc8c177cb9579708ce67f0d75">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "18.2 MB">
 <!ENTITY gawk-ch5-sbu "0.2 SBU">
 <!ENTITY gawk-ch6-du "18.2 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.2.1">
-<!ENTITY gcc-size "43,029 KB">
+<!ENTITY gcc-version "4.2.2">
+<!ENTITY gcc-size "43,110 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "cba410e6ff70f7d7f4be7a0267707fd0">
+<!ENTITY gcc-md5 "7ae33781417a35a2eb03ee098a9f4490">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "655 MB">
 <!ENTITY gcc-ch5p1-sbu "9.2 SBU">
@@ -176,20 +178,20 @@
 <!ENTITY gcc-ch6-du "681 MB testsuite included">
 <!ENTITY gcc-ch6-sbu "22 SBU testsuite included">
 
-<!ENTITY gettext-version "0.16.1">
-<!ENTITY gettext-size "8,340 KB">
+<!ENTITY gettext-version "0.17">
+<!ENTITY gettext-size "11,368 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "3d9ad24301c6d6b17ec30704a13fe127">
+<!ENTITY gettext-md5 "58a2bc6d39c0ba57823034d55d65d606">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "43 MB">
 <!ENTITY gettext-ch5-sbu "0.4 SBU">
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
-<!ENTITY glibc-version "2.6.1">
-<!ENTITY glibc-size "15,398 KB">
+<!ENTITY glibc-version "2.7">
+<!ENTITY glibc-size "15,602 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "11cf6d3fc86dbe0890b8d00372eb6286">
+<!ENTITY glibc-md5 "065c5952b439deba40083ccd67bcc8f7">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "342 MB">
 <!ENTITY glibc-ch5-sbu "7 SBU">
@@ -198,7 +200,7 @@
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "503f1315afd808728ebaa75b3d87a7d9">
+<!ENTITY glibc-libidn-md5 "226809992fb1f3dc6ea23e0f26952ea4">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
@@ -253,10 +255,10 @@
 <!ENTITY inetutils-ch6-du "8.9 MB">
 <!ENTITY inetutils-ch6-sbu "0.2 SBU">
 
-<!ENTITY iproute2-version "2.6.20-070313">
-<!ENTITY iproute2-size "394 KB">
-<!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz">
-<!ENTITY iproute2-md5 "7bc5883aadf740761fa2dd70b661e8cc">
+<!ENTITY iproute2-version "2.6.23">
+<!ENTITY iproute2-size "334 KB">
+<!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
+<!ENTITY iproute2-md5 "2e59da739ef19990408cf0a5cb0cae3e">
 <!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
 <!ENTITY iproute2-ch6-du "4.8 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -269,10 +271,10 @@
 <!ENTITY kbd-ch6-du "12.3 MB">
 <!ENTITY kbd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY less-version "406">
-<!ENTITY less-size "285 KB">
+<!ENTITY less-version "418">
+<!ENTITY less-size "292 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "c6062663b5be92dfcdfd6300ba0811e4">
+<!ENTITY less-md5 "b5864d76c54ddf4627fd57ab333c88b4">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
@@ -294,12 +296,12 @@
 <!ENTITY libtool-ch6-sbu "0.1 SBU">
 
 <!ENTITY linux-major-version "2.6">
-<!ENTITY linux-minor-version "22">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-minor-version "23">
+<!ENTITY linux-patch-version "14">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "44,052 KB">
+<!ENTITY linux-size "44,403 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "20af4d1e05bd725e89b691da483276e9">
+<!ENTITY linux-md5 "63a6a28ad2480edcffbc09c008b0939d">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
@@ -329,18 +331,18 @@
 <!ENTITY make-ch6-du "9.6 MB">
 <!ENTITY make-ch6-sbu "0.1 SBU">
 
-<!ENTITY man-db-version "2.4.4">
-<!ENTITY man-db-size "877 KB">
+<!ENTITY man-db-version "2.5.0">
+<!ENTITY man-db-size "955 KB">
 <!ENTITY man-db-url "http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "9d7952de1aeb9121497a8204c59c56d7">
+<!ENTITY man-db-md5 "c23b59726cebe0e0820ced2becf5f52d">
 <!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.64">
-<!ENTITY man-pages-size "1,799 KB">
+<!ENTITY man-pages-version "2.76">
+<!ENTITY man-pages-size "1,816 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "80683dd76cd4eb5aed36ac4401aef4d6">
+<!ENTITY man-pages-md5 "788354eb0ab1fad2eab69ae671c5e68d">
 <!ENTITY man-pages-home " ">
 <!ENTITY man-pages-ch6-du "37.4 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -400,10 +402,10 @@
 <!ENTITY procps-ch6-du "2.3 MB">
 <!ENTITY procps-ch6-sbu "0.1 SBU">
 
-<!ENTITY psmisc-version "22.5">
-<!ENTITY psmisc-size "271 KB">
+<!ENTITY psmisc-version "22.6">
+<!ENTITY psmisc-size "277 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "09c20fd899c2c1bd2dce02a510f99fab">
+<!ENTITY psmisc-md5 "2e81938855cf5cc38856bd4a31d79a4c">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "2.2 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
@@ -453,28 +455,28 @@
 <!ENTITY sysvinit-ch6-du "1 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY tar-version "1.18">
-<!ENTITY tar-size "1,833 KB">
+<!ENTITY tar-version "1.19">
+<!ENTITY tar-size "1,838 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "70170208d7c1bb9ab40120579434b6a3">
+<!ENTITY tar-md5 "bcc2e19b19823b9ab68c94586067a792">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "19.9 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">
 <!ENTITY tar-ch6-du "19.9 MB">
 <!ENTITY tar-ch6-sbu "0.3 SBU">
 
-<!ENTITY tcl-version "8.4.15">
-<!ENTITY tcl-size "3,549 KB">
+<!ENTITY tcl-version "8.4.17">
+<!ENTITY tcl-size "3,567 KB">
 <!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "5e1b71eef1f75a294072aa3218f62b66">
+<!ENTITY tcl-md5 "d2af2c45189c8c7fd1bfdd2a19b0fa30">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
 <!ENTITY tcl-ch5-du "24 MB">
 <!ENTITY tcl-ch5-sbu "0.3 SBU">
 
-<!ENTITY texinfo-version "4.9">
-<!ENTITY texinfo-size "1,489 KB">
+<!ENTITY texinfo-version "4.11">
+<!ENTITY texinfo-size "1,621 KB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
-<!ENTITY texinfo-md5 "f4458e4b81e5469fa0815c35654141ab">
+<!ENTITY texinfo-md5 "c6bf13df4fbeff8ce874aacd6a51e814">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
 <!ENTITY texinfo-ch5-du "16.3 MB">
 <!ENTITY texinfo-ch5-sbu "0.2 SBU">
@@ -495,15 +497,15 @@
 <!ENTITY udev-config-md5 "49c72e712f38c18884bd11a9a3b7e968">
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-version "2.12r">
-<!ENTITY util-linux-size "1,339 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "af9d9e03038481fbf79ea3ac33f116f9">
-<!ENTITY util-linux-home " ">
-<!ENTITY util-linux-ch5-du "8.9 MB">
-<!ENTITY util-linux-ch5-sbu "less than 0.1 SBU">
-<!ENTITY util-linux-ch6-du "17.2 MB">
-<!ENTITY util-linux-ch6-sbu "0.2 SBU">
+<!ENTITY util-linux-ng-version "2.13.1">
+<!ENTITY util-linux-ng-size "2,788 KB">
+<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.13/util-linux-ng-&util-linux-ng-version;.tar.bz2">
+<!ENTITY util-linux-ng-md5 "424badc1832e4b5291a2ec04e9e244f4">
+<!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
+<!ENTITY util-linux-ng-ch5-du "8.9 MB">
+<!ENTITY util-linux-ng-ch5-sbu "less than 0.1 SBU">
+<!ENTITY util-linux-ng-ch6-du "17.2 MB">
+<!ENTITY util-linux-ng-ch6-sbu "0.2 SBU">
 
 <!ENTITY vim-version "7.1">
 <!ENTITY vim-docdir "vim/vim71">
diff --git a/patches.ent b/patches.ent
index a485f82a2..f406a0746 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
-<!ENTITY bash-fixes-patch-md5 "6787b1c94648fde6edb3bbf5e3f042f8">
-<!ENTITY bash-fixes-patch-size "24 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-7.patch">
+<!ENTITY bash-fixes-patch-md5 "63ca4c26a1ae0c4a5b7da910d611d534">
+<!ENTITY bash-fixes-patch-size "55 KB">
+
+
+<!ENTITY binutils-configure-patch "binutils-&binutils-version;-configure-1.patch">
+<!ENTITY binutils-configure-patch-md5 "83877c299e3e3080952214e479396f23">
+<!ENTITY binutils-configure-patch-size "1 KB">
 
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -34,11 +39,6 @@
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
 
-<!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
-<!ENTITY gawk-segfault-patch-md5 "7679530d88bf3eb56c42eb6aba342ddb">
-<!ENTITY gawk-segfault-patch-size "1.3 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">
@@ -67,10 +67,6 @@
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 
 
-<!ENTITY man-db-fixes-patch "man-db-&man-db-version;-fixes-1.patch">
-<!ENTITY man-db-fixes-patch-md5 "f75b3c44bb801778cf188b87454ff9c1">
-<!ENTITY man-db-fixes-patch-size "2.0 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">
@@ -90,9 +86,9 @@
 <!ENTITY perl-libc-patch-size "1.1 KB">
 
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-4.patch">
-<!ENTITY readline-fixes-patch-md5 "4da6bf2066a7603c7bb0ab1f52243316">
-<!ENTITY readline-fixes-patch-size "12.5 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-5.patch">
+<!ENTITY readline-fixes-patch-md5 "7390b2296b7b11209829646537294ebb">
+<!ENTITY readline-fixes-patch-size "18 KB">
 
 
 <!ENTITY shadow-useradd-patch "shadow-&shadow-version;-useradd_fix-2.patch">
@@ -100,25 +96,14 @@
 <!ENTITY shadow-useradd-patch-size "6.1 KB">
 
 
-<!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
-<!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa">
-<!ENTITY texinfo-multibyte-patch-size "1.5 KB">
-
-<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch">
-<!ENTITY texinfo-tempfile_fix-patch-md5 "559bda136a2ac7777ecb67511227af85">
-<!ENTITY texinfo-tempfile_fix-patch-size "2.2 KB">
-
-<!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
-<!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
-<!ENTITY util-linux-cramfs-patch-size "2.8 KB">
+<!ENTITY udev-usbid-patch "udev-&udev-version;-usb_id-1.patch">
+<!ENTITY udev-usbid-md5 "247614818827422b99672ea8bf3909ec">
+<!ENTITY udev-usbid-patch-size "3.2 KB">
 
-<!ENTITY util-linux-lseek-patch "util-linux-&util-linux-version;-lseek-1.patch">
-<!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
-<!ENTITY util-linux-lseek-patch-size "10 KB">
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-2.patch">
-<!ENTITY vim-fixes-patch-md5 "4b33bda20c4e75601cd581b745477a2d">
-<!ENTITY vim-fixes-patch-size "294 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-mandir-patch "vim-&vim-version;-mandir-1.patch">
 <!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index a4246c5d7..434d86ee1 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -107,6 +107,10 @@
     </listitem>
 
     <listitem>
+      <para><emphasis role="strong">Perl-5.6.0</emphasis></para>
+    </listitem>
+
+    <listitem>
       <para><emphasis role="strong">Sed-3.0.2</emphasis></para>
     </listitem>
 
@@ -125,11 +129,12 @@
 
 <screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash
+export LC_ALL=C
 
 # Simple script to list version numbers of critical development tools
 
 bash --version | head -n1 | cut -d" " -f2-4
-echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-4
+echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
 bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
author	Jeremy Huntwork <jhuntwork@linuxfromscratch.org>	2008-01-26 23:35:18 +0000
committer	Jeremy Huntwork <jhuntwork@linuxfromscratch.org>	2008-01-26 23:35:18 +0000
commit	9ed7b54facb06a3d949ed3ec37bb7bdc94ed8488 (patch)
tree	4af40a307b9cd8506a2b5b71629f65e40230220e
parent	7336a40779c2ab4b78faf1ead6f7bf5efa808330 (diff)