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