Upgrade to Util-Linux-2.21. Fixes #3002.

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

5 files changed, 57 insertions, 56 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 34c5d7c8c..3fab4010a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
 -->
 
     <listitem>
+      <para>2012-03-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Util-Linux-2.21. Fixes
+          <ulink url="&lfs-ticket-root;3002">#3002</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-03-02</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 675c51ffc..cfcad264b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -193,9 +193,9 @@
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 89b33b335..b728a237d 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -58,33 +58,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-<screen><userinput remap="configure">./configure --enable-arch --enable-partx --enable-write</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-arch</parameter></term>
-        <listitem>
-          <para>Enables building the <command>arch</command> program</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>--enable-partx</parameter></term>
-        <listitem>
-          <para>Enables building the <command>addpart</command>,
-          <command>delpart</command> and <command>partx</command>
-          programs</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>--enable-write</parameter></term>
-        <listitem>
-          <para>Enables building the <command>write</command> program</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="configure">./configure</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -107,17 +81,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
+        <seg>addpart, agetty, blkid, blockdev, cal, cfdisk, chcpu, chkdupexe,
         chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, delpart,
         dmesg, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386,
         ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, linux32, linux64,
         logger, look, losetup, lsblk, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
         mkfs.minix, mkswap, more, mount, mountpoint, namei, partx, pg, pivot_root,
-        readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
+        prlimit, raw, readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
         setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
         swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare,
-        uuidd, uuidgen, wall, whereis, wipefs, and write</seg>
+        uuidd, uuidgen, wall, whereis, wipefs, and x86_64</seg>
         <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
         /usr/share/getopt, /var/lib/hwclock</seg>
@@ -150,16 +124,6 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="arch">
-        <term><command>arch</command></term>
-        <listitem>
-          <para>Reports the machine's architecture</para>
-          <indexterm zone="ch-system-util-linux arch">
-            <primary sortas="b-arch">arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="blkid">
         <term><command>blkid</command></term>
         <listitem>
@@ -202,6 +166,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="chcpu">
+        <term><command>chcpu</command></term>
+        <listitem>
+          <para>Modifies the state of CPUs</para>
+          <indexterm zone="ch-system-util-linux chcpu">
+            <primary sortas="b-chcpu">chcpu</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="chkdupexe">
         <term><command>chkdupexe</command></term>
         <listitem>
@@ -731,6 +705,26 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="prlimit">
+        <term><command>prlimit</command></term>
+        <listitem>
+          <para>Get and set a process' resource limits</para>
+          <indexterm zone="ch-system-util-linux prlimit">
+            <primary sortas="b-prlimit">prlimit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="raw">
+        <term><command>raw</command></term>
+        <listitem>
+          <para>Bind a Linux raw character device to a block device</para>
+          <indexterm zone="ch-system-util-linux raw">
+            <primary sortas="b-raw">raw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="readprofile">
         <term><command>readprofile</command></term>
         <listitem>
@@ -1003,13 +997,12 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="write">
-        <term><command>write</command></term>
+      <varlistentry id="x86_64">
+        <term><command>x86_64</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 write">
-            <primary sortas="b-write">write</primary>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux x86_64">
+            <primary sortas="b-x86_64">x86_64</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/general.ent b/general.ent
index 655079832..a24118848 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120302">
-<!ENTITY releasedate "Mar 2, 2012">
+<!ENTITY version "SVN-20120306">
+<!ENTITY releasedate "Mar 6, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 450105b0c..27e2788b9 100644
--- a/packages.ent
+++ b/packages.ent
@@ -533,13 +533,11 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-version "2.20.1">
-<!ENTITY util-linux-size "4,506 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.20/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "079b37517fd4e002a2e6e992e8b4e361">
+<!ENTITY util-linux-version "2.21">
+<!ENTITY util-linux-size "2,885 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.21/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "208aa058f4117759d2939d1be7d662fc">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
-<!--<!ENTITY util-linux-ch5-du "19 MB">-->
-<!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">-->
 <!ENTITY util-linux-ch6-du "69 MB">
 <!ENTITY util-linux-ch6-sbu "0.7 SBU">