r644 - in trunk/BOOK: . chapter01 chapter04 chapter05 chapter06 chapter07

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed May 10 15:18:03 PDT 2006


Author: manuel
Date: 2006-05-10 16:17:59 -0600 (Wed, 10 May 2006)
New Revision: 644

Added:
   trunk/BOOK/patches.ent
Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter04/patches.xml
   trunk/BOOK/chapter05/binutils-cross.xml
   trunk/BOOK/chapter05/binutils.xml
   trunk/BOOK/chapter05/bzip2.xml
   trunk/BOOK/chapter05/expect.xml
   trunk/BOOK/chapter05/flex.xml
   trunk/BOOK/chapter05/gcc-cross.xml
   trunk/BOOK/chapter05/gcc.xml
   trunk/BOOK/chapter05/glibc.xml
   trunk/BOOK/chapter05/linux-libc-headers.xml
   trunk/BOOK/chapter05/perl.xml
   trunk/BOOK/chapter05/sed.xml
   trunk/BOOK/chapter05/uclibc-headers.xml
   trunk/BOOK/chapter05/uclibc.xml
   trunk/BOOK/chapter05/util-linux.xml
   trunk/BOOK/chapter06/bash.xml
   trunk/BOOK/chapter06/binutils.xml
   trunk/BOOK/chapter06/bzip2.xml
   trunk/BOOK/chapter06/coreutils.xml
   trunk/BOOK/chapter06/flex.xml
   trunk/BOOK/chapter06/gawk.xml
   trunk/BOOK/chapter06/gcc.xml
   trunk/BOOK/chapter06/glibc.xml
   trunk/BOOK/chapter06/gzip.xml
   trunk/BOOK/chapter06/inetutils.xml
   trunk/BOOK/chapter06/linux-libc-headers.xml
   trunk/BOOK/chapter06/mktemp.xml
   trunk/BOOK/chapter06/module-init-tools.xml
   trunk/BOOK/chapter06/perl.xml
   trunk/BOOK/chapter06/procps.xml
   trunk/BOOK/chapter06/sed.xml
   trunk/BOOK/chapter06/shadow.xml
   trunk/BOOK/chapter06/sysklogd.xml
   trunk/BOOK/chapter06/tar.xml
   trunk/BOOK/chapter06/texinfo.xml
   trunk/BOOK/chapter06/uclibc.xml
   trunk/BOOK/chapter06/util-linux.xml
   trunk/BOOK/chapter07/bootscripts.xml
   trunk/BOOK/chapter07/kernel.xml
   trunk/BOOK/general.ent
Log:
Added home MD5 sums and sizes to chapter04/packages.xml.
Created patches.ent.
Changed all patches names by entities.

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter01/changelog.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -110,6 +110,10 @@
 </listitem>
 -->
 
+<listitem><para>May 10th, 2006 [manuel]: Added home MD5 sums and
+sizes to chapter04/packages.xml. Created patches.ent. Changed all
+patches names by entities.</para></listitem>
+
 <listitem><para>May 9th, 2006 [manuel]: Added home page links, MD5 sums, and
 sizes to chapter04/packages.xml. Updated stylesheets.</para></listitem>
 
@@ -156,7 +160,7 @@
 Install TCL's private headers to /tools/include.</para></listitem>
 
 <listitem><para>Dec 6th, 2005 [Robert]: Fixed typo in e2fsprogs configure command.</para></listitem>
-Feb
+
 <listitem><para>Nov 27th, 2005 [Robert]: Bump to linux-2.6.14.3 and grsecurity-2.1.7-2.6.14.3-200511261227.</para></listitem>
 
 <listitem><para>Nov 27th, 2005 [Robert]: Bump to module-init-tools-3.2.1, man-pages-2.14,

Modified: trunk/BOOK/chapter04/patches.xml
===================================================================
--- trunk/BOOK/chapter04/patches.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter04/patches.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -1,382 +1,429 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="materials-patches">
-<title>Needed Patches</title>
-<?dbhtml filename="patches.html"?>
+  <?dbhtml filename="patches.html"?>
 
-<para>In addition to the packages, several patches are also required.
-These patches correct any mistakes in the packages that should be
-fixed by the maintainer.  The patches also make small modifications to
-make the packages easier to work with. The following patches will be
-needed to build an HLFS system:</para>
+  <title>Needed Patches</title>
 
-<variablelist role="materials">
+  <para>In addition to the packages, several patches are also required.
+  These patches correct any mistakes in the packages that should be
+  fixed by the maintainer.  The patches also make small modifications to
+  make the packages easier to work with. The following patches will be
+  needed to build an HLFS system:</para>
 
-<varlistentry>
-<term>Bash Upstream Fixes - 118 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;bash-&bash-version;-fixes-3.patch"/></para>
-</listitem>
-</varlistentry>
+  <variablelist role="materials">
 
