From 242405e3c028828ddaee9c2806aef9a481464ab0 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 6 Mar 2012 20:29:21 +0000
Subject: Upgrade to Psmisc-22.16. Fixes #3026.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9766 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 ++++
 chapter01/whatsnew.xml  |  4 ++--
 chapter06/psmisc.xml    | 12 ------------
 packages.ent            |  6 +++---
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f98eef4a2..852d9924b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-03-06</para>
       <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Psmisc-22.16. Fixes
+           <ulink url="&lfs-ticket-root;3026">#3026</ulink>.</para>
+         </listitem>
         <listitem>
           <para>[matthew] - Upgrade to File-5.11. Fixes
           <ulink url="&lfs-ticket-root;3024">#3024</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index fcf1e3638..03415fc8d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -160,9 +160,9 @@
     <!--<listitem>
       <para>Procps &procps-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Psmisc &psmisc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Readline &readline-version;</para>
     </listitem>-->
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index cefd5e487..b0c0cea89 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -55,18 +55,6 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-<!--
-    <para>By default, Psmisc's <command>pidof</command> program is not
-    installed. This usually is not a problem because it is installed later
-    in the Sysvinit package, which provides a better
-    <command>pidof</command> program. If Sysvinit will not be used for a
-    particular system, complete the installation of Psmisc by first moving
-    the <command>killall</command> to the correct location, as specified by the
-    FHS, then create a symlink to it:</para>
-
-<screen><userinput remap="install">mv /usr/bin/killall /bin
-ln -sv killall /bin/pidof</userinput></screen>
--->
     <para>Finally, move the <command>killall</command> and <command>fuser</command> 
     programs to the location specified by the FHS:</para>
 
diff --git a/packages.ent b/packages.ent
index c4c7063ff..ed5468d6f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -440,10 +440,10 @@
 <!ENTITY procps-ch6-du "2.3 MB">
 <!ENTITY procps-ch6-sbu "0.1 SBU">
 
-<!ENTITY psmisc-version "22.15">
-<!ENTITY psmisc-size "382 KB">
+<!ENTITY psmisc-version "22.16">
+<!ENTITY psmisc-size "454 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "35e155bae2e499a6dcba35884560db1e">
+<!ENTITY psmisc-md5 "d52caf26159c905574c2ce4bd792b9ee">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "3.6 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
-- 
cgit v1.2.3-54-g00ecf