Updates to findutils, util-linux, and iproute2. More library changes

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

4 files changed, 21 insertions, 4 deletions

diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index f3ddc2699..0401b4701 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -42,6 +42,12 @@
 
     <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen>
 
+    <para>The patch below fixes the issue with the newer versions of findutils,
+    the issue will give an error message it options are not in the proper order.
+    This patch corrects this issue for IPRoute2.</para>
+
+    <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-find_update-1.patch</userinput></screen>
+
     <para>Prepare iproute2 for compilation:</para>
     <screen> <userinput>./configure </userinput></screen>
 
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 482c356a3..e437e3adc 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -53,6 +53,11 @@ sometimes will only show 33 characters on a line and then wrap to the next line.
 
 <screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
+<para>Now we will remove the old, .so files in /lib and relink them into /usr/lib.</para>
+
+<screen><userinput>rm /lib/lib{readline,history}.so
+ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
+ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
 </sect2>
 
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index a753e7ce3..c469fb3e8 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -31,7 +31,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
 
 <para>Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/usr/lib --enable-shared</userinput></screen>
+<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -64,14 +64,15 @@ sed -i -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
 
 <screen><userinput>mv /usr/bin/passwd /bin</userinput></screen>
 
-<para>And move Shadow's dynamic libraries to a more appropriate location:</para>
+<para>And move Shadow's static library to a more appropriate location:</para>
 
-<screen><userinput>mv /usr/lib/libshadow.so.0* /lib</userinput></screen>
+<screen><userinput>mv /lib/libshadow.*a /usr/lib</userinput></screen>
 
 <para>As some packages expect to find the just-moved libraries in
 <filename class="directory">/usr/lib</filename>, create the following symlinks:</para>
 
-<screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
+<screen><userinput>rm /usr/lib/libshadow.so
+ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
 <para>The <parameter>-D</parameter> option of the <command>useradd</command> program requires this
 directory for it to work properly:</para>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index f32d235e8..f907e1455 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -49,6 +49,11 @@ afterwards.</para></note>
 
 <screen><userinput>make install</userinput></screen>
 
+<para>Now we will remove the old, .so files in /lib and relink them into /usr/lib.</para>
+
+<screen><userinput>rm /lib/libz.so
+ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
+
 <para>Now also build the non-shared (static) library:</para>
 
 <screen><userinput>make clean