Applied Zack's patches. Untested at the moment, will do a build in a few minutes.

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

10 files changed, 31 insertions, 25 deletions

diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml
index eca0bf9f6..4214b6648 100644
--- a/chapter06/automake-inst.xml
+++ b/chapter06/automake-inst.xml
@@ -7,7 +7,11 @@
 
 <para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
 
-<para>Continue with compiling and installing the package:</para>
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
 
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index ea23cf607..19a54c714 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -3,6 +3,12 @@
 <sect2>
 <title>Installation of Bash</title>
 
+<para>Bash has a number of bugs in it that cause it to not behave the 
+way it is expected at times. Fix this behaviour with the following
+patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
+
 <para>Prepare Bash to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b92e9a9de..1a3ad15f8 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -8,7 +8,6 @@
 &c6-changingowner;
 &c6-creatingdirs;
 &c6-mountproc;
-&c6-mtablink;
 &c6-createfiles;
 &c6-pwdgroup;
 &c6-makedev;
diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml
index 8c22d847d..5215c9636 100644
--- a/chapter06/config-glibc.xml
+++ b/chapter06/config-glibc.xml
@@ -39,9 +39,9 @@ netgroup: db files
 <para>When you've answered a few questions about your location, the script will
 output the name of your timezone, something like <emphasis>EST5EDT</emphasis>
 or <emphasis>Canada/Eastern</emphasis>. Then create the
-<filename>/etc/localtime</filename> symlink by running:</para>
+<filename>/etc/localtime</filename> file by running:</para>
 
-<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
+<para><screen><userinput>cp ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
 
 <para>Of course, instead of <emphasis>Canada/Eastern</emphasis>, fill in
 the name of the timezone that the <userinput>tzselect</userinput> script
diff --git a/chapter06/configure.xml b/chapter06/configure.xml
index 8d891212e..c80f29a3a 100644
--- a/chapter06/configure.xml
+++ b/chapter06/configure.xml
@@ -6,7 +6,6 @@
 a few configuration tasks.</para>
 
 &c6-cf-keyboard;
-&c6-cf-utmp;
 &c6-cf-password;
 
 </sect1>
diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml
index fd80fe891..0f4c620f9 100644
--- a/chapter06/e2fsprogs-inst.xml
+++ b/chapter06/e2fsprogs-inst.xml
@@ -46,11 +46,6 @@ of.</para></listitem>
 
 <para><screen><userinput>make install-libs</userinput></screen></para>
 
-<para>Update the <filename>/usr/share/info/dir</filename> file to
-include E2fsprogs' info pages in the index:</para>
-
-<para><screen><userinput>install-info /usr/share/info/libext2fs.info /usr/share/info/dir</userinput></screen></para>
-
 </sect2>
 
 
diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml
index 6b22aacbd..b71919d79 100644
--- a/chapter06/make-inst.xml
+++ b/chapter06/make-inst.xml
@@ -15,15 +15,5 @@
 
 <para><screen><userinput>make install</userinput></screen></para>
 
-<para>By default, <filename>/usr/bin/make</filename> is installed setgid
-kmem. This is needed on some systems so it can check the load average by
-using <filename>/dev/kmem</filename>. However, on Linux systems, setgid
-kmem is not needed, so we remove this from our <filename>make</filename>
-binary. This also fixes problems with <filename>make</filename>
-ignoring certain variables like <emphasis>LD_LIBRARY_PATH</emphasis>.</para>
-
-<para><screen><userinput>chgrp root /usr/bin/make &amp;&amp;
-chmod 755 /usr/bin/make</userinput></screen></para>
-
 </sect2>
 
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 2cd239541..0d8f8e245 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -9,6 +9,18 @@ regarding passwords, such as how to enable the more secure MD5 passwords
 and how to get the most out of this Shadow package. The Shadow hint can
 be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
 
+<para>Programs like login, shutdown, uptime, and others want to read
+from and to the /var/run/utmp, /var/log/btmp and /var/log/wtmp. These
+files contain information about who is currently logged in. They also
+contain information about when the conmputer was last booted and
+shutdown and a record of bas login attempts.</para>
+
+<para>Create these files with their proper permissions by running the
+following commands:</para>
+
+<para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp} &amp;&amp;
+chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp)</userinput></screen></para>
+
 <para>Prepare Shadow to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib \
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index d23c0c009..86c849913 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -3,11 +3,6 @@
 <sect2>
 <title>Installation of Vim</title>
 
-<para>This package requires its patch to be applied before you can
-install it. This patch fixes a compile problem with GCC-3.2:</para>
-
-<para><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch</userinput></screen></para>
-
 <para>Prepare Vim to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
index 616adb20b..1de4994c3 100644
--- a/chapter06/zlib-inst.xml
+++ b/chapter06/zlib-inst.xml
@@ -3,6 +3,12 @@
 <sect2>
 <title>Installation of Zlib</title>
 
+<para>Zlib has a potential buffer overflow in its gzprintf() function,
+that, though difficult to take advantage of, should be taken care of. Do
+so by applying this patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../zlib-&zlib-patch-version;</userinput></screen></para>
+
 <para>Prepare Zlib to be compiled:</para>
 
 <para><screen><userinput>CFLAGS="$CFLAGS -fPIC" \