Replace Util-linux with Util-linux-ng. Fixes #2077.

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

9 files changed, 119 insertions, 175 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e81655f24..aceb39b39 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
       <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>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1a8d17d3f..c0c19f993 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -185,9 +185,9 @@
     <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>-->
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 1516e6ed5..e1c15f8d2 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 e0c6712cb..1d05a57aa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -189,23 +189,6 @@
 
 
     <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>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&util-linux-lseek-patch;"/></para>
-        <para>MD5 sum: <literal>&util-linux-lseek-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-
-    <varlistentry>
       <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&vim-fixes-patch;"/></para>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 4b707d516..7047df874 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"/>
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/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/packages.ent b/packages.ent
index c3ce50aef..408d97626 100644
--- a/packages.ent
+++ b/packages.ent
@@ -116,6 +116,8 @@
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!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">
 
@@ -499,15 +501,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/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 5228b52b5..f406a0746 100644
--- a/patches.ent
+++ b/patches.ent
@@ -100,13 +100,6 @@
 <!ENTITY udev-usbid-md5 "247614818827422b99672ea8bf3909ec">
 <!ENTITY udev-usbid-patch-size "3.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 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-5.patch">
 <!ENTITY vim-fixes-patch-md5 "61c8c6d7f6b56aa6fd0eb30081b36998">