26 files changed, 49 insertions, 50 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 929b0deee..aa2b32570 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -26,13 +26,13 @@ First a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
-<listitem><para>binutils-&binutils-version;-gcc4-1.patch</para></listitem>
-<listitem><para>bzip2-&bzip2-version;-install_docs-1.patch</para></listitem>
-<listitem><para>bzip2-&bzip2-version;-bzgrep_security-1.patch</para></listitem>
-<listitem><para>glibc-&glibc-version;-rtld_search_dirs-1.patch</para></listitem>
-<listitem><para>texinfo-&texinfo-version;-tempfile_fix-1.patch</para></listitem>
-<listitem><para>util-linux-&util-linux-version;-umount_fix-1.patch</para></listitem>
-<listitem><para>vim-&vim-version;-security_fix-2.patch</para></listitem>
+<listitem><para>&binutils-gcc4-patch;</para></listitem>
+<listitem><para>&bzip2-docs-patch;</para></listitem>
+<listitem><para>&bzip2-bzgrep-patch;</para></listitem>
+<listitem><para>&glibc-rtld-patch;</para></listitem>
+<listitem><para>&texinfo-tempfile_fix-patch;</para></listitem>
+<listitem><para>&util-linux-umount-patch;</para></listitem>
+<listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -53,16 +53,16 @@ vulnerability in util-linux.</para></listitem>
 </para></listitem>
 
 <listitem><para>October 14th, 2005 [jhuntwork]: Added the bzip2 security
-and install docs patches.</para></listitem> 	
+and install docs patches.</para></listitem>
 
 <listitem><para>October 14th, 2005 [jhuntwork]: Added the tempfile patch
-for texinfo.</para></listitem> 	
+for texinfo.</para></listitem>
 
 <listitem><para>October 14th, 2005 [ken]: Update packages and patches in
-the changelog to only reflect changes since 6.1.  Update zlib.</para></listitem> 	
+the changelog to only reflect changes since 6.1.  Update zlib.</para></listitem>
 
 <listitem><para>October 13th, 2005 [ken]: Fix known errors in lists of
-installed files and bump the perl version.</para></listitem> 	
+installed files and bump the perl version.</para></listitem>
 
 </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c20603598..2cbc489d1 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -16,16 +16,16 @@ needed to build an LFS system:</para>
 <variablelist role="materials">
 
 <varlistentry>
-<term>Bash Various Fixes - 23 KB:</term>
+<term>Bash Avoid Wcontinued Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
+<para><ulink url="&patches-root;&bash-avoid_WCONTINUED-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Bash Avoid Wcontinued Patch - 1 KB:</term>
+<term>Bash Various Fixes - 23 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;&bash-avoid_WCONTINUED-patch;"/></para>
+<para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 0e56bb09b..52df13885 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -31,7 +31,7 @@
 <para>Bash has a problem when compiled against newer versions of Glibc, causing
 it to hang inappropriately.  This patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index c33a87153..9154b597e 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -43,8 +43,7 @@ unset them when building Binutils.</para>
 to patch the first build of this version of Binutils so that it can be
 compiled by the host system.</para>
 
-<screen><userinput>patch -Np1 -i ../binutils-&binutils-version;-gcc4-1.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&binutils-gcc4-patch;</userinput></screen>
 
 <para>The Binutils documentation recommends building Binutils outside of the
 source directory in a dedicated build directory:</para>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index da345c11e..c0652fa22 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, Sed, and Tcl</seg></seglistitem>
 <para>First, fix a bug that can result in false failures during the GCC test
 suite run:</para>
 
-<screen><userinput>patch -Np1 -i ../expect-&expect-version;-spawn-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
 
 <para>Now prepare Expect for compilation:</para>
 
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index 878e05263..d5813dfa2 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -30,7 +30,7 @@
 <para>Flex contains several known bugs. These can be fixed with the
 following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
 <para>The GNU autotools will detect that the Flex source code has been
 modified by the previous patch and tries to update the man page
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 5ddac0851..d4ccbf256 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -58,8 +58,8 @@ working.</para>
 
 <para>First correct a known problem and make an essential adjustment:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-specs-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;
+patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
 
 <para>The first patch disables the GCC <command>fixincludes</command>
 script. This was briefly mentioned earlier, but a more in-depth
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 5740a676f..29fdb2adc 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -42,7 +42,7 @@ risk.</para>
 problem has been determined to be with the tests themselves, not with the libc
 nor the kernel. If you plan to run the testsuite apply this patch:</para>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-fix_test-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 309ec6307..c1279832d 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -30,7 +30,7 @@
 <para>First adapt some hard-wired paths to the C library by applying
 the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../perl-&perl-version;-libc-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
 <para>Prepare Perl for compilation (make sure to get the 'IO Fcntl POSIX'
 part of the command correct&mdash;they are all letters):</para>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 5439c4c8f..2dfcf456d 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -32,12 +32,12 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed.</seg></seglistitem>
 <para>The following patch fixes various issues, including a problem where Bash
 will sometimes only show 33 characters on a line, then wrap to the next:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-fixes-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
 <para>Bash also has issues when compiled against newer versions of Glibc.  The
 following patch resolves this problem:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index fc3c89272..cc4e011fc 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -32,14 +32,14 @@ GCC, Glibc, and Make</seg></seglistitem>
 
 <para>Apply a patch to install the documentation for this package:</para>
 
-<screen><userinput>patch -Np1 -i ../bzip2-&bzip2-version;-install_docs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
 <para>The <command>bzgrep</command> command does not escape '|' and '&amp;' in
 filenames passed to it. This allows arbitrary commands to be executed with the
 privileges of the user running <command>bzgrep</command>. Apply the following to
 address this:</para>
 