-<varlistentry>
-<term>BLFS Bootscript Additions - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;blfs-bootscripts-&blfs-bootscripts-version;-hlfs-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Bash Upstream Fixes - &bash-fixes-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Binutils PT PaX - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;binutils-&binutils-version;-pt_pax-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Binutils PT PaX - &binutils-pt_pax-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-pt_pax-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-pt_pax-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>Binutils uClibc - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;binutils-&binutils-version;-uClibc_conf-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>Binutils uClibc - &binutils-uClibc_conf-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-uClibc_conf-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-uClibc_conf-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Bzip2 Hardened Cflags patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;bzip2-&bzip2-version;-hardened_cflags-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>BLFS Bootscript Additions - &blfs-bootscripts-hlfs-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&blfs-bootscripts-hlfs-patch;"/></para>
+        <para>MD5 sum: <literal>&blfs-bootscripts-hlfs-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Bzip2 Install Docs patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;bzip2-&bzip2-version;-install_docs-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Bzip2 bzgrep Security patch - &bzip2-bzgrep_security-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bzip2-bzgrep_security-patch;"/></para>
+        <para>MD5 sum: <literal>&bzip2-bzgrep_security-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Bzip2 bzgrep Security patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;bzip2-&bzip2-version;-bzgrep_security-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Bzip2 Hardened Cflags patch - &bzip2-hardened_cflags-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bzip2-hardened_cflags-patch;"/></para>
+        <para>MD5 sum: <literal>&bzip2-hardened_cflags-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Coreutils Suppress Uptime, Kill, Su Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Bzip2 Install Docs patch - &bzip2-install_docs-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bzip2-install_docs-patch;"/></para>
+        <para>MD5 sum: <literal>&bzip2-install_docs-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Coreutils Uname patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-uname_PIC-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Coreutils Suppress Uptime, Kill, Su Patch - &coreutils-suppress_uptime_kill_su-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&coreutils-suppress_uptime_kill_su-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-suppress_uptime_kill_su-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Expect Spawn Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;expect-&expect-version;-spawn-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Coreutils Uname patch - &coreutils-uname_PIC-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&coreutils-uname_PIC-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-uname_PIC-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Flex Brokenness Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;flex-&flex-version;-debian_fixes-3.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Expect Spawn Patch - &expect-spawn-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&expect-spawn-patch;"/></para>
+        <para>MD5 sum: <literal>&expect-spawn-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Flex Hardened Cflags Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;flex-&flex-version;-hardened_cflags-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Flex Brokenness Patch - &flex-debian_fixes-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&flex-debian_fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&flex-debian_fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Gawk Segfault Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gawk-&gawk-version;-segfault_fix-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Flex Hardened Cflags Patch - &flex-hardened_cflags-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&flex-hardened_cflags-patch;"/></para>
+        <para>MD5 sum: <literal>&flex-hardened_cflags-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term> GCC Hardened Cflags Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-hardened_cflags-1.patch"/></para>
-</listitem>
-</varlistentry>
- 
-<varlistentry>
-<term> GCC Linkonce Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-linkonce-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Gawk Segfault Patch - &gawk-segfault_fix-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gawk-segfault_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&gawk-segfault_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>GCC No-Fixincludes Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term> GCC Hardened Cflags Patch - &gcc-hardened_cflags-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-hardened_cflags-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-hardened_cflags-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>GCC Specs Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-specs_x86-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term> GCC Linkonce Patch - &gcc-linkonce-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-linkonce-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-linkonce-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry> 
-<term>GCC SSP Patch - ?? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;gcc-&gcc-version;-ssp-1.patch"/></para>
-</listitem> 
-</varlistentry>
+    <varlistentry>
+      <term>GCC No-Fixincludes Patch - &gcc-no_fixincludes-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-no_fixincludes-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-no_fixincludes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc"> 
-<term>GCC uClibc Configure Patch - ?? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;gcc-&gcc-version;-uClibc_conf-1.patch"/></para>
-</listitem> 
-</varlistentry>
+    <varlistentry>
+      <term>GCC Specs Patch - &gcc-specs_x86-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-specs_x86-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-specs_x86-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>GCC uClibc Libstdc++ Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-uClibc_libstdc++-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>GCC SSP Patch - &gcc-ssp-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-ssp-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-ssp-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>GCC uClibc Locale Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-uClibc_locale-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>GCC uClibc Configure Patch - &gcc-uClibc_conf-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-uClibc_conf-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-uClibc_conf-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="glibc">
-<term>Glibc arc4random Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;glibc-&glibc-version;-arc4random-2.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>GCC uClibc Libstdc++ Patch - &gcc-uClibc_libstdc-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-uClibc_libstdc-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-uClibc_libstdc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="glibc">
-<term>Glibc dl_execstack Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;glibc-&glibc-version;-dl_execstack_PaX-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>GCC uClibc Locale Patch - &gcc-uClibc_locale-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-uClibc_locale-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-uClibc_locale-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="glibc">
-<term>Glibc Fstack Protector Patch - ?? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;glibc-&glibc-version;-fstack_protector-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="glibc">
+      <term>Glibc arc4random Patch - &glibc-arc4random-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-arc4random-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-arc4random-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="glibc">
-<term>Glibc PAX Patch - ?? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;glibc-&glibc-version;-pt_pax-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="glibc">
+      <term>Glibc dl_execstack Patch - &glibc-dl_execstack_PaX-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-dl_execstack_PaX-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-dl_execstack_PaX-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="glibc">
-<term>Glibc SSP Patch - ?? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;glibc-&glibc-version;-ssp-2.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="glibc">
+      <term>Glibc Fstack Protector Patch - &glibc-fstack_protector-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-fstack_protector-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-fstack_protector-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>GR Security Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="http://www.grsecurity.net/grsecurity-2.1.8-2.6.14.6-200601211647.patch.gz"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="glibc">
+      <term>Glibc PAX Patch - &glibc-pt_pax-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-pt_pax-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-pt_pax-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Gzip Security Patch - ?? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;gzip-&gzip-version;-security_fixes-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="glibc">
+      <term>Glibc SSP Patch - &glibc-ssp-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-ssp-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-ssp-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Inetutils Kernel Headers Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>GR Security Patch - &grsecurity-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="http://www.grsecurity.net/&grsecurity-patch;.gz"/></para>
+        <para>MD5 sum: <literal>&grsecurity-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Inetutils No-Server-Man-Pages Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Gzip Security Patch - &gzip-security_fixes-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gzip-security_fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&gzip-security_fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Linux Pseudo Random Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;linux-&linux-version;-pseudo_random-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Inetutils Kernel Headers Patch - &inetutils-kernel_headers-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&inetutils-kernel_headers-patch;"/></para>
+        <para>MD5 sum: <literal>&inetutils-kernel_headers-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Linux-Libc-Headers Pseudo Random Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;linux-libc-headers-&linux-libc-headers-version;-pseudo_random-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Inetutils No-Server-Man-Pages Patch - &inetutils-no_server_man_pages-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&inetutils-no_server_man_pages-patch;"/></para>
+        <para>MD5 sum: <literal>&inetutils-no_server_man_pages-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Linux-Libc-Headers Unistd x86 PIC Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;linux-libc-headers-&linux-libc-headers-version;-unistd_x86_PIC-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Linux Pseudo Random Patch - &linux-pseudo_random-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&linux-pseudo_random-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-pseudo_random-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Mktemp Tempfile Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-3.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Linux-Libc-Headers Pseudo Random Patch - &linux-libc-headers-pseudo_random-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&linux-libc-headers-pseudo_random-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-libc-headers-pseudo_random-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Module-Init-Tools No Static Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;module-init-tools-&module-init-tools-version;-nostatic-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Linux-Libc-Headers Unistd x86 PIC Patch - &linux-libc-headers-unistd_x86_PIC-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&linux-libc-headers-unistd_x86_PIC-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-libc-headers-unistd_x86_PIC-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Perl Libc Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Mktemp Tempfile Patch - &mktemp-add_tempfile-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&mktemp-add_tempfile-patch;"/></para>
+        <para>MD5 sum: <literal>&mktemp-add_tempfile-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Perl Regex SSP Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;perl-&perl-version;-regex_ssp-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Module-Init-Tools No Static Patch - &module-init-tools-nostatic-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&module-init-tools-nostatic-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-tools-nostatic-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Procps Hardened Cflags Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;procps-&procps-version;-hardened_cflags-2.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Perl Libc Patch - &perl-libc-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>Sed uClibc Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;sed-&sed-version;-uClibc-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Perl Regex SSP Patch - &perl-regex_ssp-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&perl-regex_ssp-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-regex_ssp-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>Shadow uClibc Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;shadow-&shadow-version;-uClibc-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Procps Hardened Cflags Patch - &procps-hardened_cflags-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&procps-hardened_cflags-patch;"/></para>
+        <para>MD5 sum: <literal>&procps-hardened_cflags-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Sysklogd Fixes Patch - ? KB:</term>
-<listitem>
-<para><ulink
-url="&patches-root;sysklogd-&sysklogd-version;-fixes-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>Sed uClibc Patch - &sed-uClibc-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&sed-uClibc-patch;"/></para>
+        <para>MD5 sum: <literal>&sed-uClibc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Tar Sparse Fix - ? KB:</term>
-<listitem>
-<para><ulink
-url="&patches-root;tar-&tar-version;-sparse_fix-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>Shadow uClibc Patch - &shadow-uClibc-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&shadow-uClibc-patch;"/></para>
+        <para>MD5 sum: <literal>&shadow-uClibc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Texinfo Tempfile Patch - ? KB:</term>
-<listitem>
-<para><ulink
-url="&patches-root;texinfo-&texinfo-version;-tempfile_fix-2.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Sysklogd Fixes Patch - &sysklogd-fixes-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&sysklogd-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&sysklogd-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>uClibc arc4random Patch - ? KB:</term>
-<listitem> 
-<para><ulink url="&patches-root;uClibc-&uclibc-version;-arc4random-2.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Tar Sparse Fix - &tar-sparse_fix-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&tar-sparse_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&tar-sparse_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>uClibc Configure Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;uClibc-&uclibc-version;-config-3.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Texinfo Tempfile Patch - &texinfo-tempfile_fix-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&texinfo-tempfile_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&texinfo-tempfile_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry condition="uclibc">
-<term>uClibc Libc Stack End Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;uClibc-&uclibc-version;-libc_stack_end-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>uClibc arc4random Patch - &uClibc-arc4random-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&uClibc-arc4random-patch;"/></para>
+        <para>MD5 sum: <literal>&uClibc-arc4random-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Util-linux Cramfs Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-cramfs-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>uClibc Configure Patch - &uClibc-config-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&uClibc-config-patch;"/></para>
+        <para>MD5 sum: <literal>&uClibc-config-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Util-linux Hardened Cflags Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-hardened_cflags-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry condition="uclibc">
+      <term>uClibc Libc Stack End Patch - &uClibc-libc_stack_end-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&uClibc-libc_stack_end-patch;"/></para>
+        <para>MD5 sum: <literal>&uClibc-libc_stack_end-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Util-linux Nologin Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-nologin-1.patch"/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Util-linux Cramfs Patch - &util-linux-cramfs-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&util-linux-cramfs-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-cramfs-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<varlistentry>
-<term>Util-linux PIC Patch - ? KB:</term>
-<listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-PIC-1.patch"
-/></para>
-</listitem>
-</varlistentry>
+    <varlistentry>
+      <term>Util-linux Hardened Cflags Patch - &util-linux-hardened_cflags-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&util-linux-hardened_cflags-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-hardened_cflags-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-</variablelist>
+    <varlistentry>
+      <term>Util-linux Nologin Patch - &util-linux-nologin-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&util-linux-nologin-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-nologin-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
-<para>In addition to the above required patches, there exist a number of
-optional patches created by the LFS community. These optional patches
-solve minor problems or enable functionality that is not enabled by
-default. Feel free to peruse the patches database located at
-<ulink url="&lfs-root;patches/"/> and acquire any additional
-patches to suit the system needs.</para>
+    <varlistentry>
+      <term>Util-linux PIC Patch - &util-linux-PIC-patch-size;:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&util-linux-PIC-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-PIC-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
+  </variablelist>
+
+  <para>In addition to the above required patches, there exist a number of
+  optional patches created by the LFS community. These optional patches solve
+  minor problems or enable functionality that is not enabled by default. Feel
+  free to peruse the patches database located at <ulink url="&lfs-root;patches/"/>
+  and acquire any additional patches to suit the system needs.</para>
+
 </sect1>
-

Modified: trunk/BOOK/chapter05/binutils-cross.xml
===================================================================
--- trunk/BOOK/chapter05/binutils-cross.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/binutils-cross.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -38,7 +38,7 @@
 
 <para condition="uclibc">Apply the next patch to ... EDIT ME</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../binutils-&binutils-version;-uClibc_conf-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&binutils-uClibc_conf-patch;</userinput></screen>
 
 <para>The Binutils documentation recommends building Binutils outside of the
 source directory in a dedicated build directory:</para>

Modified: trunk/BOOK/chapter05/binutils.xml
===================================================================
--- trunk/BOOK/chapter05/binutils.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/binutils.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -38,11 +38,11 @@
 
 <para condition="uclibc">Apply the next patch to ... EDIT ME</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../binutils-&binutils-version;-uClibc_conf-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&binutils-uClibc_conf-patch;</userinput></screen>
 
 <para>Apply a patch to add elf header markings used by PaX and Grsecurity kernels.</para>
 
-<screen><userinput>patch -Np1 -i ../binutils-&binutils-version;-pt_pax-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&binutils-pt_pax-patch;</userinput></screen>
 
 <para>The Binutils documentation recommends building Binutils outside of the
 source directory in a dedicated build directory:</para>

Modified: trunk/BOOK/chapter05/bzip2.xml
===================================================================
--- trunk/BOOK/chapter05/bzip2.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/bzip2.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -32,7 +32,7 @@
 
 <para>Apply a patch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../bzip2-&bzip2-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-hardened_cflags-patch;</userinput></screen>
 
 <para>The Bzip2 package does not contain a <command>configure</command>
 script. Compile it with:</para>

Modified: trunk/BOOK/chapter05/expect.xml
===================================================================
--- trunk/BOOK/chapter05/expect.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/expect.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -32,7 +32,7 @@
 <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>
 

Modified: trunk/BOOK/chapter05/flex.xml
===================================================================
--- trunk/BOOK/chapter05/flex.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/flex.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -29,12 +29,12 @@
 
 <para>Apply a pqatch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&flex-hardened_cflags-patch;</userinput></screen>
 
 <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-debian_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 manual page

Modified: trunk/BOOK/chapter05/gcc-cross.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-cross.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/gcc-cross.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -41,23 +41,23 @@
 
 <para condition="uclibc">Apply this patch to add uClibc to the configure script.</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../gcc-&gcc-version;-uClibc_conf-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&gcc-uClibc_conf-patch;</userinput></screen>
 
 <para>GCC will try to use <filename class="directory">/tools/${target}/include</filename>
-because it is a cross compiler. The following command directs GCC to use 
+because it is a cross compiler. The following command directs GCC to use
 <filename class="directory">/tools/include</filename> instead:</para>
 
 <screen><userinput>sed -e 's@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
     -i gcc/Makefile.in</userinput></screen>
-    
+
 <para>This patch adds two configure options, <parameter>--with-dynamic-linker</parameter>
-and <parameter> --with-nostdinc</parameter>. It must be applied before the next command 
+and <parameter> --with-nostdinc</parameter>. It must be applied before the next command
 or else the patch will fail to apply:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-specs_x86-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-specs_x86-patch;</userinput></screen>
 
-<para>Set the start file prefix. This will default to <filename 
-class="directory">/tools/${target}/lib</filename>, but there's no need to install the 
+<para>Set the start file prefix. This will default to <filename
+class="directory">/tools/${target}/lib</filename>, but there's no need to install the
 start files there:</para>
 
 <screen><userinput>echo "

Modified: trunk/BOOK/chapter05/gcc.xml
===================================================================
--- trunk/BOOK/chapter05/gcc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/gcc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -44,11 +44,11 @@
 
 <para condition="uclibc">Apply these patches to ... EDIT ME:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../gcc-&gcc-version;-uClibc_conf-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-uClibc_libstdc++-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-uClibc_locale-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&gcc-uClibc_conf-patch;
+patch -Np1 -i ../&gcc-uClibc_libstdc-patch;
+patch -Np1 -i ../&gcc-uClibc_locale-patch;</userinput></screen>
 
-<para condition="uclibc">Use this command to hardcode 
+<para condition="uclibc">Use this command to hardcode
 <parameter>LIBS="-lintl"</parameter>:</para>
 
 <screen condition="uclibc"><userinput>sed -e 's/%{shared:-lc}/%{!nointl: -lintl} &/' \
@@ -56,9 +56,9 @@
 
 <para>This patch adds the stack protector code for GCC:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-ssp-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-ssp-patch;</userinput></screen>
 
-<para>The bugs URL and version strings are modified as the comments in 
+<para>The bugs URL and version strings are modified as the comments in
 <filename>version.c</filename> recommends:</para>
 
 <screen><userinput>sed -e 's at gcc.gnu.org/bugs.html at bugs.linuxfromscratch.org/@' \
