Upgrade to Procps-ng-3.3.6

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

8 files changed, 95 insertions, 76 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index ea9ba887a..f7c957c88 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -412,7 +412,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Procps,Psmisc</seg>
+          <seg>Procps-ng,Psmisc</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1277,7 +1277,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Perl and Procps</seg>
+          <seg>Perl and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1464,7 +1464,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
+          <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
           Util-linux, and Vim</seg>
         </seglistitem>
       </segmentedlist>
@@ -1528,7 +1528,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Iana-Etc and Procps</seg>
+          <seg>Iana-Etc and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1620,7 +1620,7 @@
       </segmentedlist>
 
 <!-- Begin Procps dependency info -->
-  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
+  <bridgehead renderas="sect2" id="procps-dep">Procps-ng</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
@@ -1634,7 +1634,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>DejaGNU</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 01a149358..4eb3abac9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-01-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Procps-ng-3.3.6.  Fixes
+          <ulink url="&lfs-ticket-root;3095">#3095</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-01-20</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d9cf0839a..5fa0f7637 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -163,9 +163,9 @@
     <listitem>
       <para>Pkg-config &pkgconfig-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Procps &procps-version;</para>
-    </listitem>-->
+    <listitem>
+      <para>Procps-ng &procps-ng-version;</para>
+    </listitem>
     <listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>
@@ -302,6 +302,14 @@
     </listitem>
 
     <listitem>
+      <para>procps-3.2.8-fix_HZ_errors-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>procps-3.2.8-watch_unicode-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>sed-4.2.1-testsuite_fixes-1.patch</para>
     </listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index a2fb77f02..628841aae 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -459,11 +459,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
+      <term>Procps (&procps-ng-version;) - <token>&procps-ng-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&procps-home;"/></para>
-        <para>Download: <ulink url="&procps-url;"/></para>
-        <para>MD5 sum: <literal>&procps-md5;</literal></para>
+        <para>Home page: <ulink url="&procps-ng-home;"/></para>
+        <para>Download: <ulink url="&procps-ng-url;"/></para>
+        <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 8ad0a835e..24d5b3136 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,6 +90,7 @@
       </listitem>
     </varlistentry>
 
+    <!--
     <varlistentry>
       <term>Procps HZ Errors Patch - <token>&procps-hz_fixes-patch-size;</token>:</term>
       <listitem>
@@ -105,6 +106,7 @@
         <para>MD5 sum: <literal>&procps-watch-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+    -->
 
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index a7bf84a7b..21da935db 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -6,63 +6,83 @@
 ]>
 
 <sect1 id="ch-system-procps" role="wrap">
-  <?dbhtml filename="procps.html"?>
+  <?dbhtml filename="procps-ng.html"?>
 
   <sect1info condition="script">
-    <productname>procps</productname>
-    <productnumber>&procps-version;</productnumber>
-    <address>&procps-url;</address>
+    <productname>procps-ng</productname>
+    <productnumber>&procps-ng-version;</productnumber>
+    <address>&procps-ng-url;</address>
   </sect1info>
 
-  <title>Procps-&procps-version;</title>
+  <title>Procps-&procps-ng-version;</title>
 
   <indexterm zone="ch-system-procps">
-    <primary sortas="a-Procps">Procps</primary>
+    <primary sortas="a-Procps">Procps-ng</primary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Procps package contains programs for monitoring processes.</para>
+    <para>The Procps-ng package contains programs for monitoring processes.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&procps-ch6-sbu;</seg>
-        <seg>&procps-ch6-du;</seg>
+        <seg>&procps-ng-ch6-sbu;</seg>
+        <seg>&procps-ng-ch6-du;</seg>
       </seglistitem>
     </segmentedlist>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Procps</title>
+    <title>Installation of Procps-ng</title>
 
-    <para>Apply a patch to prevent an error message from being displayed when
-    determining the kernel clock tick rate:</para>
+    <para>Now prepare procps-ng for compilation:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&procps-hz_fixes-patch;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=                        \
+            --mandir=/usr/share/man          \
+            --docdir=/usr/share/doc/$PROGRAM \
+            --disable-skill                  \
+            --disable-kill</userinput></screen>
 
