Index: index.xml
===================================================================
--- index.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ index.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -3,7 +3,7 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040502">
-<!ENTITY releasedate "May 2nd, 2004">
-<!ENTITY pubdate "2004-05-02">
+<!ENTITY version "CVS-20040503">
+<!ENTITY releasedate "May 3rd, 2004">
+<!ENTITY pubdate "2004-05-03">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ introduction/welcome/changelog.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>May 3rd, 2004 [igor]: Applied DJ's patch which fixes
+cracklib instructions and added cracklib to Heimdal.</para></listitem>
 
 <listitem><para>May 2nd, 2004 [igor]: Updated to GLib-2.4.1 and
Index: postlfs/security/cracklib/cracklib-inst.xml
===================================================================
--- postlfs/security/cracklib/cracklib-inst.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/cracklib/cracklib-inst.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -4,20 +4,29 @@
 <para>First, we need to install the chosen word list for cracklib:</para>
 
-<screen><userinput><command>mkdir -p /usr/share/dict/ &amp;&amp;
-chmod 0644 /usr/share/dict &amp;&amp;
-cp <replaceable>[wordlist]</replaceable> /usr/share/dict &amp;&amp;
-chmod 0644 /usr/share/dict/<replaceable>[wordlist]</replaceable> &amp;&amp;
-ln -sf <replaceable>[wordlist]</replaceable> /usr/share/dict/words</command></userinput></screen>
+<screen><userinput><command>install -d -m755 /usr/share/dict &amp;&amp;
+install -m644 <replaceable>[wordlist]</replaceable> /usr/share/dict &amp;&amp;
+ln -sf <replaceable>[wordlist]</replaceable> /usr/share/dict/words &amp;&amp;
+echo $(hostname) >> /usr/share/dict/extra.words</command></userinput></screen>
 
-<para>Our word list is linked to
+<para>Our wordlist is linked to
 <filename>/usr/share/dict/words</filename> as historically,
-<filename>words</filename> is the only file in the
-<filename class="directory">/usr/share/dict</filename> directory.  You are 
-welcome to shun history and adjust for your own needs.</para>
+<filename>words</filename> is the primary wordlist in the
+<filename class="directory">/usr/share/dict</filename> directory.  We
+also echo the value of hostname to a file called extra.words.  This
+extra file is intened to be a site specific list which includes easy to 
+guess passwords such as company or department name, user's names, 
+product names, computer name, domain name, etc.</para>
 
-<para>Now install cracklib using the following commands:</para>
+<para>Now apply BLFS patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../cracklib-&cracklib-version;-blfs-3.patch &amp;&amp;
-make install</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../cracklib-&cracklib-version;-blfs-1.patch</command></userinput></screen>
+
+<para>If necessary, apply the heimdal patch:</para>
+
+<screen><userinput><command>cp -R cracklib cracklib_krb5 &amp;&amp;
+patch -Np1 -i ../cracklib-&cracklib-version;-heimdal-1.patch</command></userinput></screen>
+
+<para>Finally install the package:</para>
+<screen><userinput><command>make install</command></userinput></screen>
 
 </sect2>
Index: postlfs/security/cracklib/cracklib-intro.xml
===================================================================
--- postlfs/security/cracklib/cracklib-intro.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/cracklib/cracklib-intro.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -20,7 +20,10 @@
 
 <sect3><title>Additional downloads</title>
-
-<para>Cracklib BLFS patch:
-<ulink url="&patch-root;/cracklib-&cracklib-version;-blfs-3.patch"/></para>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/cracklib-&cracklib-version;-blfs-1.patch"/></para></listitem>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/cracklib-&cracklib-version;-heimdal-1.patch"/></para></listitem>
+</itemizedlist>
 
 <para>You will also need to download a wordlist for use with cracklib.  
Index: postlfs/security/heimdal/heimdal-inst.xml
===================================================================
--- postlfs/security/heimdal/heimdal-inst.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/heimdal/heimdal-inst.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -12,4 +12,11 @@
 
 <screen><userinput><command>mv /usr/bin/ftp /usr/bin/ftpn</command></userinput></screen>
+
+<para>
+If you wish the Heimdal package to link against the cracklib library,
+you must apply a patch:
+</para>
+
+<screen><userinput><command>patch -Np1 -i ../heimdal-&heimdal-version;-cracklib-1.patch</command></userinput></screen>
 
 <para>Install <application>Heimdal</application> by running the following commands:</para>
Index: postlfs/security/heimdal/heimdal-intro.xml
===================================================================
--- postlfs/security/heimdal/heimdal-intro.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/heimdal/heimdal-intro.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -29,4 +29,7 @@
 url="&patch-root;/heimdal-&heimdal-version;-fhs-compliance-1.patch"/></para>
 </listitem>
+<listitem><para>Required patch for cracklib: <ulink
+url="&patch-root;/heimdal-&heimdal-version;-cracklib-1.patch"/></para>
+</listitem>
 </itemizedlist>
 
@@ -45,5 +48,6 @@
 <xref linkend="xorg"/> or
 <xref linkend="xfree86"/>,
-<xref linkend="openldap"/> and
+<xref linkend="openldap"/>,
+<xref linkend="cracklib"/> and
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>
 </para>
Index: postlfs/security/pam/linux_pam-exp.xml
===================================================================
--- postlfs/security/pam/linux_pam-exp.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/pam/linux_pam-exp.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -1,4 +1,8 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><command>autoconf</command>:  This is necessary as in the patch, we
+change where <acronym>PAM</acronym> looks for the cracklib libs.  This 
+requires that the configure script be recreated.</para>
 
 <para><option>--enable-static-libpam</option>: This switch builds
Index: postlfs/security/pam/linux_pam-inst.xml
===================================================================
--- postlfs/security/pam/linux_pam-inst.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/pam/linux_pam-inst.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -6,5 +6,6 @@
 running the following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../Linux-PAM-0.77-linkage-1.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../Linux-PAM-0.77-linkage-3.patch &amp;&amp;
+autoconf &amp;&amp;
 ./configure --enable-static-libpam --with-mailspool=/var/mail \
     --enable-read-both-confs --sysconfdir=/etc &amp;&amp;
Index: postlfs/security/pam/linux_pam-intro.xml
===================================================================
--- postlfs/security/pam/linux_pam-intro.xml	(revision 22c4e1ee4067f90a866122668fb1af415fdde0b6)
+++ postlfs/security/pam/linux_pam-intro.xml	(revision 7e7bceecf9d16f08df3de87ea52504927b5d2c98)
@@ -23,5 +23,5 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch:
-<ulink url="&patch-root;/Linux-PAM-0.77-linkage-1.patch"/></para></listitem></itemizedlist>
+<ulink url="&patch-root;/Linux-PAM-0.77-linkage-3.patch"/></para></listitem></itemizedlist>
 </sect3>
 