@@ -66,8 +66,8 @@
 
 <para>Now correct a known problem and make an essential adjustment:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-specs_x86-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-specs_x86-patch;
+patch -Np1 -i ../&gcc-no_fixincludes-patch;</userinput></screen>
 
 <para>The first patch changes GCC's default location of the dynamic linker
 (typically <filename class="libraryfile">ld-linux.so.2</filename>). It also
@@ -133,7 +133,7 @@
 chapter 6, and when GCC is reinstalled. Since these commands are ugly to
 repeat it's best to dump them into a script, as it is done below.</para>
 
-<para>This will add <parameter>-fstack-protector-all</parameter> to the default 
+<para>This will add <parameter>-fstack-protector-all</parameter> to the default
 for <command>gcc</command> and <command>g++</command>. The only
 filter is for <parameter>-fno-stack-protector*</parameter>:</para>
 
@@ -143,17 +143,17 @@
     $(gcc --print-file specs) &&
 perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' \
     $(gcc --print-file specs) &&
-echo '*cc1_ssp: 
+echo '*cc1_ssp:
 %{!fno-stack-protector*: -fstack-protector-all}
 '    >> $(gcc --print-file specs)</literal>
 EOF</userinput></screen>
 
-<para>These commands will make <command>gcc -fPIC</command>, 
+<para>These commands will make <command>gcc -fPIC</command>,
 <command>ld -pie</command>, and <command>cpp -D__PIC__ -DPIC</command>
-the default. The exact default behavior for <command>gcc -pie</command> will be 
-preserved. If <parameter>-pie</parameter>, <parameter>-no-pie</parameter>, or 
+the default. The exact default behavior for <command>gcc -pie</command> will be
+preserved. If <parameter>-pie</parameter>, <parameter>-no-pie</parameter>, or
 <parameter>-static</parameter> are used then the vanilla behavior will be
-used instead. Additional filters are added to the link_command spec to prevent 
+used instead. Additional filters are added to the link_command spec to prevent
 libraries from receiving the <parameter>-pie</parameter> option.
 Read <xref linkend="technotes-pie"/> for more information on this.</para>
 
@@ -168,13 +168,13 @@
     $(gcc --print-file specs) &&
 perl -pi -e 's at pie:@!no-pie|pie:@g;' $(gcc --print-file specs) &&
 perl -pi -e 's@\*cpp:\n@$_%(cpp_pie) @;' $(gcc --print-file specs) &&
-echo '*cpp_pie: 
+echo '*cpp_pie:
 %{!static:%{!no-pie:%{!pie: -D__PIC__ -DPIC}}}
 ' >> $(gcc --print-file specs) &&
-echo '*cc1_pie: 
+echo '*cc1_pie:
 %{!static:%{!no-pie:%{!pie: -fPIC}}}
 ' >> $(gcc --print-file specs) &&
-echo '*link_pie: 
+echo '*link_pie:
 %{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r: %{!nonow: -z now} %{!norelro: -z relro} %{!shared:%{!Bshareable:%{!pie: -pie}}}}}}}}
 ' >> $(gcc --print-file specs)</literal>
 EOF</userinput></screen>
@@ -196,7 +196,7 @@
 
 <para>This program will create a buffer overflow with an array length 7. This
 will test that <parameter>-fstack-protector-all</parameter> is working. It will also print the
-<function> __guard[]</function> value. The <function>__guard</function> value 
+<function> __guard[]</function> value. The <function>__guard</function> value
 should change with each run.</para>
 
 <screen><userinput>cat > test.c << "EOF"
@@ -232,12 +232,12 @@
 <screen><userinput>g++ -pie -fPIE -o test2 test.c
 ./test2</userinput></screen>
 
-<para>The <command>g++</command> test should return something very similar. 
-The <function>__guard</function> value should change, and both tests should 
+<para>The <command>g++</command> test should return something very similar.
+The <function>__guard</function> value should change, and both tests should
 receive an abort signal. Your host system Syslog daemon should also log these events.</para>
 
 <para>Then make sure <command>gcc</command> is linking to <filename
-class="directory">tools</filename> and is creating position independent executables. 
+class="directory">tools</filename> and is creating position independent executables.
 Also make sure the GNU_RELRO, and PAX_FLAGS program headers exist:</para>
 
 <screen><userinput>readelf -l test{,2} | grep -e ': /tools' -e 'Shared' \
@@ -249,7 +249,7 @@
      [Requesting program interpreter: /tools/lib/ld-something.so]
  GNU_RELRO      0x000ef4 0x00001ef4 0x00001ef4 0x0010c 0x0010c R   0x1
  PAX_FLAGS      0x000000 0x00000000 0x00000000 0x00000 0x00000     0x4</computeroutput></screen>
- 
+
  <para>There are two more things to check for. The BIND_NOW section should exist.
 The TEXTREL section should not exist:</para>
 

Modified: trunk/BOOK/chapter05/glibc.xml
===================================================================
--- trunk/BOOK/chapter05/glibc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/glibc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -43,10 +43,10 @@
 <important><para>Be sure to unpack both Glibc and Glibc-Libidn packages before
 starting the build. Then, apply the patches:</para></important>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-arc4random-2.patch
-patch -Np1 -i ../glibc-&glibc-version;-ssp-2.patch
-patch -Np1 -i ../glibc-&glibc-version;-pt_pax-1.patch
-patch -Np1 -i ../glibc-&glibc-version;-dl_execstack_PaX-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-arc4random-patch;
+patch -Np1 -i ../&glibc-ssp-patch;
+patch -Np1 -i ../&glibc-pt_pax-patch;
+patch -Np1 -i ../&glibc-dl_execstack_PaX-patch;</userinput></screen>
 
 <para>The first patch adds SSP functions to <filename class="libraryfile">libc.a</filename>
 and <filename class="libraryfile">libc.so</filename>. The pt_pax patch
@@ -79,7 +79,7 @@
 <screen><userinput>make libgcc_eh="" gnulib="-lgcc" static-gnulib="-lgcc"</userinput></screen>
 
 <para>We need to use <parameter>libgcc_eh="" gnulib="-lgcc" static-gnulib="-lgcc"</parameter>
-because <filename class="libraryfile">libgcc_eh.a</filename> does not exist yet. Glibc does not 
+because <filename class="libraryfile">libgcc_eh.a</filename> does not exist yet. Glibc does not
 actually need <filename class="libraryfile">libgcc_eh</filename>, everything builds fine without it.</para>
 
 <para>To test the results, issue: <userinput>make check</userinput>. All test should pass.</para>
@@ -98,7 +98,7 @@
 localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro
 localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH 
+localedef -i en_PH -f ISO-8859-1 en_PH
 localedef -i en_US -f ISO-8859-1 en_US
 localedef -i es_MX -f ISO-8859-1 es_MX
 localedef -i fa_IR -f UTF-8 fa_IR

Modified: trunk/BOOK/chapter05/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/chapter05/linux-libc-headers.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/linux-libc-headers.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -29,21 +29,21 @@
 <sect2 role="installation">
 <title>Installation of Linux-Libc-Headers</title>
 
-<para>This patch adds sysctl definitions for <envar>KERN_ERANDOM</envar> and 
+<para>This patch adds sysctl definitions for <envar>KERN_ERANDOM</envar> and
 <envar>KERN_URANDOM</envar>:</para>
 
 <screen><userinput>patch --no-backup-if-mismatch -Np1 -i \
-    ../linux-libc-headers-&linux-libc-headers-version;-pseudo_random-1.patch</userinput></screen>
-    
+    ../&linux-libc-headers-pseudo_random-patch;</userinput></screen>
+
 <para>The meaning of the patch option:</para>
 
 <variablelist>
 <varlistentry>
 <term><parameter>--no-backup-if-mismatch</parameter></term>
-<listitem><para>Prevents <command>patch</command> from creating 
-<filename class="extension">.orig</filename> files, so they don't get installed to 
-<filename class="directory">/tools/include</filename>. <filename 
-class="extension">.orig</filename> files might be named something else 
+<listitem><para>Prevents <command>patch</command> from creating
+<filename class="extension">.orig</filename> files, so they don't get installed to
+<filename class="directory">/tools/include</filename>. <filename
+class="extension">.orig</filename> files might be named something else
 depending on the version of <command>patch</command>.</para></listitem>
 </varlistentry>
 </variablelist>

Modified: trunk/BOOK/chapter05/perl.xml
===================================================================
--- trunk/BOOK/chapter05/perl.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/perl.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,12 +30,12 @@
 <para>This version of Perl has a bug when compiled with SSP. This patch disables
 SSP on the affected file:</para>
 
-<screen><userinput>patch -Np1 -i ../perl-&perl-version;-regex_ssp-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&perl-regex_ssp-patch;</userinput></screen>
 
 <para>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 'Data/Dumper IO Fcntl POSIX'
 part of the command correct—they are all letters):</para>

Modified: trunk/BOOK/chapter05/sed.xml
===================================================================
--- trunk/BOOK/chapter05/sed.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/sed.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 <para condition="uclibc">This patch is from upstream to correct a bug with
 newer versions of uClibc:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../sed-&sed-version;-uClibc-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&sed-uClibc-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter05/uclibc-headers.xml
===================================================================
--- trunk/BOOK/chapter05/uclibc-headers.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/uclibc-headers.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,7 +31,7 @@
 
 <para>Apply a patch that adds a generic configuration:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-config-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-config-patch;</userinput></screen>
 
 <para>Prepare the uClibc headers:</para>
 

Modified: trunk/BOOK/chapter05/uclibc.xml
===================================================================
--- trunk/BOOK/chapter05/uclibc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/uclibc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -29,25 +29,25 @@
 <sect2 role="installation">
 <title>Installation of uClibc</title>
 
-<para>Apply a patch to add the <function>arc4random()</function> to uClibc, and 
+<para>Apply a patch to add the <function>arc4random()</function> to uClibc, and
 hooks for <command>mktemp</command>(3) and SSP to use it:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-arc4random-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-arc4random-patch;</userinput></screen>
 
 <para>The next patch adds a generic config file. The key features to switch on are PIC,
 arc4random, locales and SSP. This will build with standard features. In chapter 6 you
 will be able to configure uClibc to your more specific needs:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-config-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-config-patch;</userinput></screen>
 
 <para>This version of uClibc can cause an undefined reference error to
 __libc_stack_end. This patch is only needed in chapter 5:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-libc_stack_end-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-libc_stack_end-patch;</userinput></screen>
 
 <para>Put the pre-generated locale tarball where uClibc can find it:</para>
 
-<screen><userinput>install -m444 ../uClibc-locale-030818.tgz extra/locale/</userinput></screen>
+<screen><userinput>install -m444 ../uClibc-locale-&uclibc-locale-version;.tgz extra/locale/</userinput></screen>
 
 <para>Use these commands to remove size reducing optimizations, which also tend
 to reduce performance:</para>
@@ -83,8 +83,8 @@
 <sect2 role="installation">
 <title>Libintl: Gettext &gettext-version;</title>
 
