16 files changed, 70 insertions, 41 deletions
diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml
index 2ae9f80b1..f4360fbe3 100644
--- a/appendixa/expect-down.xml
+++ b/appendixa/expect-down.xml
@@ -2,5 +2,8 @@
 <title>Official Download Location</title>
 
 <para><literallayout>expect (&expect-version;):
-<ulink url="http://expect.nist.gov/src/"/></literallayout></para>
+<ulink url="http://expect.nist.gov/src/"/>
+
+Expect Patch (&expect-patch-version;):
+<ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index 6867ef504..b97a9d5f7 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -2,5 +2,23 @@
 <title>Official Download Location</title>
 
 <para><literallayout>GCC (&gcc-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/></literallayout></para>
+<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
+
+GCC No Fixincludes Patch (&gcc-nofixincludes-patch-version;):
+<ulink url="&http;/"/>
+
+GCC Specs Patch (&gcc-specs-patch-version;):
+<ulink url="&http;/"/>
+
+GCC Suppress Libiberty Patch (&gcc-suppress-libiberty-patch-version;):
+<ulink url="&http;/"/>
+
+GCC-2 Patch (&gcc-2953-patch-version;):
+<ulink url="&http;/"/>
+
+GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;):
+<ulink url="&http;/"/>
+
+GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;):
+<ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index f6dd1ecd4..807b39fbd 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -7,9 +7,6 @@
 Glibc-linuxthreads (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
 
-Glibc Root/Perl Patch (&glibc-rootperl-patch-version;):
-<ulink url="&http;/"/>
-
-Glibc Libnss Patch (&glibc-libnss-patch-version;):
+Glibc Sscanf Patch (&glibc-sscanf-patch-version;):
 <ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a1d4549af..e1f62b7ad 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -59,7 +59,7 @@
 <listitem><para>gcc-2.95.3-no-fixinc.patch</para></listitem>
 <listitem><para>gcc-2.95.3-returntype-fix.patch</para></listitem>
 <listitem><para>gcc-3.3.1-no_fixincludes-2.patch</para></listitem>
-<listitem><para>gcc-&gcc-specs-version;.patch</para></listitem>
+<listitem><para>gcc-3.3.1-specs-2.patch</para></listitem>
 <listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem>
 <listitem><para>grub-0.93</para></listitem>
 <listitem><para>grub-0.93-gcc33-1.patch</para></listitem>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 2f74bd1c1..29cf4d828 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -246,6 +246,7 @@ Bison Attribute Patch:
 
 Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
 <ulink url="&http;/coreutils-&coreutils-hostname-patch-version;.patch"/>
+
 Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
 <ulink url="&http;/coreutils-&coreutils-uname-patch-version;.patch"/>
 
@@ -258,22 +259,26 @@ Expect Patch (&expect-patch-version;) - &expect-patch-size;:
 Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
 <ulink url="&http;/gawk-&gawk-patch-version;.patch"/>
 
+GCC No Fixincludes Patch: (&gcc-nofixincludes-patch-version;) - &gcc-nofixincludes-patch-size;:
+<ulink url="&http;/gcc-&gcc-nofixincludes-patch-version;.patch"/>
+
+GCC Specs Patch: (&gcc-specs-patch-version;) - &gcc-specs-patch-size;:
+<ulink url="&http;/gcc-&gcc-specs-patch-version;.patch"/>
+
+GCC Suppress Libiberty Patch: (&gcc-suppress-libiberty-patch-version;) - &gcc-suppress-libiberty-patch-size;:
+<ulink url="&http;/gcc-&gcc-suppress-libiberty-patch-version;.patch"/>
+
 GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
 <ulink url="&http;/gcc-&gcc-2953-patch-version;.patch"/>
+
 GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;:
 <ulink url="&http;/gcc-&gcc-2953-no-fixinc-patch-version;-no-fixinc.patch"/>
+
 GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;:
 <ulink url="&http;/gcc-&gcc-2953-returntype-fix-patch-version;-returntype-fix.patch"/>
 
-GCC No Fixincludes Patch:
-<ulink url="&http;/gcc-3.3.1-no_fixincludes-2.patch"/>
-GCC Specs Patch:
-<ulink url="&http;/gcc-&gcc-specs-version;.patch"/>
-GCC Suppress Libiberty Patch:
-<ulink url="&http;/gcc-3.3.1-suppress-libiberty.patch"/>
-
-Glibc Sscanf Patch:
-<ulink url="&http;/glibc-2.3.2-sscanf-1.patch"/>
+Glibc Sscanf Patch: - &glibc-sscanf-patch-size;:
+<ulink url="&http;/glibc-&glibc-sscanf-patch-version;.patch"/>
 
 Grub Patch (&grub-patch-version;) - &grub-patch-size;:
 <ulink url="&http;/grub-&grub-patch-version;.patch"/>
@@ -283,13 +288,16 @@ Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
 
 Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
 <ulink url="&http;/man-&man-80cols-patch-version;-80cols.patch"/>
+
 Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
 <ulink url="&http;/man-&man-manpath-patch-version;-manpath.patch"/>
+
 Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
 <ulink url="&http;/man-&man-pager-patch-version;-pager.patch"/>
 
 Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
 <ulink url="&http;/ncurses-5.3-etip-2.patch"/>
+
 Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;:
 <ulink url="&http;/ncurses-5.3-vsscanf.patch"/>
 
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index e4f4febfb..71eadbaa0 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -33,8 +33,8 @@ same working directory. They will all unfold into a single
 
 <para>First correct one problem and make an essential adjustment:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-2.patch
-patch -Np1 -i ../gcc-&gcc-specs-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
+patch -Np1 -i ../gcc-&gcc-specs-patch-version;.patch</userinput></screen></para>
 
 <para>The first patch disables the GCC "fixincludes" script.  We mentioned this
 briefly earlier, but a slightly more in-depth explanation of the fixincludes 
diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
index 9ffcea2f8..83b64eb69 100644
--- a/chapter05/glibc-inst.xml
+++ b/chapter05/glibc-inst.xml
@@ -31,8 +31,7 @@ touch /tools/etc/ld.so.conf</userinput></screen></para>
 <para>Also, Glibc has a subtle problem when compiled with GCC 3.3.1.
 Apply the following patch to fix this:</para>
 
-<para><screen><userinput>patch -Np1 -i ../glibc-2.3.2-sscanf-1.patch
-</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch</userinput></screen></para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 62efb9103..909e6c0e2 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -20,8 +20,8 @@ GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-2.patch
-patch -Np1 -i ../gcc-3.3.1-suppress-libiberty.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
+patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch</userinput></screen></para>
 
 <para>The second patch here suppresses the installation of libiberty from GCC,
 as we will use the one provided by binutils instead.</para>
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 7829f9d56..ce8db035a 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -20,8 +20,7 @@ flags.</para>
 
 <para>Then apply the same patch we used previously:</para>
                                                                                 
-<para><screen><userinput>patch -Np1 -i ../glibc-2.3.2-sscanf-1.patch
-</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch</userinput></screen></para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/entities/binutils.ent b/entities/binutils.ent
index 6a0721ead..c31a9a758 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -18,7 +18,7 @@
 <!ENTITY binutils-version "2.14">
 <!ENTITY binutils-depversion "2.11.2">
 <!ENTITY binutils-contversion "2.12.1">
-<!ENTITY binutils-size "9,534 KB">
+<!ENTITY binutils-size "10,665 KB">
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-dir "binutils-&binutils-version;">
 
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index adb1bd484..ec8ea9a45 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -14,7 +14,7 @@
 <!ENTITY dejagnu-contversion "1.4.3">
 <!ENTITY dejagnu-package "dejagnu-&dejagnu-version;.tar.bz2">
 <!ENTITY dejagnu-dir "dejagnu-&dejagnu-version;">
-<!ENTITY dejagnu-size "">
+<!ENTITY dejagnu-size "1,774 KB">
 
 <!ENTITY dejagnu-compsize-static "24 MB">
 <!ENTITY dejagnu-time-static "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index bb7af2110..a29801c49 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -13,10 +13,11 @@
 <!ENTITY expect-version "5.39.0">
 <!ENTITY expect-depversion "5.39.0">
 <!ENTITY expect-contversion "5.39.0">
-<!ENTITY expect-patch-version "5.39.0">
 <!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-dir "expect-&expect-version;">
 <!ENTITY expect-size "508 KB">
+
+<!ENTITY expect-patch-version "5.39.0">
 <!ENTITY expect-patch-size "6.5 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 88325afe6..81f1dd55b 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -14,12 +14,14 @@
 <!ENTITY gcc-2953-depversion "2.95.3">
 <!ENTITY gcc-2953-contversion "2.95.3">
 <!ENTITY gcc-2953-size "2520 KB">
+
 <!ENTITY gcc-2953-patch-version "2.95.3-2">
-<!ENTITY gcc-2953-patch-size "4 KB">
+<!ENTITY gcc-2953-patch-size "16 KB">
 <!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3">
 <!ENTITY gcc-2953-no-fixinc-patch-size "1 KB">
 <!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
+
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
 <!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">
 
diff --git a/entities/gcc.ent b/entities/gcc.ent
index c41eaf2fe..eb33aae5f 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -17,19 +17,23 @@
 <!ENTITY aa-gcc-down SYSTEM "../appendixa/gcc-down.xml">
 
 <!ENTITY gcc-version "3.3.1">
-<!ENTITY gcc-specs-version "3.3.1-specs-2">
 <!ENTITY gcc-depversion "2.95.3">
 <!ENTITY gcc-contversion "3.1">
-<!ENTITY gcc-core-size "13,140 KB">
-<!ENTITY gcc-gpp-size "2564 KB">
-<!ENTITY gcc-testsuite-size "1180 KB">
-<!ENTITY gcc-patch-version "3.2.1">
-<!ENTITY gcc-patch-size "4 KB">
+<!ENTITY gcc-core-size "10,969 KB">
+<!ENTITY gcc-gpp-size "2,016 KB">
+<!ENTITY gcc-testsuite-size "1,033 KB">
 <!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2">
 <!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;.tar.bz2">
 <!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;.tar.bz2">
 <!ENTITY gcc-dir "gcc-&gcc-version;">
 
+<!ENTITY gcc-nofixincludes-patch-version "3.3.1-no_fixincludes-2">
+<!ENTITY gcc-nofixincludes-patch-size "1 KB">
+<!ENTITY gcc-specs-patch-version "3.3.1-specs-2">
+<!ENTITY gcc-specs-patch-size "10 KB">
+<!ENTITY gcc-suppress-libiberty-patch-version "3.3.1-suppress-libiberty">
+<!ENTITY gcc-suppress-libiberty-patch-size "1 KB">
+
 <!ENTITY gcc-compsize-pass1-stage1 "326 MB">
 <!ENTITY gcc-time-pass1-stage1 "3.9 SBU">
 
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 380e18d16..d29f24c0b 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -18,13 +18,11 @@
 <!ENTITY glibc-version "2.3.2">
 <!ENTITY glibc-depversion "2.2.5">
 <!ENTITY glibc-contversion "2.2.5">
-<!ENTITY glibc-size "17,463 KB">
-<!ENTITY glibc-threads-size "238 KB">
+<!ENTITY glibc-size "13,063 KB">
+<!ENTITY glibc-threads-size "211 KB">
 
-<!ENTITY glibc-rootperl-patch-size "1 KB">
-<!ENTITY glibc-rootperl-patch-version "2.3.1">
-<!ENTITY glibc-libnss-patch-size "1 KB">
-<!ENTITY glibc-libnss-patch-version "2.3.1">
+<!ENTITY glibc-sscanf-patch-version "2.3.2-sscanf-1">
+<!ENTITY glibc-sscanf-patch-size "2 KB">
 
 <!ENTITY glibc-dir "glibc-&glibc-version;">
 <!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 3ffae00bc..7bf226685 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -14,7 +14,7 @@
 <!ENTITY tcl-contversion "8.4.4">
 <!ENTITY tcl-package "tcl-&tcl-version;.tar.bz2">
 <!ENTITY tcl-dir "tcl-&tcl-version;">
-<!ENTITY tcl-size "3,370 KB">
+<!ENTITY tcl-size "3,291 KB">
 
 <!ENTITY tcl-compsize-static "24 MB">
 <!ENTITY tcl-time-static "0.6 SBU">