Change procps to not install the kill program that is now installed

by util-linux.  

Update to util-linux-2.22.1.


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

chapter01/changelog.xml

@@ -39,6 +39,15 @@
     <listitem>
       <para>2012-09-27</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change procps to not install the
+          kill program that is now installed by util-linux.  Fixes
+          <ulink url="&lfs-ticket-root;3201">#3201</ulink>.</para> 
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.22.1.  Fixes
+          <ulink url="&lfs-ticket-root;3199">#3199</ulink>.</para> 
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to linux-3.6.2.  Fixes
           <ulink url="&lfs-ticket-root;3198">#3198</ulink>.</para> 

chapter06/procps.xml

@@ -50,10 +50,12 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen>
 
-    <para>Fix a bug in the Makefile, which prevents procps from building with
+    <para>Do not install the kill program because it was installed by util-linux.
+    Also fix a bug in the Makefile, which prevents procps from building with
     make-&make-version;:</para>
 
-<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' \
+       -e 's@^#SKIP/SKIP/' Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 

packages.ent

@@ -546,10 +546,10 @@
 <!ENTITY udev-lfs-md5    "3bd58f59ed73a08a7d427ee1fccc91ef">    
 <!ENTITY udev-lfs-home   " ">
 
-<!ENTITY util-linux-version "2.22">
-<!ENTITY util-linux-size "3,116 KB">
+<!ENTITY util-linux-version "2.22.1">
+<!ENTITY util-linux-size "3,124 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.22/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "ba2d8cc12a937231c80a04f7f7149303">
+<!ENTITY util-linux-md5 "730cf9932531ed09b53a04ca30fcb4c9">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 <!ENTITY util-linux-ch6-du "83 MB">
 <!ENTITY util-linux-ch6-sbu "0.7 SBU">