-<para>The <filename class="libraryfile">libintl</filename> that come with uClibc 
-is not finished yet. Gettext includes the GNU version of <filename 
+<para>The <filename class="libraryfile">libintl</filename> that come with uClibc
+is not finished yet. Gettext includes the GNU version of <filename
 class="libraryfile">libintl.so</filename> which we can use. Unpack the Gettext source
 and enter its directory. Then go in the runtime dir:</para>
 
@@ -99,16 +99,16 @@
 make -C intl/
 make -C intl/ install</userinput></screen>
 
-<para>Most packages do not support external <filename 
-class="libraryfile">libintl</filename> very well. Support for external 
-<filename class="libraryfile">libintl</filename>/<filename 
+<para>Most packages do not support external <filename
+class="libraryfile">libintl</filename> very well. Support for external
+<filename class="libraryfile">libintl</filename>/<filename
 class="libraryfile">libiconv</filename> only works in the latest versions of
 Autoconf. It might be ten years before everyone upgrades their Autoconf;
-until then we can use the GCC specs to automatically link <filename 
-class="libraryfile">libintl</filename> to everything. Later when we build 
-GCC we can hardcode this. If you ever do not want to link a package to 
-<filename class="libraryfile">libintl</filename> simply use 
-<parameter>CFLAGS="-nointl"</parameter>. The next command will add 
+until then we can use the GCC specs to automatically link <filename
+class="libraryfile">libintl</filename> to everything. Later when we build
+GCC we can hardcode this. If you ever do not want to link a package to
+<filename class="libraryfile">libintl</filename> simply use
+<parameter>CFLAGS="-nointl"</parameter>. The next command will add
 <parameter>-lintl</parameter> without changing anything else:</para>
 
 <screen><userinput>sed -e 's/%{shared:-lc}/%{!nointl: -lintl} &/' \

Modified: trunk/BOOK/chapter05/util-linux.xml
===================================================================
--- trunk/BOOK/chapter05/util-linux.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter05/util-linux.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -27,10 +27,10 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
-<para>Util-linux needs this patch to compile with 
+<para>Util-linux needs this patch to compile with
 <parameter>-fpic</parameter>/<parameter>-fpie</parameter>:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-hardened_cflags-patch;</userinput></screen>
 
 <para>Util-linux does not use the freshly installed headers and
 libraries from the <filename class="directory">/tools</filename>

Modified: trunk/BOOK/chapter06/bash.xml
===================================================================
--- trunk/BOOK/chapter06/bash.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/bash.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 
 <para>This patch applies upstream bug fixes:</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>Amend <filename>Makefile.in</filename>:</para>
 
@@ -48,7 +48,7 @@
 <varlistentry>
 <term><parameter>--with-installed-readline</parameter></term>
 <listitem><para>This options tells Bash to use the
-<filename class="libraryfile">readline</filename> library that is already installed 
+<filename class="libraryfile">readline</filename> library that is already installed
 on the system rather than using its own readline version.</para></listitem>
 </varlistentry>
 </variablelist>

Modified: trunk/BOOK/chapter06/binutils.xml
===================================================================
--- trunk/BOOK/chapter06/binutils.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/binutils.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -41,11 +41,11 @@
 
 <para condition="uclibc">Apply the next patch to ... EDIT ME</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../binutils-&binutils-version;-uClibc_conf-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&binutils-uClibc_conf-patch;</userinput></screen>
 
 <para>Apply the next patch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../binutils-&binutils-version;-pt_pax-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&binutils-pt_pax-patch;</userinput></screen>
 
 <para>The Binutils documentation recommends building Binutils outside of the
 source directory in a dedicated build directory:</para>
@@ -63,11 +63,11 @@
 
 <screen><userinput>make tooldir=/usr</userinput></screen>
 
-<para>Run the test suite if you like. The objcopy test have a bug. It is not 
-respecting a modified <envar>CC</envar>, <envar>CXX</envar>, 
-<envar>CFLAGS</envar>, or <envar>CXXFLAGS</envar> environment, 
-and so 3 tests fail due to <parameter>-fpic</parameter> and 
-<parameter>-fstack-protector</parameter>. The tests can pass if we 
+<para>Run the test suite if you like. The objcopy test have a bug. It is not
+respecting a modified <envar>CC</envar>, <envar>CXX</envar>,
+<envar>CFLAGS</envar>, or <envar>CXXFLAGS</envar> environment,
+and so 3 tests fail due to <parameter>-fpic</parameter> and
+<parameter>-fstack-protector</parameter>. The tests can pass if we
 clear the specs file:</para>
 
 <screen><userinput>gcc -dumpspecs > $(gcc --print-file specs)
@@ -101,7 +101,7 @@
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
 <segtitle>Installed libraries</segtitle>
-<seglistitem><seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump, 
+<seglistitem><seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
 ranlib, readelf, size, strings, and strip</seg>
 <seg>libbfd.[a,so], and libopcodes.[a,so]</seg></seglistitem>
 </segmentedlist>
@@ -158,7 +158,7 @@
 <varlistentry id="ld">
 <term><command>ld</command></term>
 <listitem>
-<para>A linker that combines a number of object and archive files into a single file, 
+<para>A linker that combines a number of object and archive files into a single file,
 relocating their data and tying up symbol references</para>
 <indexterm zone="ch-system-binutils ld"><primary sortas="b-ld">ld</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter06/bzip2.xml
===================================================================
--- trunk/BOOK/chapter06/bzip2.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/bzip2.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -32,18 +32,18 @@
 
 <para>Apply a patch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../bzip2-&bzip2-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-hardened_cflags-patch;</userinput></screen>
 
 <para>This patch adds documentation for bzip2:</para>
 
-<screen><userinput>patch -Np1 -i ../bzip2-1.0.3-install_docs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-install_docs-patch;</userinput></screen>
 
 <para>The <command>bzgrep</command> command does not escape '|' and '&' 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-1.0.3-bzgrep_security-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bzip2-bzgrep_security-patch;</userinput></screen>
 
 <para>Prepare Bzip2 for compilation with:</para>
 
@@ -93,7 +93,7 @@
 <segtitle>Installed libraries</segtitle>
 <seglistitem><seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff,
 bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover, bzless, and bzmore</seg>
-<seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to 
+<seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
 libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg></seglistitem>
 </segmentedlist>
 

Modified: trunk/BOOK/chapter06/coreutils.xml
===================================================================
--- trunk/BOOK/chapter06/coreutils.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/coreutils.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -32,13 +32,13 @@
 <para>This patch fixes 'uname -p' to return a usefull value, which can be used
 by GCC. It currently only works on x86 architectures:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-uname_PIC-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&coreutils-uname_PIC-patch;</userinput></screen>
 
 <para>Prevent Coreutils from installing binaries that will be later be
 installed by other packages:</para>
 
 <screen><userinput>patch -Np1 -i \
-    ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen>
+    ../&coreutils-suppress_uptime_kill_su-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 
@@ -164,7 +164,7 @@
 <varlistentry id="chroot">
 <term><command>chroot</command></term>
 <listitem>
-<para>Runs a command with the specified directory as the 
+<para>Runs a command with the specified directory as the
 <filename class="directory">/</filename> directory</para>
 <indexterm zone="ch-system-coreutils chroot"><primary sortas="b-chroot">chroot</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter06/flex.xml
===================================================================
--- trunk/BOOK/chapter06/flex.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/flex.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,11 +31,11 @@
 
 <para>Apply a patch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&flex-hardened_cflags-patch;</userinput></screen>
 
 <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-debian_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 manual page
@@ -59,10 +59,10 @@
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Some packages, like Syslog-ng, need the static version of 
-<filename class="libraryfile">libflex</filename>. Also, there are some 
-packages that expect to find the <filename class="libraryfile">lex</filename> 
-library in <filename class="directory">/usr/lib</filename>. Create a symlink 
+<para>Some packages, like Syslog-ng, need the static version of
+<filename class="libraryfile">libflex</filename>. Also, there are some
+packages that expect to find the <filename class="libraryfile">lex</filename>
+library in <filename class="directory">/usr/lib</filename>. Create a symlink
 to account for this:</para>
 
 <screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>

Modified: trunk/BOOK/chapter06/gawk.xml
===================================================================
--- trunk/BOOK/chapter06/gawk.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/gawk.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 
 <para>This patch corrects a bug when <command>gawk</command> is run on a non-existant file:</para>
 
-<screen><userinput>patch -Np1 -i ../gawk-&gawk-version;-segfault_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gawk-segfault_fix-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 
@@ -62,7 +62,7 @@
 
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
-<seglistitem><seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk, 
+<seglistitem><seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
 pgawk, pgawk-&gawk-version;, and pwcat</seg></seglistitem>
 </segmentedlist>
 

Modified: trunk/BOOK/chapter06/gcc.xml
===================================================================
--- trunk/BOOK/chapter06/gcc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/gcc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -48,11 +48,11 @@
 <para condition="uclibc">Apply these patches. The locale patch is needed
 even without locales installed:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../gcc-&gcc-version;-uClibc_conf-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-uClibc_libstdc++-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-uClibc_locale-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&gcc-uClibc_conf-patch;
+patch -Np1 -i ../&gcc-uClibc_libstdc-patch;
+patch -Np1 -i ../&gcc-uClibc_locale-patch;</userinput></screen>
 
-<para condition="uclibc">Use this command to hardcode 
+<para condition="uclibc">Use this command to hardcode
 <parameter>LIBS="-lintl"</parameter>:</para>
 
 <screen condition="uclibc"><userinput>sed -e 's/%{shared:-lc}/%{!nointl: -lintl} &/' \
@@ -60,17 +60,17 @@
 
 <para>Apply this set of patches:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-hardened_cflags-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-specs_x86-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-ssp-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-hardened_cflags-patch;
+patch -Np1 -i ../&gcc-specs_x86-patch;
+patch -Np1 -i ../&gcc-no_fixincludes-patch;
+patch -Np1 -i ../&gcc-ssp-patch;
+patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen>
 
 <para>Fix <filename>libiberty/Makefile.in</filename>:</para>
 
 <screen><userinput>sed -e 's/install_to_$(INSTALL_DEST) //' -i libiberty/Makefile.in</userinput></screen>
 
-<para>The bugs URL and version strings are modified as the comments in 
+<para>The bugs URL and version strings are modified as the comments in
 <filename>version.c</filename> recommends:</para>
 
 <screen><userinput>sed -e 's at gcc.gnu.org/bugs.html at bugs.linuxfromscratch.org/@' \
@@ -101,8 +101,8 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make -k check</userinput>. 
-The results should be identical to results you would typically get from an LFS build. 
+<para>To test the results, issue: <userinput>make -k check</userinput>.
+The results should be identical to results you would typically get from an LFS build.
 There is an SSP test in <filename class="directory">gcc.misc-tests/</filename>
 which should pass.</para>
 
@@ -140,8 +140,8 @@
 
 <screen condition="uclibc"><userinput>rm /usr/lib/libc.a</userinput></screen>
 
