Patches reogranization Section V

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1305 af4574ff-66df-0310-9fd7-8a98e5e911e0

basicnet/djb/daemontools/daemontools-inst.xml

@@ -5,7 +5,7 @@
 commands:</para>
 
 <screen><userinput><command>cd admin/daemontools-0.76 &amp;&amp; 
-patch -Np1 -i ../../daemontools-0.76.errno.patch &amp;&amp;
+patch -Np1 -i ../../daemontools-0.76-errno.patch &amp;&amp;
 package/compile &amp;&amp;
 cd package &amp;&amp; 
 sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~ &amp;&amp; 

basicnet/djb/daemontools/daemontools-intro.xml

@@ -22,9 +22,8 @@ url="&daemontools-download-ftp;"/></para></listitem>
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch:
-<ulink
+<ulink url="&patch-root;/daemontools-0.76-errno.patch"/></para></listitem>
-url="ftp://moni.csi.hu/pub/glibc-2.3.1/daemontools-0.76.errno.patch">daemontools
+</itemizedlist>
-errno patch</ulink></para></listitem></itemizedlist>
 </sect3>
 
 

basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml

@@ -4,7 +4,7 @@
 <para>Install <application>ucspi-tcp</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88.errno.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88-errno.patch &amp;&amp;
 sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;
 mv conf-home~ conf-home &amp;&amp;
 sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;

basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml

@@ -25,10 +25,8 @@ url="&ucspi-tcp-download-ftp;"/></para></listitem>
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink
+<listitem><para>Required patch: <ulink url="&patch-root;/ucspi-tcp-0.88-errno.patch"/></para></listitem>
-url="ftp://moni.csi.hu/pub/glibc-2.3.1/ucspi-tcp-0.88.errno.patch">ucspi-tcp
+</itemizedlist>
-errno patch</ulink>
-</para></listitem></itemizedlist>
 </sect3>
 
 </sect2>

basicnet/mailnews/pine/pine-inst.xml

@@ -1,9 +1,6 @@
 <sect2>
 <title>Installation of <application>Pine</application></title>
 
-<para>Download the <application>Pine</application>
-<acronym>FHS</acronym> patch from <ulink url="&hfile-root;"/>.</para>
-
 <para>Install <application>Pine</application> by running the following commands: </para>
 
 <screen><userinput><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch &amp;&amp;

basicnet/mailnews/pine/pine-intro.xml

@@ -26,4 +26,11 @@ url="&pine-download-ftp;"/></para></listitem>
 <para><xref linkend="openldap"/> and Keberos5</para></sect4>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/pine-4.56-fhs.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 </sect2>

basicnet/mailnews/pine/pine.ent

@@ -7,7 +7,6 @@
 <!ENTITY pine-buildsize "54 MB">
 <!ENTITY pine-version "4.56">
 <!ENTITY pine-download-http "http://mirror.sit.wisc.edu/pub/net/mail/pine/pine&pine-version;.tar.bz2">
-<!ENTITY blfs-patch-dir "&hfile-root;">
 <!ENTITY pine-download-ftp "ftp://ftp.cac.washington.edu/pine/pine&pine-version;.tar.bz2">
 <!ENTITY pine-size "2.8 MB">
 <!ENTITY pine-time "">

basicnet/netlibs/wvstreams/wvstreams-intro.xml

@@ -16,9 +16,9 @@ network programming libraries. These are needed to compile wvdial.</para>
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink
-url="&hfile-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
+url="&patch-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
 <listitem><para>Required Patch: <ulink
-url="&hfile-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/></para></listitem>
+url="&patch-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/></para></listitem>
 </itemizedlist></sect3>
 
 <sect3><title><application>WvStreams</application> dependencies</title>

basicnet/netprogs/cvs/cvs-inst.xml

@@ -1,6 +1,7 @@
 <sect2>
 <title>Installation of <application><acronym>CVS</acronym></application></title>
 
+<!--
 <para>The <filename>cvs-&cvs-version;-zlib.patch</filename> patch is
 used to compile <application><acronym>CVS</acronym></application>
 dynamically against <application>zlib</application> instead of using the version
