diff --git a/general.ent b/general.ent
index 18a4ed1e0b..b178a70f48 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
$Date$
-->
-
+
@@ -33,10 +33,7 @@ $Date$
+ packages referenced throughout the BLFS book. -->
@@ -58,11 +55,7 @@ $Date$
-
-
-
@@ -393,11 +386,7 @@ $Date$
-
-
-
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5e9521d18f..90b99272df 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,17 @@
-->
+
+ September 6, 2007
+
+
+ [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.
+
+
+
+
September 5, 2007
diff --git a/postlfs/security/heimdal.xml b/postlfs/security/heimdal.xml
index d3ec32fd87..cd1f40fd93 100644
--- a/postlfs/security/heimdal.xml
+++ b/postlfs/security/heimdal.xml
@@ -131,8 +131,7 @@
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
- users cannot log in.
+ correctly can alter your system so that users cannot log in.
If you wish the Heimdal package to
@@ -166,56 +165,64 @@ mv doc/heimdal.html doc/html &&
make -C doc pdf &&
make -C doc ps &&
makeinfo --html --no-split -o doc/heimdal.html doc/heimdal.texi &&
-makeinfo --plaintext -o doc/heimdal.txt doc/heimdal.texi
+makeinfo --plaintext -o doc/heimdal.txt doc/heimdal.texi
To test the results, issue: make check.
Now, as the root user:
mv -v /usr/include/fnmatch.h /usr/include/fnmatch.h.glibc &&
-mv -v /usr/include/glob.h /usr/include/glob.h.glibc &&
+mv -v /usr/include/glob.h /usr/include/glob.h.glibc &&
-mv -v /usr/include/ss/ss.h /usr/include/ss/ss.h.e2fsprogs &&
-mv -v /usr/lib/libss.a /usr/lib/libss.a.e2fsprogs &&
-mv -v /usr/lib/libss.so /usr/lib/libss.so.e2fsprogs &&
+mv -v /usr/include/ss/ss.h /usr/include/ss/ss.h.e2fsprogs &&
+mv -v /usr/lib/libss.a /usr/lib/libss.a.e2fsprogs &&
+mv -v /usr/lib/libss.so /usr/lib/libss.so.e2fsprogs &&
+if [ -f /usr/lib/libss.la ]; then
+ mv -v /usr/lib/libss.la /usr/lib/libss.la.e2fsprogs
+done &&
make install &&
-mv -v /usr/include/fnmatch.h /usr/include/fnmatch.h.heimdal &&
+mv -v /usr/include/fnmatch.h /usr/include/fnmatch.h.heimdal &&
mv -v /usr/include/fnmatch.h.glibc /usr/include/fnmatch.h &&
-mv -v /usr/include/glob.h /usr/include/glob.h.heimdal &&
-mv -v /usr/include/glob.h.glibc /usr/include/glob.h &&
+mv -v /usr/include/glob.h /usr/include/glob.h.heimdal &&
+mv -v /usr/include/glob.h.glibc /usr/include/glob.h &&
+
+mv -v /usr/include/ss/ss.h /usr/include/ss/ss.h.heimdal &&
+mv -v /usr/include/ss/ss.h.e2fsprogs /usr/include/ss/ss.h &&
+mv -v /usr/lib/libss.a /usr/lib/libss.a.heimdal &&
+mv -v /usr/lib/libss.a.e2fsprogs /usr/lib/libss.a &&
+mv -v /usr/lib/libss.so /usr/lib/libss.so.heimdal &&
+mv -v /usr/lib/libss.so.e2fsprogs /usr/lib/libss.so &&
+mv -v /usr/lib/libss.la /usr/lib/libss.la.heimdal &&
+if [ -e /usr/lib/libss.la.e2fsprogs ]; then
+ mv -v /usr/lib/libss.la.e2fsprogs /usr/lib/libss.la
+fi &&
-mv -v /usr/include/ss/ss.h /usr/include/ss/ss.h.heimdal &&
-mv -v /usr/include/ss/ss.h.e2fsprogs /usr/include/ss/ss.h &&
-mv -v /usr/lib/libss.a /usr/lib/libss.a.heimdal &&
-mv -v /usr/lib/libss.a.e2fsprogs /usr/lib/libss.a &&
-mv -v /usr/lib/libss.so /usr/lib/libss.so.heimdal &&
-mv -v /usr/lib/libss.la /usr/lib/libss.la.heimdal &&
-mv -v /usr/lib/libss.so.e2fsprogs /usr/lib/libss.so &&
if [ -e /usr/lib/libss.so.2 ]; then rm -v /usr/lib/libss.so.2; fi &&
install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/standardisation &&
install -v -m644 doc/{init-creds,layman.asc} \
- /usr/share/doc/heimdal-&heimdal-version; &&
+ /usr/share/doc/heimdal-&heimdal-version; &&
install -v -m644 doc/standardisation/* \
- /usr/share/doc/heimdal-&heimdal-version;/standardisation &&
+ /usr/share/doc/heimdal-&heimdal-version;/standardisation &&
-mv -v /bin/login /bin/login.shadow &&
-mv -v /bin/su /bin/su.shadow &&
+mv -v /bin/login /bin/login.shadow &&
+mv -v /bin/su /bin/su.shadow &&
mv -v /usr/bin/{login,su} /bin &&
ln -v -sf ../../bin/login /usr/bin &&
-mv -v /usr/lib/lib{otp,kafs,krb5,asn1,roken,crypto}.so.* \
- /usr/lib/libdb-4.5.so /lib &&
-ln -v -sf ../../lib/libdb-4.5.so /usr/lib/libdb.so &&
-ln -v -sf ../../lib/libdb-4.5.so /usr/lib/libdb-4.so &&
-for SYMLINK in otp.so.0.1.3 kafs.so.0.4.1 krb5.so.17.4.0 \
- asn1.so.6.1.0 roken.so.16.1.0 crypto.so.0.9.8
-do
- ln -v -sf ../../lib/lib$SYMLINK \
- /usr/lib/lib`echo $SYMLINK | cut -d. -f1`.so
-done
+for LINK in lib{otp,kafs,krb5,asn1,roken,crypto}; do \
+ mv -v /usr/lib/${LINK}.so.* /lib &&
+ ln -v -sf ../../lib/$(readlink /usr/lib/${LINK}.so) \
+ /usr/lib/${LINK}.so
+done &&
+
+mv -v /usr/lib/$(readlink /usr/lib/libdb.so) \
+ /usr/lib/libdb-?.so \
+ /lib &&
+ln -v -sf ../../lib/$(readlink /usr/lib/libdb.so) \
+ /usr/lib/libdb.so &&
ldconfig
@@ -223,11 +230,12 @@ ldconfig
using the following commands as the
root user:
-install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/html &&
-install -v -m644 doc/html/* \
- /usr/share/doc/heimdal-&heimdal-version;/html &&
-install -v -m644 doc/heimdal.{dvi,ps,pdf,html,txt} \
- /usr/share/doc/heimdal-&heimdal-version;
+
+install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;/html &&
+install -v -m644 doc/html/* \
+ /usr/share/doc/heimdal-&heimdal-version;/html &&
+install -v -m644 doc/heimdal.{dvi,ps,pdf,html,txt} \
+ /usr/share/doc/heimdal-&heimdal-version;
@@ -244,8 +252,8 @@ install -v -m644 doc/heimdal.{dvi,ps,pdf,html,txt} \
renaming the new Heimdal files) after the
installation.
- --libexecdir=/usr/sbin: This switch
- puts the daemon programs into
+ --libexecdir=/usr/sbin: This switch causes
+ the daemon programs to be installed into
/usr/sbin.