19 files changed, 88 insertions, 32 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0c1833bc7..01e3f1dae 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -9,6 +9,7 @@
 <listitem><para>Upgraded to:
 <itemizedlist>
 <listitem><para>automake-1.7.4</para></listitem>
+<listitem><para>bash-2.05b</para></listitem>
 <listitem><para>e2fsprogs-1.33</para></listitem>
 <listitem><para>file-4.02</para></listitem>
 <listitem><para>gawk-3.1.2</para></listitem>
@@ -35,6 +36,7 @@
 
 <listitem><para>Added:
 <itemizedlist>
+<listitem><para>bash-2.05b.patch</para></listitem>
 <listitem><para>binutils-2.13.2-libc.patch</para></listitem>
 <listitem><para>coreutils-5.0</para></listitem>
 <listitem><para>dejagnu-1.4.3</para></listitem>
@@ -49,6 +51,7 @@
 <listitem><para>ncurses-5.3-etip.patch</para></listitem>
 <listitem><para>perl-5.8.0-libc.patch</para></listitem>
 <listitem><para>tcl-8.4.2</para></listitem>
+<listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem>
 </itemizedlist>
 </para></listitem>
 
@@ -63,6 +66,39 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 11th, 2003 [winkie]: Upgraded to Bash 2.05b and
+added its patch</para></listitem>
+
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Zlib:
+Apply a patch to fix the buffer overflow in gzprintf().</para></listitem>
+
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Configuring system
+compoents: Moved the creation of the btmp, wtmp, lastlog, and utmp to
+just before Shadow, so that they are detected at their proper locations.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Automake:
+Run "make" before installing. This is needed now with the newer releases
+of Automake.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Vim:
+Removed the patch. It hasn't been required since GCC 3.2.1.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Creating the mtab
+file: Removed. Mounting /proc has the side effect of creating /etc/mtab
+for us.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Make:
+Removed modification of /usr/bin/make file. It is no longer mistakenly
+installed with strange ownership or permissions.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing Glibc:
+Made /etc/localtime a file instead of a symlink. The symlink method breaks
+on systems where /usr is a separate partition.</para></listitem>
+
+<listitem><para>May 10th, 2003 [winkie]: Chapter 06 - Installing E2fsprogs:
+Removed install-info commands for e2fsprogs. The "make install" target
+handles this for us.</para></listitem>
+
 <listitem><para>May 10th, 2003 [gerard]: Removed all CFLAGS and LDFLAGS
 variables where they are not essential (so, not including static binutils,
 gcc and compiling zlib with -fPIC).</para></listitem>
diff --git a/chapter04/bash-patch.xml b/chapter04/bash-patch.xml
new file mode 100644
index 000000000..16771762a
--- /dev/null
+++ b/chapter04/bash-patch.xml
@@ -0,0 +1,3 @@
+Bash Patch (&bash-patch-version;) - &bash-patch-size;:
+<ulink url="&ftp;/bash-&bash-patch-version;.patch"/>
+<ulink url="&http;/bash-&bash-patch-version;.patch"/>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 370a021ff..b42df1961 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -8,6 +8,7 @@
 &c4-autoconf;
 &c4-automake;
 &c4-bash;
+&c4-bash-patch;
 &c4-bin86;
 &c4-binutils;
 &c4-bison;
@@ -69,8 +70,8 @@
 &c4-texinfo;
 &c4-utillinux;
 &c4-vim;
-&c4-vim-patch;
 &c4-zlib;
+&c4-zlib-patch;
 
 Total size of all packages: &all-size-kb; (&all-size-mb;)
 </literallayout>
diff --git a/chapter04/zlib-patch.xml b/chapter04/zlib-patch.xml
new file mode 100644
index 000000000..e414e0822
--- /dev/null
+++ b/chapter04/zlib-patch.xml
@@ -0,0 +1,3 @@
+Zlib Patch (&zlib-patch-version;) - &zlib-patch-size;:
+<ulink url="&ftp;/zlib-&zlib-patch-version;.patch"/>
+<ulink url="&http;/zlib-&zlib-patch-version;.patch"/>
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index 7a0d7da55..cc09f03f9 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/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><screen><userinput>./configure --prefix=/stage1 \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-curses --without-bash-malloc
 make
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" \
diff --git a/entities/bash.ent b/entities/bash.ent
index a32c43982..75117fa08 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -1,4 +1,5 @@
 <!ENTITY c4-bash SYSTEM "../chapter04/bash.xml">