-<important><para>Now you must return to <xref linkend="testing-gcc"/> to repeat the 
-sanity checks, but removing <parameter>-e ': /tools'</parameter> from the third 
+<important><para>Now you must return to <xref linkend="testing-gcc"/> to repeat the
+sanity checks, but removing <parameter>-e ': /tools'</parameter> from the third
 test.</para></important>
 
 </sect2>

Modified: trunk/BOOK/chapter06/glibc.xml
===================================================================
--- trunk/BOOK/chapter06/glibc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/glibc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -12,7 +12,7 @@
 </indexterm>
 
 <sect2 role="package"><title/>
-<para>The Glibc package contains the main C library. This library provides 
+<para>The Glibc package contains the main C library. This library provides
 the basic routines for allocating memory, searching directories, opening and
 closing files, reading and writing files, string handling, pattern matching,
 arithmetic, and so on.</para>
@@ -44,18 +44,18 @@
 <important><para>Be sure to unpack both Glibc and Glibc-Libidn packages before starting
 the build. Then, apply the patches:</para></important>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-arc4random-2.patch
-patch -Np1 -i ../glibc-&glibc-version;-ssp-2.patch
-patch -Np1 -i ../glibc-&glibc-version;-fstack_protector-1.patch
-patch -Np1 -i ../glibc-&glibc-version;-pt_pax-1.patch
-patch -Np1 -i ../glibc-&glibc-version;-dl_execstack_PaX-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-arc4random-patch;
+patch -Np1 -i ../&glibc-ssp-patch;
+patch -Np1 -i ../&glibc-fstack_protector-patch;
+patch -Np1 -i ../&glibc-pt_pax-patch;
+patch -Np1 -i ../&glibc-dl_execstack_PaX-patch;</userinput></screen>
 
 <para>The fstack_protector patch adds <parameter>-fstack-protector-all</parameter>
-to selected utilities and libraries. <filename class="libraryfile">libc.so</filename>, 
-<filename class="libraryfile">ld.so</filename>, <filename 
+to selected utilities and libraries. <filename class="libraryfile">libc.so</filename>,
+<filename class="libraryfile">ld.so</filename>, <filename
 class="libraryfile">libbsd-compat.so</filename>, and other libraries which
-do not preload <filename class="libraryfile">libc.so</filename> are skipped. This patch 
-will work to override the <parameter>-fno-stack-protector</parameter> option used in 
+do not preload <filename class="libraryfile">libc.so</filename> are skipped. This patch
+will work to override the <parameter>-fno-stack-protector</parameter> option used in
 the <envar>CC</envar> environment variable below.</para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
@@ -64,21 +64,21 @@
 <screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen>
 
-<para>While Glibc can be built with <parameter>-pie</parameter> and 
-<parameter>-fPIC</parameter> (with a small patch) all of Glibc's utilities have 
+<para>While Glibc can be built with <parameter>-pie</parameter> and
+<parameter>-fPIC</parameter> (with a small patch) all of Glibc's utilities have
 non-pic assembly code in them. If they're linked with <parameter>-pie</parameter>
-they will not be able to run on a kernel disallowing text relocation. Hence, there is no 
-advantage to using PIE in Glibc's build, but there are disadvantages. For this reason 
-the <parameter>-no-pie</parameter> option is added for Glibc so the applications 
-will be dynamically linked, this way they will be able to run on a kernel disallowing text 
-relocation. Glibc is aware of ld <parameter>-z now</parameter> and 
+they will not be able to run on a kernel disallowing text relocation. Hence, there is no
+advantage to using PIE in Glibc's build, but there are disadvantages. For this reason
+the <parameter>-no-pie</parameter> option is added for Glibc so the applications
+will be dynamically linked, this way they will be able to run on a kernel disallowing text
+relocation. Glibc is aware of ld <parameter>-z now</parameter> and
 <parameter>-z relro</parameter> options and it uses them where they are
 appropriate. Prepare Glibc for compilation:</para>
 
-<para>The <parameter>--enable-bind-now</parameter> configure option enables 
-a new linker option (<command>ld -z now</command>) for non-lazy run time binding. 
+<para>The <parameter>--enable-bind-now</parameter> configure option enables
+a new linker option (<command>ld -z now</command>) for non-lazy run time binding.
 See these URLs for more details:
-<ulink url="http://sources.redhat.com/ml/libc-alpha/2004-03/msg00075.html"/>, 
+<ulink url="http://sources.redhat.com/ml/libc-alpha/2004-03/msg00075.html"/>,
 <ulink url="http://elfsh.segfault.net/papers/elf-rtld.txt"/>.</para>
 
 <screen><userinput>env CC="gcc -fno-stack-protector -no-pie" \
@@ -104,9 +104,9 @@
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Remove the static libs. GCC seems to need <filename 
-class="libraryfile">libc_nonshared.a</filename> to compile. <filename 
-class="libraryfile">libpthread_nonshared.a</filename> it needed to be able 
+<para>Remove the static libs. GCC seems to need <filename
+class="libraryfile">libc_nonshared.a</filename> to compile. <filename
+class="libraryfile">libpthread_nonshared.a</filename> it needed to be able
 to reinstall Glibc in the future. <filename class="libraryfile">libc.a</filename>
 is needed for GCC's test suite, and can be removed later.
 <filename class="libraryfile">libdl.a</filename> is needed for Binutils
@@ -234,7 +234,7 @@
 localedef, mtrace, nscd, nscd_nischeck, pcprofiledump, pt_chown, rpcgen,
 rpcinfo, sln, sprof, tzselect, xtrace, zdump, and zic</seg>
 <seg>ld.so, libBrokenLocale.[a,so],
-libSegFault.so, libanl.[a,so], libbsd-compat.a, libc.[a,so], 
+libSegFault.so, libanl.[a,so], libbsd-compat.a, libc.[a,so],
 libcrypt.[a,so], libdl.[a,so], libg.a, libieee.a, libm.[a,so], libmcheck.a,
 libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so, libnss_files.so,
 libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so, libpcprofile.so,

Modified: trunk/BOOK/chapter06/gzip.xml
===================================================================
--- trunk/BOOK/chapter06/gzip.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/gzip.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 <title>Installation of Gzip</title>
 
 <para>Gzip has two known security bugs. This patch fixes them:</para>
-<screen><userinput>patch -Np1 -i ../gzip-&gzip-version;-security_fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gzip-security_fixes-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/inetutils.xml
===================================================================
--- trunk/BOOK/chapter06/inetutils.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/inetutils.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -36,14 +36,14 @@
 <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-no_server_man_pages-patch;</userinput></screen>
 
 <para>Prepare Inetutils for compilation:</para>
 

Modified: trunk/BOOK/chapter06/linux-libc-headers.xml
===================================================================
--- trunk/BOOK/chapter06/linux-libc-headers.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/linux-libc-headers.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -34,9 +34,9 @@
 <para>Apply the patches:</para>
 
 <screen><userinput>patch --no-backup-if-mismatch -Np1 -i \
-    ../linux-libc-headers-&linux-libc-headers-version;-pseudo_random-1.patch
+    ../&linux-libc-headers-pseudo_random-patch;
 patch --no-backup-if-mismatch -Np1 -i \
-    ../linux-libc-headers-&linux-libc-headers-version;-unistd_x86_PIC-1.patch</userinput></screen>
+    ../&linux-libc-headers-unistd_x86_PIC-patch;</userinput></screen>
 
 <para>Install the headers files:</para>
 

Modified: trunk/BOOK/chapter06/mktemp.xml
===================================================================
--- trunk/BOOK/chapter06/mktemp.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/mktemp.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -37,9 +37,9 @@
 to <command>mktemp</command>. Patch Mktemp to include a
 <command>tempfile</command> wrapper:</para>
 
-<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&mktemp-add_tempfile-patch;</userinput></screen>
 
-<para>Prepare Mktemp for compilation, using <filename 
+<para>Prepare Mktemp for compilation, using <filename
 class="devicefile">/dev/erandom</filename> as for the random device:</para>
 
 <screen><userinput>./configure --prefix=/usr --with-libc \
@@ -50,7 +50,7 @@
 <variablelist>
 <varlistentry>
 <term><parameter>--with-libc</parameter></term>
-<listitem><para>This causes the <command>mktemp</command> program to 
+<listitem><para>This causes the <command>mktemp</command> program to
 use the <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
 functions from the system C library.</para></listitem>
 </varlistentry>
@@ -90,7 +90,7 @@
 <varlistentry id="tempfile">
 <term><command>tempfile</command></term>
 <listitem>
-<para>Creates temporary files in a less secure manner than 
+<para>Creates temporary files in a less secure manner than
 <command>mktemp</command>; it is installed for backwards-compatibility</para>
 <indexterm zone="ch-system-mktemp tempfile"><primary sortas="b-tempfile">tempfile</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter06/module-init-tools.xml
===================================================================
--- trunk/BOOK/chapter06/module-init-tools.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/module-init-tools.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -29,10 +29,10 @@
 <sect2 role="installation">
 <title>Installation of Module-Init-Tools</title>
 
-<para>This patch removes <command>insmod.static</command>, it is not needed 
+<para>This patch removes <command>insmod.static</command>, it is not needed
 on modern Linux systems:</para>
 
-<screen><userinput>patch -Np1 -i ../module-init-tools-&module-init-tools-version;-nostatic-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&module-init-tools-nostatic-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/perl.xml
===================================================================
--- trunk/BOOK/chapter06/perl.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/perl.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,7 +31,7 @@
 <para>This version of Perl has a bug when compiled with SSP. This patch disables
 SSP on the affected file:</para>
 
-<screen><userinput>patch -Np1 -i ../perl-&perl-version;-regex_ssp-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&perl-regex_ssp-patch;</userinput></screen>
 
 <para>To have full control over the way Perl is set up, run the
 interactive <command>Configure</command> script and hand-pick the way
@@ -68,7 +68,7 @@
 
 <screen><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
 
-<para>To test the results, issue: <userinput>make test</userinput>. 
+<para>To test the results, issue: <userinput>make test</userinput>.
 There may be 3 failed tests.</para>
 
 <para>Install the package:</para>

Modified: trunk/BOOK/chapter06/procps.xml
===================================================================
--- trunk/BOOK/chapter06/procps.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/procps.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 
 <para>Apply a patch to ... EDIT ME</para>
 
-<screen><userinput>patch -Np1 -i ../procps-&procps-version;-hardened_cflags-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&procps-hardened_cflags-patch;</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -176,7 +176,7 @@
 <varlistentry id="watch">
 <term><command>watch</command></term>
 <listitem>
-<para>Runs a given command repeatedly, displaying the first screen-full of its 
+<para>Runs a given command repeatedly, displaying the first screen-full of its
 output; this allows a user to watch the output change over time</para>
 <indexterm zone="ch-system-procps watch"><primary sortas="b-watch">watch</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter06/sed.xml