@@ -14,6 +15,7 @@ will be fixed.</para>
 <para>If you are going to use the patch mentioned above, first apply it:</para>
 
 <screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib.patch</command></userinput></screen>
+-->
 
 <para>Install <application><acronym>cvs</acronym></application> by running the following commands:</para>
 

basicnet/netprogs/cvs/cvs-intro.xml

@@ -14,8 +14,10 @@ working or where archives of previous versions of files need to be kept.</para>
 <listitem><para>Estimated build time: &cvs-time;</para></listitem></itemizedlist>
 </sect3>
 
+<!--
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Optional Patch: <ulink url="&hfile-root;/cvs-&cvs-version;-zlib.patch"/></para></listitem></itemizedlist></sect3>
+-->
 
 </sect2>

basicnet/netprogs/inetutils/inetutils-exp.xml

@@ -10,6 +10,11 @@ installed in the <acronym>LFS</acronym> Book.</para>
 this option if you didn't install <application>tcp-wrappers</application>.
 </para>
 
+<para><option>--disable-whois</option>: This switch will prevent
+<application>Inetutils</application> installing a WhoIs client, since the
+included whois client is out of date. Add this option if you plan on installing
+<xref linkend="whois"/>.</para>
+
 <para><option>--with-pam</option>: This switch makes <application>Inetutils
 </application> compile against for <application>Linux-<acronym>PAM</acronym>
 </application>. Add this option if you want to utilize <acronym>PAM</acronym>.

basicnet/netprogs/inetutils/inetutils-inst.xml

@@ -6,9 +6,11 @@ commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --disable-syslogd \
 	--libexecdir=/usr/sbin --infodir=/usr/share/info \
+    --sysconfdir=/etc --localstatedir=/var \
 	--mandir=/usr/share/man --with-wrap &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install &amp;&amp;
+mv /usr/bin/ping /bin</command></userinput></screen>
 
 </sect2>
 

basicnet/netprogs/inetutils/inetutils-intro.xml

@@ -2,7 +2,9 @@
 <title>Introduction to <application>Inetutils</application></title>
 
 <para>The <application>Inetutils</application> package contains network clients 
-and servers.</para>
+and servers. <application>Inetutils</application> installation in LFS lacks
+installation of the various servers that are included in the package. The instructions
+in <acronym>BLFS</acronym> removes this deficiency.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -15,7 +17,7 @@ and servers.</para>
 
 <sect3><title><application>Inetutils</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/></para></sect4>
+<para><xref linkend="Linux_PAM"/>, and <xref linkend="tcpwrappers"/></para></sect4>
 </sect3>
 
 

basicnet/netutils/bind-utils/bind-utils-intro.xml

@@ -3,7 +3,7 @@
 
 <para><application><acronym>BIND</acronym> Utilities</application> is not a 
 separate package, it is a collection of the client side programs that are 
-included with <application><acronym>BIND</acronym></application>. The 
+included with <application><xref linkend="bind"/></application>. The 
 <application><acronym>BIND</acronym></application> package includes client 
 side programs such as <command>nslookup</command>, <command>dig</command> and 
 <command>host</command>. If you install <application><acronym>BIND</acronym>

basicnet/netutils/nmap/nmap-intro.xml

@@ -15,4 +15,9 @@ fingerprinting.</para>
 <listitem><para>Estimated build time: &nmap-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title><application>Nmap</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="GTK"/> (for building the front-end)</para></sect4>
+</sect3>
+
 </sect2>

general/sysutils/gpm/gpm-inst.xml

@@ -1,30 +1,27 @@
 <sect2>
 <title>Installation of <application><acronym>GPM</acronym></application></title>
 
-<para>Download the patches for <application><acronym>GPM</acronym></application> from <ulink url="&patch-root;"/>.</para>
-
 <para>Install <application><acronym>GPM</acronym></application> by running the following commands:
 </para>
