Modified the Heimdal instructions which move the libraries into /lib to use the 'readlink' command to create the symlinks so that the instructions are not version specific

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

general.ent

@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -33,10 +33,7 @@ $Date$
 <!ENTITY publisher            "Unknown">
 
 <!-- These entities are used to identify versions of LFS
-     packages referenced throughout the BLFS book. If the
+     packages referenced throughout the BLFS book. -->
-     BDB package updates cause the library names to change,
-     ensure you update the Heimdal package to the current
-     BDB library names. -->
 <!ENTITY lfs-autoconf-version         "2.61">
 <!ENTITY lfs-bdb-version              "4.5.20">
 <!ENTITY lfs-coreutils-version        "6.9">
@@ -58,11 +55,7 @@ $Date$
 
 <!-- Chapter 4 -->
 
-<!-- Ensure you check the library version number and update the
-     Heimdal instructions (postlfs/security/heimdal.xml) if necessary -->
 <!ENTITY openssl-version              "0.9.8e">
-<!-- End special note about Heimdal -->
-
 <!ENTITY gnutls-version               "1.6.3">
 <!ENTITY cracklib-version             "2.8.10">
 <!ENTITY linux-pam-version            "0.99.7.1">
@@ -393,11 +386,7 @@ $Date$
 
 <!-- Chapter 23 -->
 
-<!-- Ensure you check the library version number and update the
-     Heimdal instructions (postlfs/security/heimdal.xml) if necessary -->
 <!ENTITY db-version                   "4.5.20">
-<!-- End special note about Heimdal -->
-
 <!ENTITY mysql-version                "5.0.41">
 <!ENTITY postgresql-version           "8.2.4">
 

introduction/welcome/changelog.xml

@@ -41,6 +41,17 @@
 
 -->
 
+    <listitem>
+      <para>September 6, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Modified the Heimdal instructions which move the
+          libraries into /lib to use the 'readlink' command to create the
+          symlinks so that the instructions are not version specific.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 5, 2007</para>
       <itemizedlist>

postlfs/security/heimdal.xml

@@ -131,8 +131,7 @@
     <warning>
       <para>Ensure you really need a Kerberos installation before you decide
       to install this package. Failure to install and configure the package
-      in accordance with the instructions below can alter your system so that
+      correctly can alter your system so that users cannot log in.</para>
-      users cannot log in.</para>
     </warning>
 
     <para>If you wish the <application>Heimdal</application> package to
@@ -178,6 +177,9 @@ mv -v /usr/include/glob.h /usr/include/glob.h.glibc &amp;&amp;
 mv -v /usr/include/ss/ss.h   /usr/include/ss/ss.h.e2fsprogs &amp;&amp;
 mv -v /usr/lib/libss.a       /usr/lib/libss.a.e2fsprogs &amp;&amp;
 mv -v /usr/lib/libss.so      /usr/lib/libss.so.e2fsprogs &amp;&amp;
+if [ -f /usr/lib/libss.la ]; then 
+    mv -v /usr/lib/libss.la  /usr/lib/libss.la.e2fsprogs
+done &amp;&amp;
 
 make install &amp;&amp;
 
@@ -191,8 +193,12 @@ mv -v /usr/include/ss/ss.h.e2fsprogs /usr/include/ss/ss.h &amp;&amp;
 mv -v /usr/lib/libss.a                /usr/lib/libss.a.heimdal &amp;&amp;
 mv -v /usr/lib/libss.a.e2fsprogs      /usr/lib/libss.a &amp;&amp;
 mv -v /usr/lib/libss.so               /usr/lib/libss.so.heimdal &amp;&amp;
-mv -v /usr/lib/libss.la /usr/lib/libss.la.heimdal &amp;&amp;
 mv -v /usr/lib/libss.so.e2fsprogs     /usr/lib/libss.so &amp;&amp;
+mv -v /usr/lib/libss.la               /usr/lib/libss.la.heimdal &amp;&amp;
+if [ -e   /usr/lib/libss.la.e2fsprogs ]; then 
+    mv -v /usr/lib/libss.la.e2fsprogs /usr/lib/libss.la
+fi &amp;&amp;
+
 if [ -e /usr/lib/libss.so.2 ]; then rm -v /usr/lib/libss.so.2; fi &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/standardisation &amp;&amp;
@@ -205,17 +211,18 @@ mv -v /bin/login /bin/login.shadow &amp;&amp;
 mv -v /bin/su             /bin/su.shadow &amp;&amp;
 mv -v /usr/bin/{login,su} /bin &amp;&amp;
 ln -v -sf ../../bin/login /usr/bin &amp;&amp;
-mv -v /usr/lib/lib{otp,kafs,krb5,asn1,roken,crypto}.so.* \
-      /usr/lib/libdb-4.5.so /lib &amp;&amp;
-ln -v -sf ../../lib/libdb-4.5.so /usr/lib/libdb.so &amp;&amp;
-ln -v -sf ../../lib/libdb-4.5.so /usr/lib/libdb-4.so &amp;&amp;
 
-for SYMLINK in otp.so.0.1.3  kafs.so.0.4.1   krb5.so.17.4.0 \
+for LINK in   lib{otp,kafs,krb5,asn1,roken,crypto}; do \
-               asn1.so.6.1.0 roken.so.16.1.0 crypto.so.0.9.8
+    mv -v     /usr/lib/${LINK}.so.* /lib &amp;&amp;
-do
+    ln -v -sf ../../lib/$(readlink  /usr/lib/${LINK}.so) \
-    ln -v -sf ../../lib/lib$SYMLINK \
+              /usr/lib/${LINK}.so
-        /usr/lib/lib`echo $SYMLINK | cut -d. -f1`.so
+done &amp;&amp;
-done
+
+mv -v     /usr/lib/$(readlink /usr/lib/libdb.so) \
+          /usr/lib/libdb-?.so \
+          /lib &amp;&amp;
+ln -v -sf ../../lib/$(readlink /usr/lib/libdb.so) \
+          /usr/lib/libdb.so &amp;&amp;
 
 ldconfig</userinput></screen>
 
@@ -223,7 +230,8 @@ ldconfig</userinput></screen>
     using the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/html &amp;&amp;
+<screen role="root"><userinput>
+install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/html &amp;&amp;
 install -v -m644    doc/html/* \
                     /usr/share/doc/heimdal-&heimdal-version;/html &amp;&amp;
 install -v -m644    doc/heimdal.{dvi,ps,pdf,html,txt} \
@@ -244,8 +252,8 @@ install -v -m644 doc/heimdal.{dvi,ps,pdf,html,txt} \
     renaming the new <application>Heimdal</application> files) after the
     installation.</para>
 
-    <para><parameter>--libexecdir=/usr/sbin</parameter>: This switch
+    <para><parameter>--libexecdir=/usr/sbin</parameter>: This switch causes
-    puts the daemon programs into
+    the daemon programs to be installed into
     <filename class="directory">/usr/sbin</filename>.</para>
 
     <tip>