o Upgraded to automake-1.7.1, modutils-2.4.21, man-pages-1.53,

  kbd-1.08, util-linux-2.11w, autoconf-2.54, e2fsprogs-1.29,
  groff-1.18.1, psmisc-21.2, less-378, procps-3.0.4, make-3.80,
  ncurses-5.3.
o Added libtool-1.4.2.patch
o Added findutils-4.1-segfault.patch
o Replaced mkdir ... with cp -HR.


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

14 files changed, 49 insertions, 50 deletions

diff --git a/chapter06/findutils-exp.xml b/chapter06/findutils-exp.xml
index 174cf2db7..9902a8916 100644
--- a/chapter06/findutils-exp.xml
+++ b/chapter06/findutils-exp.xml
@@ -1,9 +1,13 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: This 
-patch is to fix some compilation errors by
-avoiding a variable conflict and changing some bad syntax.</para>
+<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: 
+This patch fixes some compilation errors by avoiding a variable conflict
+and changing some bad syntax.</para>
+
+<para><userinput>patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch</userinput>: 
+This patch fixes a segfault in <userinput>locate</userinput> when encountering
+a very long path name.</para>
 
 </sect2>
 
diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml
index 889d0ef36..6960b15e4 100644
--- a/chapter06/findutils-inst.xml
+++ b/chapter06/findutils-inst.xml
@@ -8,6 +8,7 @@ commands.</para>
 <para>Install Findutils by running the following commands:</para>
 
 <para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
+patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make libexecdir=/usr/bin &amp;&amp;
 make libexecdir=/usr/bin install</userinput></screen></para>
@@ -22,6 +23,7 @@ location. The following commands use the database file
 <filename>/var/lib/misc/locatedb</filename> which is FHS compliant.</para>
 
 <para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
+patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make localstatedir=/var/lib/misc libexecdir=/usr/bin &amp;&amp;
 make localstatedir=/var/lib/misc libexecdir=/usr/bin install</userinput></screen></para>
diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml
index e8d9e7fee..2654d238d 100644
--- a/chapter06/kbd-exp.xml
+++ b/chapter06/kbd-exp.xml
@@ -2,12 +2,8 @@
 <title>Command explanations</title>
 
 <para><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput>:
-This patch fixes two problems. The first one is the <userinput>loadkeys -d</userinput>
-behaviour, which is broken in current kbd versions. It is necessary to fix this,
-because the boot scripts rely on a proper <userinput>loadkeys -d</userinput>.
-The second part of the patch changes a Makefile so some utilities that are
-not installed by default (setlogcons, setvesablank and getunimap) are also
-installed.</para>
+This patch changes a Makefile so some utilities that are not installed by
+default (setlogcons, setvesablank and getunimap) are installed.</para>
 
 </sect2>
 
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index c6daefdae..04539cf33 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -1,14 +1,17 @@
 <sect2>
 <title>Installation of Kbd</title>
 
-<para>This package requires its patch to be applied before you can
-install it. Make sure it's unpacked before running the installation 
-commands.</para>
+<para>Kbd doesn't install some of its utilities (setlogcons, setvesablank
+and getunimap) by default. The kbd patch enables the compilation of these
+utilities.</para>
+
+<para>Apply the patch by running the following command:</para>
+
+<para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
 
 <para>Install Kbd by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch &amp;&amp;
-./configure &amp;&amp;
+<para><screen><userinput>./configure &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/kernel-exp.xml b/chapter06/kernel-exp.xml
index 21bfabd20..2956f0bd7 100644
--- a/chapter06/kernel-exp.xml
+++ b/chapter06/kernel-exp.xml
@@ -16,8 +16,7 @@ shouldn't rely on the source tree being clean after untarring.</para>
 <filename>include/linux/version.h</filename> file and the platform-specific
 <filename class="symlink">include/asm</filename> symlink.</para>
 