-<!--
+
-<note><para>The <envar>LDFLAGS</envar> environment variable must be set before
-    configuring <application>gpm</application>.</para></note> -->
-    
 <screen><userinput><command>patch -Np1 -i ../gpm-1.20.1-segfault.patch &amp;&amp;
 patch -Np1 -i ../gpm-1.20.1-silent.patch &amp;&amp;
 LDFLAGS="-lm" ./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install &amp;&amp;
+ldconfig -n -l /usr/lib/libgpm.so.1.19.0</command></userinput></screen>
 </sect2>
 
-
 <sect2>
 <title>Command explanations</title>
 
 <para><command>export LDFLAGS="-lm"</command>: The math library
  must be linked with <command>gpm</command>, as ceil() is used in some cursor 
 scrolling logic. <envar>LDFLAGS</envar> is only needed if you optimize
-<command>gpm</command> for size.
+<command>gpm</command> for size.</para>
-</para>
+
+<para><command>ldconfig -n -l </command>: During installation, gpm outputs a
+message to run the above command to create the proper library links.</para>
 
 </sect2>
 

general/sysutils/gpm/gpm-intro.xml

@@ -19,5 +19,13 @@ url="&gpm-download-ftp;"/></para></listitem>
 &gpm-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/gpm-1.20.1-segfault.patch"/></para></listitem>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/gpm-1.20.1-silent.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
 
 </sect2>

introduction/important/important.xml

@@ -4,6 +4,7 @@
 
 &intro-important-unpacking;
 &intro-important-position;
+&intro-important-patches;
 &intro-important-bootscripts;
 &intro-important-beyond;
 

introduction/important/patches.xml

@@ -0,0 +1,21 @@
+<sect1 id="intro-important-patches">
+<?dbhtml filename="patches.html" dir="introduction"?>
+<title>Optional Patches</title>
+
+<para>As you follow the various sections in the book, you will observe that
+the book includes various patches that are required for a successful and
+secure installation of the packages. The general policy of the book is to
+include patches that fall in one of the following criteria:</para>
+
+<itemizedlist>
+<listitem><para>Fixes a compilation problem.</para></listitem>
+<listitem><para>Fixes a security problem.</para></listitem>
+<listitem><para>Fixes a broken functionality.</para></listitem>
+</itemizedlist>
+
+<para>In short, the book only includes patches that are either Required or
+Recommended. There is a <ulink url="http://www.linuxfromscratch.org/patches">Patches subproject</ulink>
+which hosts various patches (includng the patches included in the books)
+to enable you to configure your <acronym>LFS</acronym> the way you like it:)</para>
+
+</sect1>

introduction/introduction.ent

@@ -16,4 +16,5 @@
 <!ENTITY intro-important-unpacking SYSTEM "important/unpacking.xml">
 <!ENTITY intro-important-position SYSTEM "important/position.xml">
 <!ENTITY intro-important-bootscripts SYSTEM "important/bootscripts.xml">
+<!ENTITY intro-important-patches SYSTEM "important/patches.xml">
 <!ENTITY intro-important-beyond SYSTEM "important/beyond.xml">

xsoft/suites/openoffice/openoffice-inst.xml

@@ -39,15 +39,15 @@ bash -c "source LinuxIntelEnv.Set.sh; dmake"</command></userinput></screen>
 to unzip them to the appropriate directory as mentioned below and then recreate
 the installation set.</para>
 
-<screen><userinput><command>cd solver/641/unxlngi4.pro/pck &amp;&amp;
+<screen><userinput><command>cd solver/645/unxlngi4.pro/pck &amp;&amp;
 for i in $(ls ../../../../../helpcontent_*_unix.tgz)
 do
 tar -xvzf $i
 done &amp;&amp;
 cd ../../../../instsetoo &amp;&amp;
 rm -rf unxlngi4.pro &amp;&amp;
-dmake &amp;&amp;
+cd .. &amp;&amp;
-cd ..</command></userinput></screen>
+bash -c "source LinuxIntelEnv.Set.sh ; dmake"</command></userinput></screen>
 
 <para>Install <application>OpenOffice</application> using the following 
 commands. The following commands install the English language set. To install a localized version, replace the