+<!ENTITY c4-bash-patch SYSTEM "../chapter04/bash-patch.xml">
 
 <!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
 <!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
@@ -12,12 +13,14 @@
 <!ENTITY aa-bash-dep SYSTEM "../appendixa/bash-dep.xml">
 <!ENTITY aa-bash-down SYSTEM "../appendixa/bash-down.xml">
 
-<!ENTITY bash-version "2.05a">
+<!ENTITY bash-version "2.05b">
 <!ENTITY bash-depversion "2.05a">
 <!ENTITY bash-contversion "2.05a">
 <!ENTITY bash-package "bash-&bash-version;.tar.bz2">
 <!ENTITY bash-dir "bash-&bash-version;">
 <!ENTITY bash-size "1,766 KB">
+<!ENTITY bash-patch-version "2.05b">
+<!ENTITY bash-patch-size "4 KB">
 
 <!ENTITY bash-compsize-static "24 MB">
 <!ENTITY bash-time-static "1 SBU">
diff --git a/entities/chapter06.ent b/entities/chapter06.ent
index fd8c2fc37..2eb3c3941 100644
--- a/entities/chapter06.ent
+++ b/entities/chapter06.ent
@@ -6,12 +6,10 @@
 <!ENTITY c6-changingowner SYSTEM "../chapter06/changingowner.xml">
 <!ENTITY c6-creatingdirs SYSTEM "../chapter06/creatingdirs.xml">
 <!ENTITY c6-pwdgroup SYSTEM "../chapter06/pwdgroup.xml">
-<!ENTITY c6-mtablink SYSTEM "../chapter06/mtablink.xml">
 <!ENTITY c6-mountproc SYSTEM "../chapter06/mountproc.xml">
 <!ENTITY c6-createfiles SYSTEM "../chapter06/createfiles.xml">
 <!ENTITY c6-revisedchroot SYSTEM "../chapter06/revisedchroot.xml">
 <!ENTITY c6-configure SYSTEM "../chapter06/configure.xml">
 <!ENTITY c6-cf-ldso SYSTEM "../chapter06/config-ldso.xml">
 <!ENTITY c6-cf-keyboard SYSTEM "../chapter06/config-keyboard.xml">
-<!ENTITY c6-cf-utmp SYSTEM "../chapter06/create-utmp.xml">
 <!ENTITY c6-cf-password SYSTEM "../chapter06/create-password.xml">
diff --git a/entities/vim.ent b/entities/vim.ent
index 9ab3a1d78..d8a60b556 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -1,5 +1,4 @@
 <!ENTITY c4-vim SYSTEM "../chapter04/vim.xml">
-<!ENTITY c4-vim-patch SYSTEM "../chapter04/vim-patch.xml">
 
 <!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
 <!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
@@ -16,8 +15,6 @@
 <!ENTITY vim-depversion "6.0">
 <!ENTITY vim-contversion "6.1">
 <!ENTITY vim-size "2,822 KB">
-<!ENTITY vim-patch-size "1 KB">
-<!ENTITY vim-patch-version "6.1">
 <!ENTITY vim-dir "vim&vim-version;">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
 
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 74e4a9666..58c14c0be 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -1,4 +1,5 @@
 <!ENTITY c4-zlib SYSTEM "../chapter04/zlib.xml">
+<!ENTITY c4-zlib-patch SYSTEM "../chapter04/zlib-patch.xml">
 
 <!ENTITY c6-zlib SYSTEM "../chapter06/zlib.xml">
 <!ENTITY c6-zlib-inst SYSTEM "../chapter06/zlib-inst.xml">
@@ -15,6 +16,8 @@
 <!ENTITY zlib-size "144 KB">
 <!ENTITY zlib-dir "zlib-&zlib-version;">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
+<!ENTITY zlib-patch-version "1.1.4-vsnprintf">
+<!ENTITY zlib-patch-size "10 KB">
 
 <!ENTITY zlib-compsize "1 MB">
 <!ENTITY zlib-time "0.07 SBU">