split up the glibc and man 'mega' patches

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

3 files changed, 22 insertions, 15 deletions

diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index b89ecb312..384b86577 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -35,7 +35,11 @@ username to userid resolving isn't working yet, so a
 if you use the numeric IDs (such as <userinput>chown 0
 file</userinput>).</para></listitem>
 
-<listitem><para>It fixes a problem that causes statically linked binaries
+</itemizedlist>
+
+<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-rootperl-patch-version;-root-perl.patch</userinput></screen></para>
+
+<para>There is a potential problem that causes statically linked binaries
 to crash that were linked against Glibc-2.2 libraries. Even though static
 binaries have all the necessary parts of Glibc built-in, they still rely
 on one external library: Glibc's NSS libraries. These libraries, among
@@ -50,12 +54,13 @@ will load these new NSS libraries and start to abort with
 <emphasis>segmentation faults</emphasis>. This patch undoes a few of the
 changes to overcome the problem.</para>
 
-<para>We will install Glibc again at the end of this chapter to remove this
-patch so you'll have a pristine Glibc as the developers intended
-it.</para></listitem>
-</itemizedlist>
+<para>So, if you started chapter 5 with a host system that uses Glibc-2.2.x
+you must apply the following patch. We will install Glibc again at the end
+of this chapter to remove this patch so you'll have a pristine Glibc as the
+developers intended
+it.</para>
 
-<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-libnss-patch-version;-libnss.patch</userinput></screen></para>
 
 <para>Glibc will check for the <filename>/etc/ld.so.conf</filename> file
 and abort with an error if the file is missing, so we must create it.</para>
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
index b858cb824..8d4f97011 100644
--- a/chapter06/man-exp.xml
+++ b/chapter06/man-exp.xml
@@ -8,14 +8,14 @@ where a program is found. By appending /usr/bin:/bin to PATH for the
 ./configure command, we make sure that man doesn't use the /static versions
 of our programs.</para>
 
-<para><userinput>patch -Np1 -i ../man-&man-patch-version;.patch:</userinput>
-This patch comments out one of the files in the <filename>man.conf</filename>
-file (MANPATH /usr/man) because it will create redundant results when using
-programs like <userinput>whatis</userinput>. It also adds the
-<emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> variable so
-man pages are displayed properly. Lastly, the patch fixes the problem where
-man pages are not formatted with more than 80 columns when used with the
-recent groff versions.</para>
+<para><userinput>patch...:</userinput>
+These three patches comment out one of the lines in the
+<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
+redundant results when using programs like <userinput>whatis</userinput>.
+It also adds the <emphasis>-R</emphasis> option to the
+<emphasis>PAGER</emphasis> variable so man pages are displayed properly.
+Lastly, the patch fixes the problem where man pages are not formatted with
+more than 80 columns when used with the recent groff versions.</para>
 
 </sect2>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index ad73cabdb..f07ee1615 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -3,7 +3,9 @@
 
 <para>Run the following commands to install man:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-patch-version;.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch &amp;&amp;
+patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch &amp;&amp;
+patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch &amp;&amp;
 PATH=$PATH:/usr/bin:/bin \
 &nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
 make &amp;&amp;