From 7acb4c36e5ba8475d7c0c943ca959a2cff9836a0 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Tue, 7 Oct 2003 22:22:46 +0000 Subject: [PATCH] Bringing order to the presentation of patches. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2938 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/bash-down.xml | 4 +- appendixa/bison-down.xml | 4 +- appendixa/coreutils-down.xml | 8 +-- appendixa/ed-down.xml | 4 +- appendixa/expect-down.xml | 4 +- appendixa/gawk-down.xml | 4 +- appendixa/gcc-down.xml | 27 ++++---- appendixa/glibc-down.xml | 4 +- appendixa/grub-down.xml | 4 +- appendixa/kbd-down.xml | 4 +- appendixa/man-down.xml | 12 ++-- appendixa/ncurses-down.xml | 8 +-- appendixa/nettools-down.xml | 4 +- appendixa/perl-down.xml | 4 +- appendixa/procps-down.xml | 4 +- appendixa/shadowpwd-down.xml | 4 +- appendixa/zlib-down.xml | 4 +- chapter04/chapter04.xml | 116 +++++++++++++++++------------------ chapter05/bash-inst.xml | 2 +- chapter05/expect-inst.xml | 2 +- chapter05/gcc-pass2-inst.xml | 4 +- chapter05/glibc-inst.xml | 2 +- chapter05/ncurses-inst.xml | 4 +- chapter05/perl-inst.xml | 2 +- chapter06/bash-inst.xml | 2 +- chapter06/coreutils-inst.xml | 4 +- chapter06/ed-inst.xml | 2 +- chapter06/gawk-inst.xml | 2 +- chapter06/gcc-2953-inst.xml | 6 +- chapter06/gcc-inst.xml | 4 +- chapter06/glibc-inst.xml | 2 +- chapter06/grub-inst.xml | 2 +- chapter06/kbd-inst.xml | 2 +- chapter06/man-inst.xml | 6 +- chapter06/ncurses-inst.xml | 4 +- chapter06/procps-inst.xml | 2 +- chapter06/shadowpwd-inst.xml | 2 +- chapter06/zlib-inst.xml | 2 +- entities/bash.ent | 2 +- entities/bison.ent | 2 +- entities/coreutils.ent | 4 +- entities/ed.ent | 2 +- entities/expect.ent | 2 +- entities/gawk.ent | 2 +- entities/gcc-2953.ent | 6 +- entities/gcc.ent | 6 +- entities/glibc.ent | 2 +- entities/grub.ent | 2 +- entities/kbd.ent | 2 +- entities/libtool.ent | 2 +- entities/man.ent | 6 +- entities/ncurses.ent | 4 +- entities/nettools.ent | 2 +- entities/perl.ent | 2 +- entities/procps.ent | 2 +- entities/shadow.ent | 2 +- entities/zlib.ent | 2 +- 57 files changed, 169 insertions(+), 166 deletions(-) diff --git a/appendixa/bash-down.xml b/appendixa/bash-down.xml index 7fad8054c..7833cb46d 100644 --- a/appendixa/bash-down.xml +++ b/appendixa/bash-down.xml @@ -4,7 +4,7 @@ Bash (&bash-version;): -Bash Patch (&bash-version;): - +Bash Patch: + diff --git a/appendixa/bison-down.xml b/appendixa/bison-down.xml index 4d47ad5eb..3ae8b0c31 100644 --- a/appendixa/bison-down.xml +++ b/appendixa/bison-down.xml @@ -4,7 +4,7 @@ Bison (&bison-version;): -Bison Attribute Patch (&bison-version;): - +Bison Attribute Patch: + diff --git a/appendixa/coreutils-down.xml b/appendixa/coreutils-down.xml index 8fcb17022..d701d132f 100644 --- a/appendixa/coreutils-down.xml +++ b/appendixa/coreutils-down.xml @@ -4,9 +4,9 @@ Coreutils (&coreutils-version;): -Coreutils Hostname Patch (&coreutils-version;): - +Coreutils Hostname Patch: + -Coreutils Uname Patch (&coreutils-version;): - +Coreutils Uname Patch: + diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml index 591492437..48c6e3df1 100644 --- a/appendixa/ed-down.xml +++ b/appendixa/ed-down.xml @@ -4,6 +4,6 @@ Ed (&ed-version;): -Ed Patch (&ed-patch-version;): - +Ed Patch: + diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml index 53a6340f3..1a8512349 100644 --- a/appendixa/expect-down.xml +++ b/appendixa/expect-down.xml @@ -4,6 +4,6 @@ Expect (&expect-version;): -Expect Patch (&expect-patch-version;): - +Expect Patch: + diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml index 79a6ec546..609797873 100644 --- a/appendixa/gawk-down.xml +++ b/appendixa/gawk-down.xml @@ -4,6 +4,6 @@ Gawk (&gawk-version;): -Gawk Patch (&gawk-patch-version;): - +Gawk Patch: + diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml index 7ef567e0a..14d3a24a9 100644 --- a/appendixa/gcc-down.xml +++ b/appendixa/gcc-down.xml @@ -4,21 +4,24 @@ GCC (&gcc-version;): -GCC No Fixincludes Patch (&gcc-nofixincludes-patch-version;): - +GCC No-Fixincludes Patch: + -GCC Specs Patch (&gcc-specs-patch-version;): - +GCC Specs Patch: + -GCC Suppress Libiberty Patch (&gcc-suppress-libiberty-patch-version;): - +GCC Suppress-Libiberty Patch: + -GCC-2 Patch (&gcc-2953-patch-version;): - +GCC-2 (&gcc-2953-version;): + -GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;): - +GCC-2 Patch: + -GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;): - +GCC-2 No-Fixincludes Patch: + + +GCC-2 Return-Type Patch: + diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml index 76fb1a03f..ddafc95ac 100644 --- a/appendixa/glibc-down.xml +++ b/appendixa/glibc-down.xml @@ -7,6 +7,6 @@ Glibc-linuxthreads (&glibc-version;): -Glibc Sscanf Patch (&glibc-sscanf-patch-version;): - +Glibc Sscanf Patch: + diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml index 9bf0308af..91fa69b6a 100644 --- a/appendixa/grub-down.xml +++ b/appendixa/grub-down.xml @@ -4,6 +4,6 @@ Grub (&grub-version;): -Grub Gcc33 Patch (&grub-version;): - +Grub Gcc33 Patch: + diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml index af5e6c8d6..1530b0ed5 100644 --- a/appendixa/kbd-down.xml +++ b/appendixa/kbd-down.xml @@ -4,6 +4,6 @@ Kbd (&kbd-version;): -Kbd Patch (&kbd-patch-version;): - +Kbd Patch: + diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml index 051da7ce4..d895501be 100644 --- a/appendixa/man-down.xml +++ b/appendixa/man-down.xml @@ -4,12 +4,12 @@ Man (&man-version;): -Man 80Cols Patch (&man-80cols-patch-version;): - +Man 80-Columns Patch: + -Man Manpath Patch (&man-manpath-patch-version;): - +Man Manpath Patch: + -Man Pager Patch (&man-pager-patch-version;): - +Man Pager Patch: + diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml index 8b900caf2..e40954b36 100644 --- a/appendixa/ncurses-down.xml +++ b/appendixa/ncurses-down.xml @@ -4,9 +4,9 @@ Ncurses (&ncurses-version;): -Ncurses Etip Patch (&ncurses-version;): - +Ncurses Etip Patch: + -Ncurses Vsscanf Patch (&ncurses-version;): - +Ncurses Vsscanf Patch: + diff --git a/appendixa/nettools-down.xml b/appendixa/nettools-down.xml index 85dc22fe6..46b1a9ede 100644 --- a/appendixa/nettools-down.xml +++ b/appendixa/nettools-down.xml @@ -4,6 +4,6 @@ Net-tools (&net-tools-version;): -Net-tools Mii-Tool Patch (&net-tools-version;): - +Net-tools Mii-Tool-Gcc33 Patch: + diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml index 9dddcfde5..4f81a78ea 100644 --- a/appendixa/perl-down.xml +++ b/appendixa/perl-down.xml @@ -4,6 +4,6 @@ Perl (&perl-version;): -Perl Libc Patch (&perl-version;): - +Perl Libc Patch: + diff --git a/appendixa/procps-down.xml b/appendixa/procps-down.xml index 2ad36e933..f13f9617a 100644 --- a/appendixa/procps-down.xml +++ b/appendixa/procps-down.xml @@ -4,6 +4,6 @@ Procps (&procps-version;): -Procps Patch (&procps-patch-version;): - +Procps Patch: + diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadowpwd-down.xml index 4fc47854f..cacbafa37 100644 --- a/appendixa/shadowpwd-down.xml +++ b/appendixa/shadowpwd-down.xml @@ -4,6 +4,6 @@ Shadow (&shadow-version;): -Shadow Newgrp Patch (&shadow-version;): - +Shadow Newgrp Patch: + diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml index c15da3c45..c06568dcb 100644 --- a/appendixa/zlib-down.xml +++ b/appendixa/zlib-down.xml @@ -6,6 +6,6 @@ Zlib (&zlib-version;): -Zlib Patch (&zlib-version;): - +Zlib Patch: + diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index c4092747f..7b86380f6 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -248,91 +248,91 @@ or just make some small modifications to bend things our way. You'll need the following: -Bash Patch (&bash-patch-version;) - &bash-patch-size;: - +Bash Patch - &bash-patch-size;: + -Bison Attribute Patch (&bison-patch-version;) - &bison-patch-size;: - +Bison Attribute Patch - &bison-patch-size;: + -Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;: - +Coreutils Hostname Patch - &coreutils-hostname-patch-size;: + -Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;: - +Coreutils Uname Patch - &coreutils-uname-patch-size;: + -Ed Patch (&ed-patch-version;) - &ed-patch-size;: - +Ed Patch - &ed-patch-size;: + -Expect Patch (&expect-patch-version;) - &expect-patch-size;: - +Expect Patch - &expect-patch-size;: + -Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;: - +Gawk Patch - &gawk-patch-size;: + -GCC No Fixincludes Patch: (&gcc-nofixincludes-patch-version;) - &gcc-nofixincludes-patch-size;: - +GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;: + -GCC Specs Patch: (&gcc-specs-patch-version;) - &gcc-specs-patch-size;: - +GCC Specs Patch - &gcc-specs-patch-size;: + -GCC Suppress Libiberty Patch: (&gcc-suppress-libiberty-patch-version;) - &gcc-suppress-libiberty-patch-size;: - +GCC Suppress-Libiberty Patch - &gcc-suppress-libiberty-patch-size;: + -GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;: - +GCC-2 Patch - &gcc-2953-patch-size;: + -GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;: - +GCC-2 No-Fixincludes Patch - &gcc-2953-no-fixinc-patch-size;: + -GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;: - +GCC-2 Return-Type Patch - &gcc-2953-returntype-fix-patch-size;: + -Glibc Sscanf Patch: (&glibc-sscanf-patch-version;) - &glibc-sscanf-patch-size;: - +Glibc Sscanf Patch - &glibc-sscanf-patch-size;: + -Grub Gcc33 Patch (&grub-patch-version;) - &grub-patch-size;: - +Grub Gcc33 Patch - &grub-patch-size;: + -Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;: - +Kbd Patch - &kbd-patch-size;: + -Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;: - +Man 80-Columns Patch - &man-80cols-patch-size;: + -Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;: - +Man Manpath Patch - &man-manpath-patch-size;: + -Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;: - +Man Pager Patch - &man-pager-patch-size;: + -Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;: - +Ncurses Etip Patch - &ncurses-etip-patch-size;: + -Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;: - +Ncurses Vsscanf Patch - &ncurses-vsscanf-patch-size;: + -Net-tools Mii-Tool Gcc33 Patch (&net-tools-mii-patch-version;) - &net-tools-mii-patch-size;: - +Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;: + -Perl Libc Patch (&perl-libc-patch-version;) - &perl-libc-patch-size;: - +Perl Libc Patch - &perl-libc-patch-size;: + -Procps Patch (&procps-patch-version;) - &procps-patch-size;: - +Procps Patch - &procps-patch-size;: + -Shadow Newgrp Patch (&shadow-patch-version;) - &shadow-patch-size;: - +Shadow Newgrp Patch - &shadow-patch-size;: + -Zlib Vsnprintf Patch (&zlib-patch-version;) - &zlib-patch-size;: - +Zlib Vsnprintf Patch - &zlib-patch-size;: + -In addition, there are a number of optional patches that have been -created by the LFS community. Most of these solve slight problems, or enable -some functionality that's not enabled by default. Please feel free to examine -the patches database, located at -, and choose any -additional patches you might wish to use. +In addition to the above required patches, there exist a number of +optional ones created by the LFS community. Most of these solve slight +problems, or enable some functionality that's not enabled by default. Feel +free to examine the patches database, located at +, and pick any +additional patches you wish to use. diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index 89950f847..03fe846ae 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -6,7 +6,7 @@ Bash contains several known bugs. Fix these with the following patch: -patch -Np1 -i ../bash-&bash-patch-version;.patch +patch -Np1 -i ../&bash-patch; Now prepare Bash for compilation: diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml index e54a5b484..84e186da9 100644 --- a/chapter05/expect-inst.xml +++ b/chapter05/expect-inst.xml @@ -5,7 +5,7 @@ First apply a patch: -patch -Np1 -i ../expect-&expect-patch-version;.patch +patch -Np1 -i ../&expect-patch; This fixes a bug in Expect that can result in bogus failures during the GCC test suite run. diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml index 5ed463704..e2e58ab19 100644 --- a/chapter05/gcc-pass2-inst.xml +++ b/chapter05/gcc-pass2-inst.xml @@ -33,8 +33,8 @@ same working directory. They will all unfold into a single First correct one problem and make an essential adjustment: -patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-specs-patch-version;.patch +patch -Np1 -i ../&gcc-nofixincludes-patch; +patch -Np1 -i ../&gcc-specs-patch; The first patch disables the GCC "fixincludes" script. We mentioned this briefly earlier, but a slightly more in-depth explanation of the fixincludes diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml index a6f9340fd..7385f9809 100644 --- a/chapter05/glibc-inst.xml +++ b/chapter05/glibc-inst.xml @@ -31,7 +31,7 @@ touch /tools/etc/ld.so.conf Also, Glibc has a subtle problem when compiled with GCC 3.3.1. Apply the following patch to fix this: -patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch +patch -Np1 -i ../&glibc-sscanf-patch; The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml index 938be653f..7c187a2b5 100644 --- a/chapter05/ncurses-inst.xml +++ b/chapter05/ncurses-inst.xml @@ -5,8 +5,8 @@ Fix two minor things: -patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch -patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch +patch -Np1 -i ../&ncurses-etip-patch; +patch -Np1 -i ../&ncurses-vsscanf-patch; The first patch corrects the etip.h header file, and the second patch prevents some compiler warnings being issued on the use of diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml index 498ad5f69..297fe7aef 100644 --- a/chapter05/perl-inst.xml +++ b/chapter05/perl-inst.xml @@ -4,7 +4,7 @@ First adapt some hard-wired paths to the C library: -patch -Np1 -i ../perl-&perl-libc-patch-version;.patch +patch -Np1 -i ../&perl-libc-patch; And make sure some static extensions get built: diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index 308a2dbea..339a670df 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -7,7 +7,7 @@ way it is expected at times. Fix this behaviour with the following patch: -patch -Np1 -i ../bash-&bash-patch-version;.patch +patch -Np1 -i ../&bash-patch; Prepare Bash for compilation: diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml index 665caa7c6..7ef5a0a09 100644 --- a/chapter06/coreutils-inst.xml +++ b/chapter06/coreutils-inst.xml @@ -7,13 +7,13 @@ broken, in that the -p switch always returns "unknown". The following patch fixes this behaviour for Intel architectures: -patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch +patch -Np1 -i ../&coreutils-uname-patch; We do not want Coreutils to install its version of the hostname program, because it is inferior to the version provided by Net-tools. Prevent its installation by applying a patch: -patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch +patch -Np1 -i ../&coreutils-hostname-patch; Now prepare Coreutils for compilation: diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 0fa6d4d48..0cfe4f261 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -17,7 +17,7 @@ create temporary files. Apply the patch: -patch -Np1 -i ../ed-&ed-patch-version;.patch +patch -Np1 -i ../&ed-patch; Now prepare Ed for compilation: diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml index 1ac6525be..b804ef845 100644 --- a/chapter06/gawk-inst.xml +++ b/chapter06/gawk-inst.xml @@ -31,7 +31,7 @@ class="directory">$prefix/share/gawk-3.1.3) is removed along with its contents on a make uninstall. -patch -Np1 -i ../gawk-&gawk-patch-version;.patch +patch -Np1 -i ../&gawk-patch; Now prepare Gawk for compilation: diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml index e6531b560..3af7c987e 100644 --- a/chapter06/gcc-2953-inst.xml +++ b/chapter06/gcc-2953-inst.xml @@ -27,9 +27,9 @@ the system GCC already installed in /usr Apply the patches and make a small adjustment: -patch -Np1 -i ../gcc-&gcc-2953-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-2953-no-fixinc-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-2953-returntype-fix-patch-version;.patch +patch -Np1 -i ../&gcc-2953-patch;.patch +patch -Np1 -i ../&gcc-2953-no-fixinc-patch;.patch +patch -Np1 -i ../&gcc-2953-returntype-fix-patch;.patch echo timestamp > gcc/cstamp-h.in The GCC documentation recommends building GCC outside of the source diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 2be07056c..35e49751d 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -20,8 +20,8 @@ GCC-testsuite package. The full GCC package contains even more compilers. Instructions for building these can be found at . -patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch +patch -Np1 -i ../&gcc-nofixincludes-patch; +patch -Np1 -i ../&gcc-suppress-libiberty-patch; The second patch here suppresses the installation of libiberty from GCC, as we will use the one provided by binutils instead. Be careful diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 95e6db1e4..9ac69ac01 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -20,7 +20,7 @@ flags. Then apply the same patch we used previously: -patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch +patch -Np1 -i ../&glibc-sscanf-patch; The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml index 650b76c0b..66ec995b0 100644 --- a/chapter06/grub-inst.xml +++ b/chapter06/grub-inst.xml @@ -11,7 +11,7 @@ Grub. Grub needs a patch to fix a compilation problem with GCC-3.3.1 -patch -Np1 -i ../grub-&grub-patch-version;.patch +patch -Np1 -i ../&grub-patch; Prepare Grub for compilation: diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index 80ad275d6..e27d55b94 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -7,7 +7,7 @@ setvesablank and getunimap) are not installed . The patch enables the compilation of these utilities: -patch -Np1 -i ../kbd-&kbd-patch-version;.patch +patch -Np1 -i ../&kbd-patch; Now prepare Kbd for compilation: diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 958cce200..830ba1532 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -9,19 +9,19 @@ man.conf file to prevent redundant results when using programs such as whatis: -patch -Np1 -i ../man-&man-manpath-patch-version;.patch +patch -Np1 -i ../&man-manpath-patch; The second patch adds the -R option to the PAGER variable so that escape sequences are handled properly: -patch -Np1 -i ../man-&man-pager-patch-version;.patch +patch -Np1 -i ../&man-pager-patch; The third and last patch prevents a problem when man pages not formatted with more than 80 columns are used in conjunction with recent releases of groff: -patch -Np1 -i ../man-&man-80cols-patch-version;.patch +patch -Np1 -i ../&man-80cols-patch; Now prepare Man for compilation: diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 26cc70588..251a901c8 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -5,8 +5,8 @@ First fix two tiny bugs: -patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch -patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch +patch -Np1 -i ../&ncurses-etip-patch; +patch -Np1 -i ../&ncurses-vsscanf-patch; The first patch corrects the etip.h header file, and the second patch prevents some compiler warnings on the use of deprecated diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 508b5ad42..3e8aa1035 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -6,7 +6,7 @@ First fix a locale problem that can crash w under certain locale settings: -patch -Np1 -i ../procps-&procps-patch-version;.patch +patch -Np1 -i ../&procps-patch; Now compile Procps: diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 9e0069145..4fc389869 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -39,7 +39,7 @@ the package incorrectly assumes it is going to be located at it to fail. The following patch (also appearing in Shadow's CVS code) fixes this problem. -patch -Np1 -i ../shadow-&shadow-patch-version;.patch +patch -Np1 -i ../&shadow-patch;.patch Now prepare Shadow for compilation: diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml index 21cd9bc7d..bef73c94c 100644 --- a/chapter06/zlib-inst.xml +++ b/chapter06/zlib-inst.xml @@ -7,7 +7,7 @@ gzprintf() function, that, though difficult to take advantage of, should be taken care of by applying this patch: -patch -Np1 -i ../zlib-&zlib-patch-version;.patch +patch -Np1 -i ../&zlib-patch; Now prepare Zlib for compilation: diff --git a/entities/bash.ent b/entities/bash.ent index 45fd23288..60f868c1f 100644 --- a/entities/bash.ent +++ b/entities/bash.ent @@ -20,7 +20,7 @@ - + diff --git a/entities/bison.ent b/entities/bison.ent index af7e94252..83f7601ef 100644 --- a/entities/bison.ent +++ b/entities/bison.ent @@ -16,7 +16,7 @@ - + diff --git a/entities/coreutils.ent b/entities/coreutils.ent index 339d1c760..b0172cbc5 100644 --- a/entities/coreutils.ent +++ b/entities/coreutils.ent @@ -20,10 +20,10 @@ + - + - diff --git a/entities/ed.ent b/entities/ed.ent index 6df9a6ec3..4a5660727 100644 --- a/entities/ed.ent +++ b/entities/ed.ent @@ -17,8 +17,8 @@ + - diff --git a/entities/expect.ent b/entities/expect.ent index 63abf8b61..296a5c8c2 100644 --- a/entities/expect.ent +++ b/entities/expect.ent @@ -17,7 +17,7 @@ - + diff --git a/entities/gawk.ent b/entities/gawk.ent index 6ccadf3be..702929f94 100644 --- a/entities/gawk.ent +++ b/entities/gawk.ent @@ -20,8 +20,8 @@ + - diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent index 00864368e..0151e5689 100644 --- a/entities/gcc-2953.ent +++ b/entities/gcc-2953.ent @@ -17,11 +17,11 @@ - + - + - + diff --git a/entities/gcc.ent b/entities/gcc.ent index 39a33c664..92dc528a9 100644 --- a/entities/gcc.ent +++ b/entities/gcc.ent @@ -27,11 +27,11 @@ - + - + - + diff --git a/entities/glibc.ent b/entities/glibc.ent index 78a6677ef..eb473a6e4 100644 --- a/entities/glibc.ent +++ b/entities/glibc.ent @@ -25,7 +25,7 @@ - + diff --git a/entities/grub.ent b/entities/grub.ent index b1a928801..b9d3df919 100644 --- a/entities/grub.ent +++ b/entities/grub.ent @@ -18,7 +18,7 @@ - + diff --git a/entities/kbd.ent b/entities/kbd.ent index d8bebf62c..f3a5121f1 100644 --- a/entities/kbd.ent +++ b/entities/kbd.ent @@ -17,7 +17,7 @@ - + diff --git a/entities/libtool.ent b/entities/libtool.ent index a13fc63d5..566976603 100644 --- a/entities/libtool.ent +++ b/entities/libtool.ent @@ -16,8 +16,8 @@ + - diff --git a/entities/man.ent b/entities/man.ent index 6d12ca1f0..352caa358 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -17,11 +17,11 @@ - + - + - + diff --git a/entities/ncurses.ent b/entities/ncurses.ent index a3b6cc7ed..2717598d5 100644 --- a/entities/ncurses.ent +++ b/entities/ncurses.ent @@ -20,9 +20,9 @@ - + - + diff --git a/entities/nettools.ent b/entities/nettools.ent index 593424d5d..54eeec8b6 100644 --- a/entities/nettools.ent +++ b/entities/nettools.ent @@ -16,7 +16,7 @@ - + diff --git a/entities/perl.ent b/entities/perl.ent index 0a579eea7..71af5e446 100644 --- a/entities/perl.ent +++ b/entities/perl.ent @@ -20,7 +20,7 @@ - + diff --git a/entities/procps.ent b/entities/procps.ent index cdfda3146..010f4e488 100644 --- a/entities/procps.ent +++ b/entities/procps.ent @@ -17,7 +17,7 @@ - + diff --git a/entities/shadow.ent b/entities/shadow.ent index 82b89f8a8..5c41eae92 100644 --- a/entities/shadow.ent +++ b/entities/shadow.ent @@ -17,7 +17,7 @@ - + diff --git a/entities/zlib.ent b/entities/zlib.ent index 575874d86..e20ad827f 100644 --- a/entities/zlib.ent +++ b/entities/zlib.ent @@ -17,7 +17,7 @@ - +