-    <para>Apply a patch to fix a unicode related issue in the
-    <command>watch</command> program:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen>
-
-    <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@' \
-       -e 's@^#SKIP@SKIP@' Makefile</userinput></screen>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>--disable-skill</parameter></term>
+        <listitem>
+          <para>This switch disables the obsolete and unportable
+          skill and snice commands.</para> 
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>--disable-kill</parameter></term>
+        <listitem>
+          <para>This switch disables building the kill command that
+          was installed in the util-linux package.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+ 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
+    <para>The test suite needs some custom modifications for LFS. 
+    The <command>which</command> is not available and the
+    <command>pmap</command> test does not match a newline character in 
+    two tests. To run the test suite, run the following commands:</para>
+
+<screen><userinput remap="test">pushd testsuite
+  sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
+  sed -i 's|pmap_initname\\\$|pmap_initname|'             pmap.test/pmap.exp
+  make site.exp 
+  DEJAGNU=global-conf.exp runtest
+popd</userinput></screen>
+                            
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
@@ -70,16 +90,16 @@
   </sect2>
 
   <sect2 id="contents-procps" role="content">
-    <title>Contents of Procps</title>
+    <title>Contents of Procps-ng</title>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed library</segtitle>
 
       <seglistitem>
-        <seg>free, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice,
-        sysctl, tload, top, uptime, vmstat, w, and watch</seg>
-        <seg>libproc.so</seg>
+        <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop, 
+        sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
+        <seg>libprocps.so</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -149,16 +169,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="skill">
-        <term><command>skill</command></term>
-        <listitem>
-          <para>Sends signals to processes matching the given criteria</para>
-          <indexterm zone="ch-system-procps skill">
-            <primary sortas="b-skill">skill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="slabtop">
         <term><command>slabtop</command></term>
         <listitem>
@@ -169,17 +179,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="snice">
-        <term><command>snice</command></term>
-        <listitem>
-          <para>Changes the scheduling priority of processes matching the given
-          criteria</para>
-          <indexterm zone="ch-system-procps snice">
-            <primary sortas="b-snice">snice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="sysctl">
         <term><command>sysctl</command></term>
         <listitem>
@@ -257,13 +256,13 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libproc">
+      <varlistentry id="libprocps">
         <term><filename class="libraryfile">libproc</filename></term>
         <listitem>
           <para>Contains the functions used by most programs in this
           package</para>
-          <indexterm zone="ch-system-procps libproc">
-            <primary sortas="c-libproc">libproc</primary>
+          <indexterm zone="ch-system-procps libprocps">
+            <primary sortas="c-libprocps">libprocps</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/general.ent b/general.ent
index 219d37500..ceb6d6c49 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130120">
-<!ENTITY releasedate "January 20, 2013">
+<!ENTITY version "SVN-20130121">
+<!ENTITY releasedate "January 21, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 51b6de8bd..f82f4becf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -437,13 +437,13 @@
 <!ENTITY pkgconfig-ch6-du "30 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
 
-<!ENTITY procps-version "3.2.8">
-<!ENTITY procps-size "279 KB">
-<!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
-<!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0">
-<!ENTITY procps-home "http://procps.sourceforge.net/">
-<!ENTITY procps-ch6-du "2.6 MB">
-<!ENTITY procps-ch6-sbu "0.1 SBU">
+<!ENTITY procps-ng-version "3.3.6">
+<!ENTITY procps-ng-size "528 KB">
+<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
+<!ENTITY procps-ng-md5 "0a050d9be531921db3cd38f1371e73e3">
+<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
+<!ENTITY procps-ng-ch6-du "13 MB">
+<!ENTITY procps-ng-ch6-sbu "0.2 SBU">
 
 <!ENTITY psmisc-version "22.20">
 <!ENTITY psmisc-size "422 KB">