===================================================================
--- trunk/BOOK/chapter06/sed.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/sed.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,7 +31,7 @@
 <para condition="uclibc">This patch is from upstream to correct a bug with
 newer versions of uClibc:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../sed-&sed-version;-uClibc-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&sed-uClibc-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/shadow.xml
===================================================================
--- trunk/BOOK/chapter06/shadow.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/shadow.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -35,7 +35,7 @@
 
 <para condition="uclibc">Apply this patch for uClibc:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../shadow-&shadow-version;-uClibc-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../&shadow-uClibc-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 
@@ -342,7 +342,7 @@
 <varlistentry id="pwck">
 <term><command>pwck</command></term>
 <listitem>
-<para>Verifies the integrity of the password files 
+<para>Verifies the integrity of the password files
 <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename></para>
 <indexterm zone="ch-system-shadow pwck"><primary sortas="b-pwck">pwck</primary></indexterm>
 </listitem>
@@ -404,7 +404,7 @@
 <term><command>usermod</command></term>
 <listitem>
 <para>Is used to modify the given user's login name, User
-Identification (UID), 
+Identification (UID),
 shell, initial group, home directory, etc.</para>
 <indexterm zone="ch-system-shadow usermod"><primary sortas="b-usermod">usermod</primary></indexterm>
 </listitem>
@@ -422,7 +422,7 @@
 <varlistentry id="vipw">
 <term><command>vipw</command></term>
 <listitem>
-<para>Edits the <filename>/etc/passwd</filename> or 
+<para>Edits the <filename>/etc/passwd</filename> or
 <filename>/etc/shadow</filename> files</para>
 <indexterm zone="ch-system-shadow vipw"><primary sortas="b-vipw">vipw</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter06/sysklogd.xml
===================================================================
--- trunk/BOOK/chapter06/sysklogd.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/sysklogd.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,7 +31,7 @@
 <para>Apply this patch to upgrade Sysklogd from CVS. This fixes several bugs,
 including fixing issues with 2.6 kernel headers:</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>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/tar.xml
===================================================================
--- trunk/BOOK/chapter06/tar.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/tar.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -30,7 +30,7 @@
 
 <para>This patch is from upstream and fixes a bug with the -S switch:</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>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/texinfo.xml
===================================================================
--- trunk/BOOK/chapter06/texinfo.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/texinfo.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,7 +31,7 @@
 
 <para>This patch fixes a vulnerability with tempfiles created by Texinfo:</para>
 
-<screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;-tempfile_fix-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
 
 <para>Amend <filename>Makefile.in</filename>:</para>
 

Modified: trunk/BOOK/chapter06/uclibc.xml
===================================================================
--- trunk/BOOK/chapter06/uclibc.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/uclibc.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -32,7 +32,7 @@
 
 <para>First apply a patch to add arc4random support:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-arc4random-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-arc4random-patch;</userinput></screen>
 
 <para>Put the pre-generated locale tarball where uClibc can find it:</para>
 
@@ -42,7 +42,7 @@
 to reduce performance:</para>
 
 <screen><userinput>sed -e '/mpreferred-stack-boundary/d' \
-    -e '/falign-jumps/d' -i Rules.mak 
+    -e '/falign-jumps/d' -i Rules.mak
 sed -e 's/-Os,//' -i Rules.mak</userinput></screen>
 
 <para>This will load performance enhancing optimizations. Add to this if you
@@ -54,22 +54,22 @@
 
 <para>This patch will get you started:</para>
 
-<screen><userinput>patch -Np1 -i ../uClibc-&uclibc-version;-config-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&uClibc-config-patch;</userinput></screen>
 
 <para>Next run menuconfig. This is very similar to the kernel's menuconfig.
-If you want to install locales you will need to fetch the 
+If you want to install locales you will need to fetch the
 <filename>uClibc-locale-030818.tgz</filename> package from the uClibc.org website, and do:
 <userinput>install -m444 ../uClibc-locale-030818.tgz extra/locale/</userinput>.</para>
 
-<para><envar>UCLIBC_HAS_WCHAR</envar> is needed to build <command>g++</command>. 
-<envar>UCLIBC_HAS_RPC</envar> is needed to build Util-Linux 
-(<command>nfsmount</command>). <envar>UCLIBC_HAS_FULL_RPC</envar> is not 
-required, but Util-Linux will use pre-generated data if it is not enabled. 
-<envar>DO_C99_MATH</envar> is needed for Iproute2 for the <function>rint</function>(3) 
-function. <envar>UCLIBC_HAS_GLIBC_CUSTOM_PRINTF</envar> 
-(<filename class="headerfile">printf.h</filename>) is needed for some packages, like 
+<para><envar>UCLIBC_HAS_WCHAR</envar> is needed to build <command>g++</command>.
+<envar>UCLIBC_HAS_RPC</envar> is needed to build Util-Linux
+(<command>nfsmount</command>). <envar>UCLIBC_HAS_FULL_RPC</envar> is not
+required, but Util-Linux will use pre-generated data if it is not enabled.
+<envar>DO_C99_MATH</envar> is needed for Iproute2 for the <function>rint</function>(3)
+function. <envar>UCLIBC_HAS_GLIBC_CUSTOM_PRINTF</envar>
+(<filename class="headerfile">printf.h</filename>) is needed for some packages, like
 Reiserfsprogs, but nothing in the base system. <envar>UCLIBC_HAS_WORDEXP</envar>
-is needed to install Alsa-Lib. Enable all the security options, ignore the 
+is needed to install Alsa-Lib. Enable all the security options, ignore the
 SSP kill signal option (they all do the same thing). Use your own judgment for the rest. The
 <command>make defconfig</command> and <command>make allyesconfig</command>
 targets are not recommended.</para>
@@ -78,7 +78,7 @@
 
 <screen><userinput>make menuconfig</userinput></screen>
 
-<para>The run time path gets hard coded into <command>ldd</command>, and so on. 
+<para>The run time path gets hard coded into <command>ldd</command>, and so on.
 So we reset these installations paths now before compiling anything. While we're at it
 we can tell uClibc where to find the new kernel headers:</para>
 
@@ -154,7 +154,7 @@
 <sect2 id="conf-timezone" role="configuration"><title>Configuring the Timezone</title>
 <indexterm zone="conf-timezone"><primary sortas="e-/etc/TZ">/etc/TZ</primary></indexterm>
 
-<para>The system timezone is set with the <filename>/etc/TZ</filename> file. Users can 
+<para>The system timezone is set with the <filename>/etc/TZ</filename> file. Users can
 use the <envar>TZ</envar> environment variable for their local time. See <ulink
 url="http://www.opengroup.org/onlinepubs/007904975/basedefs/xbd_chap08.html"/>
 and/or <ulink url="http://leaf.sourceforge.net/doc/guide/buci-tz.html#id2599108"/>

Modified: trunk/BOOK/chapter06/util-linux.xml
===================================================================
--- trunk/BOOK/chapter06/util-linux.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter06/util-linux.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -46,28 +46,28 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
-<para>If you want to encrypt your swap space, which is especially usefull with GnuPG, a hint 
+<para>If you want to encrypt your swap space, which is especially usefull with GnuPG, a hint
 is available at <ulink
 url="http://www.linuxfromscratch.org/hints/downloads/files/eswap.txt"/>.</para>
 
 <para>This patch fixes problems with fdisk seek functions when compiled with
 position independence:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-PIC-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-PIC-patch;</userinput></screen>
 
 <para>Util-linux has a compilation error against newer versions of
 Linux-Libc-Headers.  The following patch properly fixes that 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>This patch adds <command>/sbin/nologin</command>, which is a replacement for 
+<para>This patch adds <command>/sbin/nologin</command>, which is a replacement for
 <command>/bin/false</command>. It displays a polite reason for disallowing login:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-nologin-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-nologin-patch;</userinput></screen>
 
 <para>Apply this patch to add -fpie when compiling program executables:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-hardened_cflags-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-hardened_cflags-patch;</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 
@@ -102,8 +102,8 @@
 <screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
 mv /usr/bin/logger /bin</userinput></screen>
 
-<para>The <command>/sbin/nologin</command> program can read 
-<filename>/etc/nologin.txt</filename> to display the message in it. If this file 
+<para>The <command>/sbin/nologin</command> program can read
+<filename>/etc/nologin.txt</filename> to display the message in it. If this file
 does not exist it will use a hardcoded message instead:</para>
 
 <screen><userinput>echo "This account is not available." > /etc/nologin.txt</userinput></screen>
@@ -114,13 +114,13 @@
 
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
-<seglistitem><seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt, 
-colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk, 
-fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line, 
-logger, look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, 
-more, mount, namei, pg, pivot_root, ramsize (link to rdev), raw, rdev, readprofile, 
-rename, renice, rev, rootflags (link to rdev), script, setfdprm, setsid, setterm, 
-sfdisk, swapdev, swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode (link to rdev), 
+<seglistitem><seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
+colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
+fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line,
+logger, look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+more, mount, namei, pg, pivot_root, ramsize (link to rdev), raw, rdev, readprofile,
+rename, renice, rev, rootflags (link to rdev), script, setfdprm, setsid, setterm,
+sfdisk, swapdev, swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode (link to rdev),
 whereis, and write</seg></seglistitem>
 </segmentedlist>
 
@@ -213,7 +213,7 @@
 <varlistentry id="ctrlaltdel">
 <term><command>ctrlaltdel</command></term>
 <listitem>
-<para>Sets the function of the Ctrl+Alt+Del key combination to a hard or a 
+<para>Sets the function of the Ctrl+Alt+Del key combination to a hard or a
 soft reset</para>
 <indexterm zone="ch-system-util-linux ctrlaltdel"><primary sortas="b-ctrlaltdel">ctrlaltdel</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/chapter07/bootscripts.xml
===================================================================
--- trunk/BOOK/chapter07/bootscripts.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter07/bootscripts.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -31,18 +31,18 @@
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Unpack BLFS-Bootscripts. The patch adds <filename 
+<para>Unpack BLFS-Bootscripts. The patch adds <filename
 class="devicefile">frandom</filename> to <command>random</command>'s start
 command:</para>
 
-<screen><userinput>patch -Np1 -i ../blfs-bootscripts-&blfs-bootscripts-version;-hlfs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&blfs-bootscripts-hlfs-patch;</userinput></screen>
 
 <para>Then install the <command>random</command> seed script:</para>
 
 <screen><userinput>make install-random</userinput></screen>
 
-<para>This is also a good time to create a <filename>random-seed</filename> 
-file so it is available the first time you boot. This file should be read only by 
+<para>This is also a good time to create a <filename>random-seed</filename>
+file so it is available the first time you boot. This file should be read only by
 <emphasis>root</emphasis>:</para>
 
 <screen><userinput>/etc/rc.d/init.d/random start</userinput></screen>
@@ -54,7 +54,7 @@
 <segmentedlist>
 <segtitle>Installed scripts</segtitle>
 <seglistitem><seg>checkfs, cleanfs, console, functions, halt, hotplug, ifdown, ifup,
-localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static, 
+localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static,
 swap, sysklogd, template, and udev</seg></seglistitem>
 </segmentedlist>
 

Modified: trunk/BOOK/chapter07/kernel.xml
===================================================================
--- trunk/BOOK/chapter07/kernel.xml	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/chapter07/kernel.xml	2006-05-10 22:17:59 UTC (rev 644)
@@ -35,9 +35,9 @@
 book configures the kernel.</para>
 
 <para>You may have to adjust the path to the Linux source tarball. The
-<parameter>--no-same-owner --no-same-permissions</parameter> options 
-will extract the kernel sources without preserving ownership or permissions. 
-Preserving the id's and group write permission shipped with the kernel is not 
+<parameter>--no-same-owner --no-same-permissions</parameter> options
+will extract the kernel sources without preserving ownership or permissions.
+Preserving the id's and group write permission shipped with the kernel is not
 suggested:</para>
 
 <screen><userinput>cd /usr/src
@@ -51,25 +51,25 @@
 problems for packages you may wish to build once your base HLFS system is
 complete.</para></warning>
 
-<para>Install any patches for the Linux kernel to <filename 
+<para>Install any patches for the Linux kernel to <filename
 class="directory">/usr/src</filename> so you can remember
 which patches and versions are being used. Grsecurity patches against the
 <quote>as</quote> kernel tree:</para>
 
-<screen><userinput>install -m444 /sources/linux-&linux-version;-pseudo_random-1.patch /usr/src
-install -m444 /sources/grsecurity-2.1.8-2.6.14.6-200601211647.patch.gz /usr/src
-gunzip /usr/src/grsecurity-2.1.8-2.6.14.6-200601211647.patch.gz</userinput></screen>
+<screen><userinput>install -m444 /sources/&linux-pseudo_random-patch; /usr/src
+install -m444 /sources/&grsecurity-patch;.gz /usr/src
+gunzip /usr/src/&grsecurity-patch;.gz</userinput></screen>
 
 <para>Then change to the Linux source directory and apply the patches:</para>
 
 <screen><userinput>cd /usr/src/linux-&linux-version;
-patch -Np1 -i ../linux-&linux-version;-pseudo_random-1.patch
-patch -Np1 -i ../grsecurity-2.1.8-2.6.14.6-200601211647.patch</userinput></screen>
+patch -Np1 -i ../&linux-pseudo_random-patch;
+patch -Np1 -i ../&grsecurity-patch;</userinput></screen>
 
-<tip><para>Look at <command>info libc</command>, node <quote>System 
+<tip><para>Look at <command>info libc</command>, node <quote>System
 Configuration</quote>, <quote>General Limits</quote>. There are
-descrptions of values that can be hardcoded in <filename 
-class="headerfile">include/linux/limits.h</filename>. Also see 
+descrptions of values that can be hardcoded in <filename
+class="headerfile">include/linux/limits.h</filename>. Also see
 <command>man 1p getconf</command>.</para></tip>
 
 <para>Prepare for compilation by running the following command:</para>
@@ -92,16 +92,16 @@
 
 <para>Configure the kernel via a menu-driven interface. BLFS has some
 information regarding particular kernel configuration requirements of
-packages outside of LFS at <ulink 
+packages outside of LFS at <ulink
 url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
 
 <screen><userinput>make menuconfig</userinput></screen>
 
 <para>Sysctl is needed to use <filename class="devicefile">erandom</filename>
-properly with arc4random. Sysctl, sysctl <filename class="devicefile">urandom</filename>, 
+properly with arc4random. Sysctl, sysctl <filename class="devicefile">urandom</filename>,
 and <filename class="devicefile">frandom</filename> are enabled by default,
 be sure not to disable them. Also be sure <filename class="devicefile">frandom</filename>
-is built in, not a module or else sysctl will not work with <filename 
+is built in, not a module or else sysctl will not work with <filename
 class="devicefile">erandom</filename>.</para>
 
 <para>All the Grsec and PaX options can be enabled, but some should be disabled
@@ -113,8 +113,8 @@
 <listitem><para>CONFIG_PAX_EI_PAX</para></listitem>
 <listitem><para>CONFIG_PAX_EMUTRAMP</para></listitem>
 </itemizedlist>
-The SOFTMODE means settings will not be enforced; this is for 
-curious users or for debugging problems. EI_PAX is for supporting legacy markings 
+The SOFTMODE means settings will not be enforced; this is for
+curious users or for debugging problems. EI_PAX is for supporting legacy markings
 which we do not have (see below). PAX_EMUTRAMP is usefull for
 <command>localedef</command>, but <command>paxctl</command> can adjust
 <command>localedef</command> specifically while PAX_EMUTRAMP is a global option.
@@ -168,8 +168,8 @@
 "Address Space Protection" menu, should be disabled. See the help for those
 options for more details.</para>
 
-<para>Be warned that the CONFIG_GRKERNSEC_IO option, which disallows 
-modifying the kernel in memory while its loaded, breaks 
+<para>Be warned that the CONFIG_GRKERNSEC_IO option, which disallows
+modifying the kernel in memory while its loaded, breaks
 <command>pnpdump</command>(8) from Isatools.</para>
 
 <para>All the rest of the options will increase system security. If you plan to
@@ -194,9 +194,9 @@
 enabled by default.</para>
 
 <para>After you have configured which drivers will be included, then build the
-kernel. The kernel is not PIC, so <parameter>-no-pie</parameter> must be used. 
-The kernel comes with its own stack overflow detection which supersedes SSP. 
-There is a patch available to build the kernel with 
+kernel. The kernel is not PIC, so <parameter>-no-pie</parameter> must be used.
+The kernel comes with its own stack overflow detection which supersedes SSP.
+There is a patch available to build the kernel with
 <parameter>fstack-protector-all</parameter> but it has
 no effect on overflows which happen in the kernel.:</para>
 
@@ -236,7 +236,7 @@
 required to complete the installation. Some files need to be copied to
 the <filename class="directory">/boot</filename> directory.</para>
 
-<para>Then install the kernel to <filename class="directory">/boot</filename>. 
+<para>Then install the kernel to <filename class="directory">/boot</filename>.
 Adjust the kernel name for your partition:</para>
 
 <screen><userinput>install -m444 arch/i386/boot/bzImage /boot/hdb3-kernel-&linux-version;</userinput></screen>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-09 19:58:00 UTC (rev 643)
+++ trunk/BOOK/general.ent	2006-05-10 22:17:59 UTC (rev 644)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060509">
-<!ENTITY releasedate "May 9th, 2006">
+<!ENTITY version "SVN-20060510">
+<!ENTITY releasedate "May 10th, 2006">
 <!ENTITY milestone "0.3">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -24,6 +24,9 @@
 <!ENTITY kernel "http://www.kernel.org/pub/">
 <!ENTITY sourceforge "http://prdownloads.sourceforge.net/">
 
+<!ENTITY % patches-entities SYSTEM "patches.ent">
+%patches-entities;
+
 <!ENTITY autoconf-version "2.59">
 <!ENTITY autoconf-md5 "1ee40f7a676b3cfdc0e3f7cd81551b5f">
 <!ENTITY automake-version "1.9.6">

