16 files changed, 27 insertions, 126 deletions
diff --git a/appendixa/findutils-down.xml b/appendixa/findutils-down.xml
index cfeecc0ed..f59ead09e 100644
--- a/appendixa/findutils-down.xml
+++ b/appendixa/findutils-down.xml
@@ -2,14 +2,6 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Findutils (&findutils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/findutils/"/>
-
-Findutils Patch (&findutils-patch-version;):
-<ulink url="&ftp;/"/>
-<ulink url="&http;/"/>
-
-Findutils Segfault Patch (&findutils-segfault-patch-version;):
-<ulink url="&ftp;/"/>
-<ulink url="&http;/"/></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/gnu/findutils/"/></literallayout></para>
 
 </sect2>
diff --git a/appendixa/gzip-down.xml b/appendixa/gzip-down.xml
index bcba9a82b..688c3613f 100644
--- a/appendixa/gzip-down.xml
+++ b/appendixa/gzip-down.xml
@@ -2,9 +2,6 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Gzip (&gzip-version;): 
-<ulink url="ftp://ftp.gnu.org/gnu/gzip/"/>
+<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/></literallayout></para>
 
-Gzip Patch (&gzip-patch-version;):
-<ulink url="&ftp;/"/>
-<ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/appendixa/tar-down.xml b/appendixa/tar-down.xml
index d1fc90fd1..58cfc164b 100644
--- a/appendixa/tar-down.xml
+++ b/appendixa/tar-down.xml
@@ -2,9 +2,6 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Tar (&tar-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/tar/"/>
+<ulink url="ftp://alpha.gnu.org/gnu/tar/"/></literallayout></para>
 
-Tar Patch (&tar-version;):
-<ulink url="&ftp;/"/>
-<ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5e3256ea1..36b8de49a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -12,11 +12,13 @@
 <listitem><para>bash-2.05b</para></listitem>
 <listitem><para>e2fsprogs-1.33</para></listitem>
 <listitem><para>file-4.02</para></listitem>
+<listitem><para>findutils-4.1.7</para></listitem>
 <listitem><para>gawk-3.1.2</para></listitem>
 <listitem><para>gcc-3.2.3</para></listitem>
 <listitem><para>glibc-2.3.2</para></listitem>
 <listitem><para>grep-2.5.1</para></listitem>
 <listitem><para>groff-1.19</para></listitem>
+<listitem><para>gzip-1.3.5</para></listitem>
 <listitem><para>less-381</para></listitem>
 <listitem><para>libtool-1.5</para></listitem>
 <listitem><para>man-1.5l</para></listitem>
@@ -29,6 +31,7 @@
 <listitem><para>procps-3.1.8.patch</para></listitem>
 <listitem><para>sed-4.0.7</para></listitem>
 <listitem><para>sysvinit-2.85</para></listitem>
+<listitem><para>tar-1.13.25</para></listitem>
 <listitem><para>texinfo-4.5</para></listitem>
 <listitem><para>util-linux-2.11z</para></listitem>
 </itemizedlist>
@@ -74,6 +77,13 @@
 <listitem><para>May 12th, 2003 [gerard]: Chapter 06 - Basic Network: Added
 $(hostname) to /etc/hosts, without it perl's test doesn't pass.</para></listitem>
 
+<listitem><para>May 12th, 2003 [gerard]: Chapter 06 - Installing GCC:
+Don't try to remove /usr/include/libiberty.h. It isn't installed in the
+first place.</para></listitem>
+
+<listitem><para>May 12th, 2003 [winkie]: Upgraded to findutils-4.1.7,
+gzip-1.3.5, and tar-1.13.25.</para></listitem>
+
 <listitem><para>May 12th, 2003 [winkie]: Chapter 05 - Installing Perl:
 Add extra commands to build certain modules into Perl. This is to
 accomadate the Coreutils "make check". Partially fixes bug #528.</para></listitem>
diff --git a/chapter04/findutils.xml b/chapter04/findutils.xml
index 90a0117d7..38a3db2f9 100644
--- a/chapter04/findutils.xml
+++ b/chapter04/findutils.xml
@@ -1,2 +1,2 @@
 Findutils (&findutils-version;) - &findutils-size;:
-<ulink url="http://freshmeat.net/projects/findutils/"/>
+<ulink url="http://netsw.org/system/tools/fileutils/find/"/>
diff --git a/chapter04/gzip.xml b/chapter04/gzip.xml
index efc301c72..240ce0bc8 100644
--- a/chapter04/gzip.xml
+++ b/chapter04/gzip.xml
@@ -1,2 +1,2 @@
 Gzip (&gzip-version;) - &gzip-size;:
-<ulink url="http://freshmeat.net/projects/gzip/"/>
+<ulink url="ftp://alpha.gnu.org/gnu/gzip/"/>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index a8d7667d0..f04f3be72 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -24,7 +24,6 @@
 &c4-expect-patch;
 &c4-file;
 &c4-findutils;
-&c4-findutils-patch;
 &c4-flex;
 &c4-gawk;
 &c4-gawk-patch;
@@ -37,7 +36,6 @@
 &c4-grep;
 &c4-groff;
 &c4-gzip;
-&c4-gzip-patch;
 &c4-inetutils;
 &c4-kbd;
 &c4-kbd-patch;
@@ -68,7 +66,6 @@
 &c4-sysklogd;
 &c4-sysvinit;
 &c4-tar;
-&c4-tar-patch;
 &c4-tcl;
 &c4-texinfo;
 &c4-utillinux;
diff --git a/chapter04/tar.xml b/chapter04/tar.xml
index 1020d202d..84c253b54 100644
--- a/chapter04/tar.xml
+++ b/chapter04/tar.xml
@@ -1,2 +1,2 @@
 Tar (&tar-version;) - &tar-size;:
-<ulink url="http://freshmeat.net/projects/tar/"/>
+<ulink url="ftp://alpha.gnu.org/gnu/tar/"/>
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index 44fdb894d..f654dc521 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -3,30 +3,6 @@
 <sect2>
 <title>Installing Findutils</title>
 
-<para>The Findutils package is quite old and it has problems compiling
-against newer Glibc versions (Glibc-2.0.x and up). You need to apply the
-patch, which fixes the following issues:</para>
-
-<itemizedlist>
-<listitem><para>Findutils declares a function called basename, but this
-function name is already used by the C standard libraries. This patch
-changes the Findutils version of basename function so that it is called
-basename2 instead.</para></listitem>
-
-<listitem><para>Findutils uses library files in an incorrect way. It
-declares library functions, to tell the compiler what the name of the
-function will be when the libraries are linked in. This syntax is invalid
-and causes compiler warnings/errors. This patch removes this improper
-syntax.</para></listitem>
-
-<listitem><para>Every GNU package is supposed use a macro called _GNU_SOURCE.
-This macro enables declarations of GNU library extension functions so the
-compiler will be able to detect name conflicts between functions more easily.
-This patch adds this macro to the source code.</para></listitem>
-</itemizedlist>
-
-<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para>
-
 <para>Prepare Findutils to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/stage1
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index 0d7a5c5d0..9c94af6df 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -3,15 +3,6 @@
 <sect2>
 <title>Installation of Tar</title>
 
-<para>A patch may be applied to give tar direct support for
-bzip2 files. This patch adds the <emphasis>-j</emphasis> option
-to tar, which is similar to the <emphasis>-z</emphasis> option
-used for gzip files.</para>
-
-<para>Apply the patch by running the following command:</para>
-
-<para><screen><userinput>patch -Np1 -i ../tar-&tar-patch-version;.patch</userinput></screen></para>
-
 <para><screen><userinput>./configure --prefix=/stage1
 make 
 make check
diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml
index 92965bfc3..a0fe09251 100644
--- a/chapter06/findutils-inst.xml
+++ b/chapter06/findutils-inst.xml
@@ -3,52 +3,21 @@
 <sect2>
 <title>Installing Findutils</title>
 
-<para>The Findutils package is quite old and it has problems compiling
-against newer Glibc versions (Glibc-2.0.x and up). You need to apply the
-patch, which fixes the following issues:</para>
-
-<itemizedlist>
-<listitem><para>Findutils declares a function called basename, but this
-function name is already used by the C standard libraries. This patch
-changes the Findutils version of basename function so that it is called
-basename2 instead.</para></listitem>
-
-<listitem><para>Findutils uses library files in an incorrect way. It
-declares library functions, to tell the compiler what the name of the
-function will be when the libraries are linked in. This syntax is invalid
-and causes compiler warnings/errors. This patch removes this improper
-syntax.</para></listitem>
-
-<listitem><para>Every GNU package is supposed use a macro called _GNU_SOURCE.
-This macro enables declarations of GNU library extension functions and so the
-compiler will be able to detect name conflicts between functions more easily.
-This patch adds this macro to the source code.</para></listitem>
-</itemizedlist>
-
-<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para>
-
-<para>There is a bug in locate.c of Findutils that causes a segmentation
-fault to occur on very long path names. The problem is caused by the
-get_short() function calculating negative numbers incorrectly. This patch
-corrects this bug.</para>
-
-<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch</userinput></screen></para>
-
 <para>Prepare Findutils to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin</userinput></screen></para>
 
 <para>By default, the location of the updatedb database is in /usr/var.
 To make the location of <filename>/var/lib/misc/locatedb</filename> file
-FHS compliant, pass the <emphasis>localstatedir=/var/lib/misc</emphasis>
-option to both <userinput>make</userinput> commands below.</para>
+FHS compliant, pass the <emphasis>--localstatedir=/var/lib/misc</emphasis>
+option to <userinput>configure</userinput>.</para>
 
 <para>Continue with compiling the package:</para>
 
-<para><screen><userinput>make libexecdir=/usr/bin</userinput></screen></para>
+<para><screen><userinput>make</userinput></screen></para>
 
 <para>Finish installing the package:</para>
 
-<para><screen><userinput>make libexecdir=/usr/bin install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index c6ca13a2a..9022dfe96 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -3,13 +3,6 @@
 <sect2>
 <title>Installation of Gzip</title>
 
-<para>The following patch fixes a buffer overflow that occurs when a
-filename is longer than 1020 characters. It does this by inserting a check
-that the buffer is large enough for the given filename. The program exits
-with the message "Filename too long" if the buffer is not large enough.</para>
-
-<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-patch-version;.patch</userinput></screen></para>
-
 <para>Prepare Gzip to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml
index a2842f35e..5478202a7 100644
--- a/chapter06/tar-inst.xml
+++ b/chapter06/tar-inst.xml
@@ -3,15 +3,6 @@
 <sect2>
 <title>Installation of Tar</title>
 
-<para>A patch may be applied to give tar direct support for bzip2
-files. This patch adds the <emphasis>-j</emphasis> option to tar,
-which is similar to the <emphasis>-z</emphasis> option used for
-gzip files.</para>
- 
-<para>Apply the patch by running the following command:</para>
-
-<para><screen><userinput>patch -Np1 -i ../tar-&tar-patch-version;.patch</userinput></screen></para>
-
 <para>Prepare Tar to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr --bindir=/bin \
diff --git a/entities/findutils.ent b/entities/findutils.ent
index a00f6266e..6ccce8f85 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -1,6 +1,4 @@
 <!ENTITY c4-findutils SYSTEM "../chapter04/findutils.xml">
-<!ENTITY c4-findutils-patch SYSTEM "../chapter04/findutils-patch.xml">
-<!ENTITY c4-findutils-segfault-patch SYSTEM "../chapter04/findutils-patch.xml">
 
 <!ENTITY c5-findutils SYSTEM "../chapter05/findutils.xml">
 <!ENTITY c5-findutils-inst SYSTEM "../chapter05/findutils-inst.xml">
@@ -14,14 +12,10 @@
 <!ENTITY aa-findutils-dep SYSTEM "../appendixa/findutils-dep.xml">
 <!ENTITY aa-findutils-down SYSTEM "../appendixa/findutils-down.xml">
 
-<!ENTITY findutils-version "4.1">
+<!ENTITY findutils-version "4.1.7">
 <!ENTITY findutils-depversion "4.1">
 <!ENTITY findutils-contversion "4.1">
-<!ENTITY findutils-size "288 KB">
-<!ENTITY findutils-patch-size "1 KB">
-<!ENTITY findutils-patch-version "4.1">
-<!ENTITY findutils-segfault-patch-size "1 KB">
-<!ENTITY findutils-segfault-patch-version "4.1">
+<!ENTITY findutils-size "619 KB">
 <!ENTITY findutils-dir "findutils-&findutils-version;">
 <!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
 
diff --git a/entities/gzip.ent b/entities/gzip.ent
index d05fe50b9..11d53cc8f 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -1,5 +1,4 @@
 <!ENTITY c4-gzip SYSTEM "../chapter04/gzip.xml">
-<!ENTITY c4-gzip-patch SYSTEM "../chapter04/gzip-patch.xml">
 
 <!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
 <!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
@@ -13,12 +12,10 @@
 <!ENTITY aa-gzip-dep SYSTEM "../appendixa/gzip-dep.xml">
 <!ENTITY aa-gzip-down SYSTEM "../appendixa/gzip-down.xml">
 
-<!ENTITY gzip-version "1.2.4a">
+<!ENTITY gzip-version "1.3.5">
 <!ENTITY gzip-depversion "1.2.4a">
 <!ENTITY gzip-contversion "1.2.4a">
-<!ENTITY gzip-size "216 KB">
-<!ENTITY gzip-patch-size "1 KB">
-<!ENTITY gzip-patch-version "1.2.4b">
+<!ENTITY gzip-size "323 KB">
 <!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
 <!ENTITY gzip-dir "gzip-&gzip-version;">
 
diff --git a/entities/tar.ent b/entities/tar.ent
index b060e88e0..e74a098be 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -1,5 +1,4 @@
 <!ENTITY c4-tar SYSTEM "../chapter04/tar.xml">
-<!ENTITY c4-tar-patch SYSTEM "../chapter04/tar-patch.xml">
 
 <!ENTITY c5-tar SYSTEM "../chapter05/tar.xml">
 <!ENTITY c5-tar-inst SYSTEM "../chapter05/tar-inst.xml">
@@ -12,12 +11,10 @@
 <!ENTITY aa-tar-down SYSTEM "../appendixa/tar-down.xml">
 <!ENTITY aa-tar-shortdesc SYSTEM "../appendixa/tar-shortdesc.xml">
 
-<!ENTITY tar-version "1.13">
+<!ENTITY tar-version "1.13.25">
 <!ENTITY tar-depversion "1.13">
 <!ENTITY tar-contversion "1.13">
-<!ENTITY tar-size "1028 KB">
-<!ENTITY tar-patch-size "1 KB">
-<!ENTITY tar-patch-version "1.13">
+<!ENTITY tar-size "1281 KB">
 <!ENTITY tar-package "tar-&tar-version;.tar.bz2">
 <!ENTITY tar-dir "tar-&tar-version;">