-<screen><userinput>patch -Np1 -i ../bzip2-&bzip2-version;-bzgrep_security-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
 
 <para>Prepare Bzip2 for compilation with:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 1bd11a7a0..218743ffb 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -34,13 +34,12 @@ this package is that the <parameter>-p</parameter> switch always
 returns <computeroutput>unknown</computeroutput>. The following patch
 fixes this behavior for Intel architectures:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-uname-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
 
 <para>Prevent Coreutils from installing binaries that will be installed by
 other packages later:</para>
 
-<screen><userinput>patch -Np1 -i \
-    ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
 
 <para>Now prepare Coreutils for compilation:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index ea8a79b7b..4fa42c9f9 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -31,7 +31,7 @@ GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg></seglistitem>
 
 <para>Flex contains several known bugs. Fix these with the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
 <para>The GNU autotools detects that the Flex source code has been
 modified by the previous patch and tries to update the man page
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 99d032fd8..5433b486b 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -39,13 +39,13 @@ unset them when building GCC.</para>
 <para>Apply only the No-Fixincludes patch (not the Specs patch) also
 used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;</userinput></screen>
 
 <para>GCC fails to compile some packages outside of a base Linux From Scratch
 install (e.g., Mozilla and kdegraphics) when used in conjunction with newer
 versions of Binutils.  Apply the following patch to fix this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen>
 
 <para>Apply a <command>sed</command> substitution that will suppress the
 installation of <filename class="libraryfile">libiberty.a</filename>. The
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index b868af0d5..f53bed9e2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -49,18 +49,18 @@ of achieving a clean build.</para>
 threading libraries installed by Glibc.  Unpack the tarball from
 within the Glibc source directory:</para>
 
-<screen><userinput>tar -xjvf /sources/glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
+<screen><userinput>tar -xjvf ../glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
 
 <para>In certain rare circumstances, Glibc can segfault when no standard search
 directories exist.  The following patch prevents this:</para> 
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-rtld_search_dirs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-rtld-patch;</userinput></screen>
 
 <para>Glibc has two tests which fail when the running kernel is 2.6.11.x The
 problem has been determined to be with the tests themselves, not with the libc
 nor the kernel. This patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-fix_test-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 4a6cef7ef..6c5b64ce4 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <para>Gzip has 2 known security vulnerabilities.  The following patch
 addresses both of them:</para>
 
-<screen><userinput>patch -Np1 -i ../gzip-&gzip-version;-security_fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
 
 <para>Prepare Gzip for compilation:</para>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 34930248a..bceaaef1f 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -31,14 +31,14 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <para>Inetutils has issues with the Linux 2.6 kernel series. Fix these
 issues by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&inetutils-kernel_headers-patch;</userinput></screen>
 
 <para>All programs that come with Inetutils will not be installed.
 However, the Inetutils build system will insist on installing all the
 man pages anyway. The following patch will correct this
 situation:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no_server_man_pages-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
 <para>Prepare Inetutils for compilation:</para>
 
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index fee60ae80..51a4b2528 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -40,7 +40,7 @@
           url="&blfs-root;view/svn/server/databases.html#db"/>.
     </para>
 
-    <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen>
+    <screen><userinput>patch -Np1 -i ../&iproute2-remove_db-patch;</userinput></screen>
 
     <para>Prepare IPRoute2 for compilation:</para>
     <screen><userinput>./configure </userinput></screen>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index ca3aa53d5..7dcd5d1f5 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -33,7 +33,7 @@ files in shell scripts.</para>
 to <command>mktemp</command>. Patch Mktemp to include a
 <command>tempfile</command> wrapper:</para>
 
-<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
 
 <para>Prepare Mktemp for compilation:</para>
 
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index a33acc6eb..a234d6531 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -33,7 +33,7 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 only shows 33 characters on a line and then wraps to the next line. It also
 includes other fixes recommended by the Readline author.</para>
 
-<screen><userinput>patch -Np1 -i ../readline-&readline-version;-fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
 
 <para>Prepare Readline for compilation:</para>
 
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index b0edbfc4f..483523519 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -31,7 +31,7 @@ as those given by the kernel when unusual things happen.</para>
 <para>The following patch fixes various issues, including a problem building
 Sysklogd with Linux 2.6 series kernels</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 8ae7a0195..1628a159f 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -31,7 +31,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <para>Tar has a bug when the <parameter>-S</parameter> option is used
 with files larger than 4 GB. The following patch properly fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../tar-&tar-version;-sparse_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
 
 <para>Prepare Tar for compilation:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index ca4a87ecf..07514010e 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -32,7 +32,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <para>Texinfo allows local users to overwrite arbitrary files via a symlink attack 
 on temporary files. Apply the following patch to fix this:</para>
 
-<screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;-tempfile_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
 
 <para>Prepare Texinfo for compilation:</para>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 1fe2b374f..2af6c2866 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -49,12 +49,12 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-linux fails to compile against newer versions of Linux-Libc-Headers.
 The following patch properly fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-cramfs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
 <para>Util-linux has a security vulnerability that could allow a user to remount
 a volume without the nosuid option. The following patch fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-umount_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-umount-patch;</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 9066f90ec..f34726552 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -49,7 +49,7 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 <para>Vim has a security vulnerability already addressed upstream.  The
 following patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../vim-&vim-version;-security_fix-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
 
 <para>Now prepare Vim for compilation:</para>
 
diff --git a/patches.ent b/patches.ent
index f3a66942b..24c93d60e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
 <!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
 
 <!ENTITY binutils-gcc4-patch "binutils-&binutils-version;-gcc4-1.patch">
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">