Added: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	                        (rev 0)
+++ trunk/BOOK/patches.ent	2006-05-10 22:17:59 UTC (rev 644)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- Start of Common Patches -->
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
+<!ENTITY bash-fixes-patch-md5 "3eccf05c2a63531b1eba379de05d6173">
+<!ENTITY bash-fixes-patch-size "120 KB">
+
+<!ENTITY binutils-pt_pax-patch "binutils-&binutils-version;-pt_pax-1.patch">
+<!ENTITY binutils-pt_pax-patch-md5 "94965f1421e84536f3e3749d3a4e4d9d">
+<!ENTITY binutils-pt_pax-patch-size "13 KB">
+
+<!ENTITY binutils-uClibc_conf-patch "binutils-&binutils-version;-uClibc_conf-1.patch">
+<!ENTITY binutils-uClibc_conf-patch-md5 "c261136e37baac27a1d27a078bdcaaa9">
+<!ENTITY binutils-uClibc_conf-patch-size "20 KB">
+
+<!ENTITY blfs-bootscripts-hlfs-patch "blfs-bootscripts-&blfs-bootscripts-version;-hlfs-1.patch">
+<!ENTITY blfs-bootscripts-hlfs-patch-md5 "898779b3e50a616fe2cb1a2e1078ad7b">
+<!ENTITY blfs-bootscripts-hlfs-patch-size "5.4 KB">
+
+<!ENTITY bzip2-bzgrep_security-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
+<!ENTITY bzip2-bzgrep_security-patch-md5 "4eae50e4fd690498f23d3057dfad7066">
+<!ENTITY bzip2-bzgrep_security-patch-size "1.2 KB">
+
+<!ENTITY bzip2-hardened_cflags-patch "bzip2-&bzip2-version;-hardened_cflags-1.patch">
+<!ENTITY bzip2-hardened_cflags-patch-md5 "dc33b65591250b3c337cd766b489adef">
+<!ENTITY bzip2-hardened_cflags-patch-size "2.7 KB">
+
+<!ENTITY bzip2-install_docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
+<!ENTITY bzip2-install_docs-patch-md5 "9e5dfbf4814b71ef986b872c9af84488">
+<!ENTITY bzip2-install_docs-patch-size "1.6 KB">
+
+<!ENTITY coreutils-suppress_uptime_kill_su-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
+<!ENTITY coreutils-suppress_uptime_kill_su-patch-md5 "11e50e6801e9d868e32abad2929c83b0">
+<!ENTITY coreutils-suppress_uptime_kill_su-patch-size "13 KB">
+
+<!ENTITY coreutils-uname_PIC-patch "coreutils-&coreutils-version;-uname_PIC-1.patch">
+<!ENTITY coreutils-uname_PIC-patch-md5 "71bac5487a89cefcc0758f286b5200c4">
+<!ENTITY coreutils-uname_PIC-patch-size "5.2 KB">
+
+<!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
+<!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
+<!ENTITY expect-spawn-patch-size "6.8 KB">
+
+<!ENTITY flex-debian_fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
+<!ENTITY flex-debian_fixes-patch-md5 "609d666f28040d0f49c9e40fef2f1492">
+<!ENTITY flex-debian_fixes-patch-size "160 KB">
+
+<!ENTITY flex-hardened_cflags-patch "flex-&flex-version;-hardened_cflags-1.patch">
+<!ENTITY flex-hardened_cflags-patch-md5 "bf24fe5ff12df146526f97354ca3f47d">
+<!ENTITY flex-hardened_cflags-patch-size "66 KB">
+
+<!ENTITY gawk-segfault_fix-patch "gawk-&gawk-version;-segfault_fix-1.patch">
+<!ENTITY gawk-segfault_fix-patch-md5 "7679530d88bf3eb56c42eb6aba342ddb">
+<!ENTITY gawk-segfault_fix-patch-size "1.3 KB">
+
+<!ENTITY gcc-hardened_cflags-patch "gcc-&gcc-version;-hardened_cflags-1.patch">
+<!ENTITY gcc-hardened_cflags-patch-md5 "567311237e90d7de8a4badc4555fc750">
+<!ENTITY gcc-hardened_cflags-patch-size "5.5 KB">
+
+<!ENTITY gcc-linkonce-patch "gcc-&gcc-version;-linkonce-1.patch">
+<!ENTITY gcc-linkonce-patch-md5 "6526a9d6fa236c4e1c211c995e2b5d9d">
+<!ENTITY gcc-linkonce-patch-size "12 KB">
+
+<!ENTITY gcc-no_fixincludes-patch "gcc-&gcc-version;-no_fixincludes-1.patch">
+<!ENTITY gcc-no_fixincludes-patch-md5 "3b52559864cfa50ac0c5a5e21eb73b19">
+<!ENTITY gcc-no_fixincludes-patch-size "1.1 KB">
+
+<!ENTITY gcc-specs_x86-patch "gcc-&gcc-version;-specs_x86-1.patch">
+<!ENTITY gcc-specs_x86-patch-md5 "a397111060e0d882f05623f1f66b14bb">
+<!ENTITY gcc-specs_x86-patch-size "4.6 KB">
+
+<!ENTITY gcc-ssp-patch "gcc-&gcc-version;-ssp-1.patch">
+<!ENTITY gcc-ssp-patch-md5 "a50ce8600e59bbef4f5eae9051c15ffe">
+<!ENTITY gcc-ssp-patch-size "122 KB">
+
+<!ENTITY gcc-uClibc_conf-patch "gcc-&gcc-version;-uClibc_conf-1.patch">
+<!ENTITY gcc-uClibc_conf-patch-md5 "86cd82e8d5ed062a8c1f273a4dfc9f60">
+<!ENTITY gcc-uClibc_conf-patch-size "3.7 KB">
+
+<!ENTITY gcc-uClibc_libstdc-patch "gcc-&gcc-version;-uClibc_libstdc++-1.patch">
+<!ENTITY gcc-uClibc_libstdc-patch-md5 "46c7600d14dfd42dcca00538e456bad4">
+<!ENTITY gcc-uClibc_libstdc-patch-size "2.1 KB">
+
+<!ENTITY gcc-uClibc_locale-patch "gcc-&gcc-version;-uClibc_locale-1.patch">
+<!ENTITY gcc-uClibc_locale-patch-md5 "a4d627760400c556b410f28ed12c305d">
+<!ENTITY gcc-uClibc_locale-patch-size "114 KB">
+
+<!ENTITY glibc-arc4random-patch "glibc-&glibc-version;-arc4random-2.patch">
+<!ENTITY glibc-arc4random-patch-md5 "056a6b39513ca73fcaa0aadd7acb5172">
+<!ENTITY glibc-arc4random-patch-size "15 KB">
+
+<!ENTITY glibc-dl_execstack_PaX-patch "glibc-&glibc-version;-dl_execstack_PaX-1.patch">
+<!ENTITY glibc-dl_execstack_PaX-patch-md5 "4aa9a1409860d41c7253a552cfedb517">
+<!ENTITY glibc-dl_execstack_PaX-patch-size "1.9 KB">
+
+<!ENTITY glibc-fstack_protector-patch "glibc-&glibc-version;-fstack_protector-1.patch">
+<!ENTITY glibc-fstack_protector-patch-md5 "cf6eed324784b7d6ca063763c4f4e0ae">
+<!ENTITY glibc-fstack_protector-patch-size "67 KB">
+
+<!ENTITY glibc-pt_pax-patch "glibc-&glibc-version;-pt_pax-1.patch">
+<!ENTITY glibc-pt_pax-patch-md5 "9ab55f3016a4196587c556caffbd4e22">
+<!ENTITY glibc-pt_pax-patch-size "2 KB">
+
+<!ENTITY glibc-ssp-patch "glibc-&glibc-version;-ssp-2.patch">
+<!ENTITY glibc-ssp-patch-md5 "47e13dad2b725fea3139ddd7ef00961d">
+<!ENTITY glibc-ssp-patch-size "6.9 KB">
+
+<!ENTITY grsecurity-patch "grsecurity-2.1.8-2.6.14.6-200601211647.patch">
+<!ENTITY grsecurity-patch-md5 "327972c2f4e8fab890f58d67bb69e77f">
+<!ENTITY grsecurity-patch-size "165 KB">
+
+<!ENTITY gzip-security_fixes-patch "gzip-&gzip-version;-security_fixes-1.patch">
+<!ENTITY gzip-security_fixes-patch-md5 "f107844f01fc49446654ae4a8f8a0728">
+<!ENTITY gzip-security_fixes-patch-size "2 KB">
+
+<!ENTITY inetutils-kernel_headers-patch "inetutils-&inetutils-version;-kernel_headers-1.patch">
+<!ENTITY inetutils-kernel_headers-patch-md5 "de1f835265b7ed818d7c0fb8c0be334b">
+<!ENTITY inetutils-kernel_headers-patch-size "0.7 KB">
+
+<!ENTITY inetutils-no_server_man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
+<!ENTITY inetutils-no_server_man_pages-patch-md5 "eb477f532bc6d26e7025fcfc4452511d">
+<!ENTITY inetutils-no_server_man_pages-patch-size "4,1 KB">
+
+<!ENTITY linux-pseudo_random-patch "linux-&linux-version;-pseudo_random-1.patch">
+<!ENTITY linux-pseudo_random-patch-md5 "8e39e45d2768d028c1a4b4852872f428">
+<!ENTITY linux-pseudo_random-patch-size "17 KB">
+
+<!ENTITY linux-libc-headers-pseudo_random-patch "linux-libc-headers-&linux-libc-headers-version;-pseudo_random-1.patch">
+<!ENTITY linux-libc-headers-pseudo_random-patch-md5 "2d6e02fc3ed65774a79507325a3b6083">
+<!ENTITY linux-libc-headers-pseudo_random-patch-size "1 KB">
+
+<!ENTITY linux-libc-headers-unistd_x86_PIC-patch "linux-libc-headers-&linux-libc-headers-version;-unistd_x86_PIC-1.patch">
+<!ENTITY linux-libc-headers-unistd_x86_PIC-patch-md5 "1531e714ae348478372ccf72cf1e1893">
+<!ENTITY linux-libc-headers-unistd_x86_PIC-patch-size "4.9 KB">
+
+<!ENTITY mktemp-add_tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
+<!ENTITY mktemp-add_tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
+<!ENTITY mktemp-add_tempfile-patch-size "3.5 KB">
+
+<!ENTITY module-init-tools-nostatic-patch "module-init-tools-&module-init-tools-version;-nostatic-1.patch">
+<!ENTITY module-init-tools-nostatic-patch-md5 "0d21b73f57ff249d486b936b6fba15da">
+<!ENTITY module-init-tools-nostatic-patch-size "4.5 KB">
+
+<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
+<!ENTITY perl-libc-patch-md5 "80a0672509d5abb1f2e95e8d4ebfe65a">
+<!ENTITY perl-libc-patch-size "1.1 KB">
+
+<!ENTITY perl-regex_ssp-patch "perl-&perl-version;-regex_ssp-1.patch">
+<!ENTITY perl-regex_ssp-patch-md5 "90194ee76466817b128ce4841c0a19e1">
+<!ENTITY perl-regex_ssp-patch-size "1 KB">
+
+<!ENTITY procps-hardened_cflags-patch "procps-&procps-version;-hardened_cflags-2.patch">
+<!ENTITY procps-hardened_cflags-patch-md5 "c2272ddf24a06f03b40a5dc5967b3ce5">
+<!ENTITY procps-hardened_cflags-patch-size "3 KB">
+
+<!ENTITY sed-uClibc-patch "sed-&sed-version;-uClibc-1.patch">
+<!ENTITY sed-uClibc-patch-md5 "e28530daf56292b497a3b0870d421a49">
+<!ENTITY sed-uClibc-patch-size "0.9 KB">
+
+<!ENTITY shadow-uClibc-patch "shadow-&shadow-version;-uClibc-1.patch">
+<!ENTITY shadow-uClibc-patch-md5 "89246fa779f9cb7cb7ab34c0a590b077">
+<!ENTITY shadow-uClibc-patch-size "3.3 KB">
+
+<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
+<!ENTITY sysklogd-fixes-patch-md5 "508104f058d1aef26b3bc8059821935f">
+<!ENTITY sysklogd-fixes-patch-size "28 KB">
+
+<!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch">
+<!ENTITY tar-sparse_fix-patch-md5 "9e3623f7c88d8766878ecb27c980d86a">
+<!ENTITY tar-sparse_fix-patch-size "1 KB">
+
+<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-2.patch">
+<!ENTITY texinfo-tempfile_fix-patch-md5 "559bda136a2ac7777ecb67511227af85">
+<!ENTITY texinfo-tempfile_fix-patch-size "2.3 KB">
+
+<!ENTITY uClibc-arc4random-patch "uClibc-&uclibc-version;-arc4random-2.patch">
+<!ENTITY uClibc-arc4random-patch-md5 "739a5291cb7fec152d6e6a7c0c11dc64">
+<!ENTITY uClibc-arc4random-patch-size "23 KB">
+
+<!ENTITY uClibc-config-patch "uClibc-&uclibc-version;-config-3.patch">
+<!ENTITY uClibc-config-patch-md5 "d53de783f37098f097ed183b6e5b05d9">
+<!ENTITY uClibc-config-patch-size "5.4 KB">
+
+<!ENTITY uClibc-libc_stack_end-patch "uClibc-&uclibc-version;-libc_stack_end-1.patch">
+<!ENTITY uClibc-libc_stack_end-patch-md5 "a7bd1f50d9f644d686b1000318cd3c04">
+<!ENTITY uClibc-libc_stack_end-patch-size "1 KB">
+
+<!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
+<!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
+<!ENTITY util-linux-cramfs-patch-size "2.8 KB">
+
+<!ENTITY util-linux-hardened_cflags-patch "util-linux-&util-linux-version;-hardened_cflags-1.patch">
+<!ENTITY util-linux-hardened_cflags-patch-md5 "b479d9c133da3a3fb86e7723c3f2a81e">
+<!ENTITY util-linux-hardened_cflags-patch-size "7.5 KB">
+
+<!ENTITY util-linux-nologin-patch "util-linux-&util-linux-version;-nologin-1.patch">
+<!ENTITY util-linux-nologin-patch-md5 "ccf05ed25b1452ff86494d55eb7c234f">
+<!ENTITY util-linux-nologin-patch-size "7.7 KB">
+
+<!ENTITY util-linux-PIC-patch "util-linux-&util-linux-version;-PIC-1.patch">
+<!ENTITY util-linux-PIC-patch-md5 "c85469f9da411b1c64c2b7fe71565d66">
+<!ENTITY util-linux-PIC-patch-size "2 KB">


Property changes on: trunk/BOOK/patches.ent
___________________________________________________________________
Name: svn:keywords
   + Author Date Revision Id




More information about the hlfs-book mailing list