-<para><userinput>mkdir /usr/include/asm</userinput>
-, <userinput>cp include/asm/* /usr/include/asm</userinput> and
+<para><userinput>cp -HR include/asm /usr/include</userinput> and
 <userinput>cp -R include/asm-generic /usr/include</userinput>:
 These commands copy the platform-specific assembler kernel header files to
 <filename class="directory">/usr/include/asm</filename> and <filename
diff --git a/chapter06/kernel-inst.xml b/chapter06/kernel-inst.xml
index 9f5ba999f..bcb710bfe 100644
--- a/chapter06/kernel-inst.xml
+++ b/chapter06/kernel-inst.xml
@@ -12,8 +12,7 @@ and copy the header files to where they will be found by these packages.</para>
 make mrproper &amp;&amp;
 make include/linux/version.h &amp;&amp;
 make symlinks &amp;&amp;
-mkdir /usr/include/asm &amp;&amp;
-cp include/asm/* /usr/include/asm &amp;&amp;
+cp -HR include/asm /usr/include &amp;&amp;
 cp -R include/asm-generic /usr/include &amp;&amp;
 cp -R include/linux /usr/include &amp;&amp;
 touch /usr/include/linux/autoconf.h &amp;&amp;
diff --git a/chapter06/libtool-exp.xml b/chapter06/libtool-exp.xml
new file mode 100644
index 000000000..cdfd192b1
--- /dev/null
+++ b/chapter06/libtool-exp.xml
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../libtool-&libtool-patch-version;.patch</userinput>: 
+This patch fixes an incompatibility between Autoconf 2.53 and Libtool 1.4.x.
+Specifically, the deprecated m4 macro AC_PROVIDE_AC_LIBTOOL is replaced by
+AC_PROVIDE_ELSEIF.</para>
+
+</sect2>
+
diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml
index 8e5774a28..eb1dae1cd 100644
--- a/chapter06/libtool-inst.xml
+++ b/chapter06/libtool-inst.xml
@@ -3,7 +3,8 @@
 
 <para>Install Libtool by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../libtool-&libtool-patch-version;.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 92dcd7f0e..045bc381c 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -6,6 +6,7 @@
 Estimated required disk space:  &libtool-compsize;</screen>
 
 &c6-libtool-inst;
+&c6-libtool-exp;
 &aa-libtool-desc;
 &aa-libtool-dep;
 
diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml
index 9342a4e78..8885c403f 100644
--- a/chapter06/ncurses-exp.xml
+++ b/chapter06/ncurses-exp.xml
@@ -1,11 +1,6 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-patch:</userinput>
-This patch fixes a compile problem with GCC-3.2 because Ncurses uses
-constructions that are not valid in ANSI C++ and don't compile with
-recent GCC versions that conform to the standard.</para>
-
 <para><userinput>--with-shared:</userinput> This enables the build of the
 shared ncurses library files.</para>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index d4a17128c..d6be4e396 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -1,19 +1,14 @@
 <sect2>
 <title>Installation of Ncurses</title>
 
-<para>This package requires its patch to be applied before you can
-install it. Make sure it's unpacked before running the installation 
-commands.</para>
-
 <para>Install Ncurses by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-patch-version;.patch &amp;&amp;
-./configure --prefix=/usr --with-shared &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --with-shared &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-chmod 755 /usr/lib/*.5.2 &amp;&amp;
+chmod 755 /usr/lib/*.&ncurses-version; &amp;&amp;
 mv /usr/lib/libncurses.so.5* /lib &amp;&amp;
-ln -s libncurses.a /usr/lib/libcurses.a &amp;&amp;
+ln -sf libncurses.a /usr/lib/libcurses.a &amp;&amp;
 ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
 ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so</userinput></screen></para>
 </sect2>
diff --git a/chapter06/procps-exp.xml b/chapter06/procps-exp.xml
index 539ceccd2..ac5ab7d96 100644
--- a/chapter06/procps-exp.xml
+++ b/chapter06/procps-exp.xml
@@ -1,7 +1,9 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch:</userinput> This patch fixes a locale problem that makes top crash under certain locale settings.</para>
+<para><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch:</userinput>
+This patch fixes a locale problem that makes top crash under certain
+locale settings.</para>
 
 <para><userinput>make XSCPT="" install:</userinput> 
 This will set the Makefile variable XSCPT to an empty value so that
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index 130037b7f..b3b749f97 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -9,8 +9,7 @@ commands.</para>
 
 <para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch &amp;&amp;
 make &amp;&amp;
-make XSCPT="" install &amp;&amp;
-mv /usr/bin/kill /bin</userinput></screen></para>
+make XSCPT="" install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml
index 8f38b0014..ee406e301 100644
--- a/chapter06/psmisc-inst.xml
+++ b/chapter06/psmisc-inst.xml
@@ -7,21 +7,14 @@
 make &amp;&amp;
 make install</userinput></screen></para>
 
-<para>Psmisc installs the
-<filename>/usr/share/man/man1/pidof.1</filename> man page, but Psmisc's
-pidof program isn't installed by default. Generally, this isn't a problem
-because we later install the Sysvinit package, which provides
-a better pidof program.</para>
-
-<para>It's up to you now to decide if you are going to use the Sysvinit 
-package, which provides a pidof program, or not. If you are going to, you 
-should remove Psmisc's pidof man page by running:</para>
-
-<para><screen><userinput>rm /usr/share/man/man1/pidof.1</userinput></screen></para>
-
-<para>If you're not going to use Sysvinit, you should complete this
-package's installation by creating the <filename>/bin/pidof</filename>
-symlink by running:</para>
+<para>Psmisc's pidof program isn't installed by default. Generally, this
+isn't a problem because we later install the Sysvinit package, which
+provides a better pidof program.</para>
+
+<para>It's up to you to decide if you are going to use the Sysvinit 
+package, which provides a pidof program, or not. If you're not going to
+use Sysvinit, you should complete this package's installation by creating
+the <filename>/bin/pidof</filename> symlink by running:</para>
 
 <para><screen><userinput>ln -s killall /bin/pidof</userinput></screen></para>