diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index 76570bf1e..9c725ecc7 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -4,8 +4,5 @@
Official Download Location
Zlib (&zlib-version;):
-
-
-Zlib Vsnprintf Patch:
-
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e9d7ddc09..d877781a1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -13,11 +13,13 @@
file-4.06
gcc-3.3.2
man-pages-1.63
-lfs-utils-0.4.1
+lfs-utils-0.4.2
modutils-2.4.26
perl-5.8.2
procps-3.1.14
sed-4.0.8
+tcl-8.4.5
+zlib-1.2.1
@@ -36,9 +38,13 @@
man-1.5m2-pager.patch
ncurses-5.3-vsscanf.patch
procps-3.1.11-locale-fix.patch
+zlib-1.1.4-vsnprintf.patch
+November 26th, 2003 [greg]: Upgraded to Lfs-Utils-0.4.2,
+Tcl-8.4.5 and Zlib-1.2.1. Obsoletes the Zlib Vsnprintf patch.
+
November 23rd, 2003 [greg]: Upgraded to Lfs-Utils-0.4.1 and
improved its build commands.
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 5a1be1998..f53ab3127 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -313,9 +313,6 @@ Perl Libc Patch - &perl-libc-patch-size;:
Shadow Newgrp Patch - &shadow-patch-size;:
-
-Zlib Vsnprintf Patch - &zlib-patch-size;:
-
In addition to the above required patches, there exist a number of
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 354994793..5c9e7b6e6 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -13,13 +13,7 @@ Estimated required disk space: &zlib-compsize;
Installation of Zlib
-Zlib has a potential buffer overflow in its
-gzprintf() function, that, though difficult to take
-advantage of, should be taken care of by applying this patch:
-
-patch -Np1 -i ../&zlib-patch;
-
-Now prepare Zlib for compilation:
+Prepare Zlib for compilation:
./configure --prefix=/usr --shared
@@ -33,45 +27,51 @@ afterwards.
make
-Install the shared libraries:
+This package has a test suite available which can perform a number of
+checks to ensure it built correctly. The test suite for Zlib is quick and
+painless so we recommend it be run. The following command will test the shared
+library:
+
+make check
+
+Install the shared library:
make install
-Now also build the non-shared libraries:
+Now also build the non-shared (static) library:
make clean
./configure --prefix=/usr
make
-This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:
+The following command will test the static library:
-make test
+make check
And install the package:
make install
-The shared Zlib library should be installed in the
-/lib directory. That way, in the event
-that you must boot without the /usr
-directory, vital system programs will still have access to
-the library:
+It is good policy and common practice to place important libraries into
+the /lib directory. This matters most
+in scenarios where /usr is on a
+separate partition. Essentially, the run-time components of any libraries
+depended upon by programs in /bin or
+/sbin should reside in
+/lib so that they are on the root
+partition and available in the event of
+/usr being inaccessible.
+
+Therefore we move the run-time components of the shared Zlib into
+/lib by issuing the following
+command:
mv /usr/lib/libz.so.* /lib
-The /usr/lib/libz.so symlink is
-linked to a file which no longer exists, because we moved
-it. Create a symbolic link to the new location of the
-library:
+Now we need to fix up the /usr/lib/libz.so symlink
+because we just moved the location of the file it points to:
ln -sf ../../lib/libz.so.1 /usr/lib/libz.so
-Zlib does not install its manual page. Issue the
-following command to install this documentation:
-
-cp zlib.3 /usr/share/man/man3
-
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index 318fa4bbc..eaa64c004 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -6,12 +6,12 @@
-
+
-
+
-
+
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 8d93dd6f7..47dbc0fce 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -6,12 +6,12 @@
-
-
-
+
+
+
-
+
diff --git a/entities/zlib.ent b/entities/zlib.ent
index a405c9425..5e5509259 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -6,15 +6,12 @@
-
-
-
+
+
+
-
-
-
-
+