Merging caption and installation sections for all packages in chapters 5 and 6.

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

1 files changed, 65 insertions, 1 deletions

diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 0a204357d..fba00043f 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -7,7 +7,71 @@ Estimated required disk space:  &zlib-compsize;</screen>
 
 &aa-zlib-shortdesc;
 &aa-zlib-dep;
-&c6-zlib-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Zlib</title>
+
+<para>Zlib has a potential buffer overflow in its
+<emphasis>gzprintf()</emphasis> function, that, though difficult to take
+advantage of, should be taken care of by applying this patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen>
+
+<para>Now prepare Zlib for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
+
+<para>Note: Zlib is known to build its shared library incorrectly if a CFLAGS
+is specified in the environment. If you are using your own CFLAGS variables,
+ensure you add the <emphasis role="strong">-fPIC</emphasis> directive during
+this stage, and remove it afterwards.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the shared libraries:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now also build the non-shared libraries:</para>
+<screen><userinput>make clean
+./configure --prefix=/usr
+make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly.  Should you choose to run it, the 
+following command will do so:</para>
+
+<screen><userinput>make test</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>The shared Zlib library should be installed in the
+<filename>/lib</filename> directory. That way, in the event
+that you must boot without the <filename>/usr</filename>
+directory, vital system programs will still have access to
+the library:</para>
+
+<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
+
+<para>The <filename>/usr/lib/libz.so</filename> symlink is
+linked to a file which no longer exists, because we moved
+it. Create a symbolic link to the new location of the
+library:</para>
+
+<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
+
+<para>Zlib does not install its manual page. Issue the
+following command to install this documentation:</para>
+
+<screen><userinput>cp zlib.3 /usr/share/man/man3</userinput></screen>
+
+</sect2>
 
 </sect1>