diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml index d457c4ed7..51f8abd3d 100644 --- a/appendixa/appendixa.xml +++ b/appendixa/appendixa.xml @@ -35,7 +35,7 @@ &aa-makedev; &aa-man; &aa-manpages; -&aa-mawk; +&aa-gawk; &aa-modutils; &aa-ncurses; &aa-netkitbase; diff --git a/appendixa/mawk-dep.xml b/appendixa/mawk-dep.xml deleted file mode 100644 index b25309d7c..000000000 --- a/appendixa/mawk-dep.xml +++ /dev/null @@ -1,20 +0,0 @@ - -Dependencies - -Mawk-&mawk-depversion; needs the following to be installed: - - -bash: sh -fileutils: chmod, cp, ln, rm -binutils: as, ld -diffutils: cmp -gcc: cc1, collect2, cpp0, gcc -grep: egrep, grep -make: make -sed: sed -sh-utils: hostname, tee -textutils: cat, tr - - - - diff --git a/appendixa/mawk-desc.xml b/appendixa/mawk-desc.xml deleted file mode 100644 index 130f796b0..000000000 --- a/appendixa/mawk-desc.xml +++ /dev/null @@ -1,21 +0,0 @@ -Contents of mawk-&mawk-contversion; - -Program Files -awk (link to mawk) and mawk - -Descriptions - -awk -awk is symlinked to mawk for programs which just look for any -generic awk. - -mawk -Mawk is an interpreter for the AWK Programming Language. The AWK -language is useful for manipulation of data files, text retrieval and -processing, and for prototyping and experimenting -with algorithms. - - - - - diff --git a/appendixa/mawk-down.xml b/appendixa/mawk-down.xml deleted file mode 100644 index 744a908f5..000000000 --- a/appendixa/mawk-down.xml +++ /dev/null @@ -1,6 +0,0 @@ - -Official Download Location - -Mawk (&mawk-version;): -ftp://ftp.whidbey.net/pub/brennan/ - diff --git a/appendixa/mawk.xml b/appendixa/mawk.xml deleted file mode 100644 index 4d4990f7d..000000000 --- a/appendixa/mawk.xml +++ /dev/null @@ -1,10 +0,0 @@ - -Mawk - - -&aa-mawk-down; -&aa-mawk-desc; -&aa-mawk-dep; - - - diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 974626f97..00c2e65c8 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -4,6 +4,45 @@ &version; - &releasedate; + + +Updated to: + + +autoconf-2.53 +automake-1.6 +bin86-0.16.2 +bison-1.33 +bzip2-1.0.2 +e2fsprogs-1.27 +gawk-3.1.0 +gettext-0.11 +less-374 +lilo-22.2 +linux-2.4.18 +man-pages-1.48 +modutils-2.4.14 +reiserfsprogs-3.x.1b +shadow-4.0.2 +texinfo-4.1 +util-linux-2.11o + + + + +March 8th, 2002 [gerard]: Removed the Mawk package and +replaced with the Gawk package. This was done because mawk is no longer +being developed, while gawk is. Mawk has some POSIX compliance bugs that +are fixed in Gawk. + +March 8th, 2002 [gerard]: Updated to the following +packages: autoconf-2.53, automake-1.6, bin86-0.16.2, bison-1.33, +bzip2-1.0.2, e2fsprogs-1.27, gawk-3.1.0, gettext-0.11, less-374, lilo-22.2, +linux-2.4.18, man-pages-1.48, modutils-2.4.14, reiserfsprogs-3.x.1b, +shadow-4.0.2, texinfo-4.1, util-linux-2.11o + + + 3.2 - March 7th, 2002 diff --git a/chapter04/mawk.xml b/chapter04/mawk.xml deleted file mode 100644 index b54ea11e4..000000000 --- a/chapter04/mawk.xml +++ /dev/null @@ -1,4 +0,0 @@ -Mawk (&mawk-version;) - &mawk-size;: -&ftp;/mawk&mawk-version;.tar.bz2 -&http;/mawk&mawk-version;.tar.bz2 - diff --git a/chapter04/packages.xml b/chapter04/packages.xml index c8eba9425..12dbb1d30 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -23,7 +23,7 @@ &c3-tar; &c3-tar-patch; &c3-textutils; -&c3-mawk; +&c3-gawk; &c3-texinfo; &c3-patch; &c3-makedev; diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 3dab1cf4c..68281be77 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -6,7 +6,7 @@ make CC="gcc -static" && make PREFIX=$LFS/usr install && cd $LFS/usr/bin && -mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin +mv bzcat bunzip2 bzip2 bzip2recover bzless bzmore $LFS/bin Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index aa24547fb..27090ed31 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -16,7 +16,7 @@ &c5-gzip; &c5-kernel; &c5-make; -&c5-mawk; +&c5-gawk; &c5-patch; &c5-sed; &c5-shellutils; diff --git a/chapter05/mawk-exp.xml b/chapter05/mawk-exp.xml deleted file mode 100644 index 33a1ccd5a..000000000 --- a/chapter05/mawk-exp.xml +++ /dev/null @@ -1,8 +0,0 @@ - -Command explanations - -make CC="gcc -static" This -is used to build mawk statically. - - - diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml deleted file mode 100644 index 030c4b9fc..000000000 --- a/chapter05/mawk-inst.xml +++ /dev/null @@ -1,12 +0,0 @@ - -Installation of Mawk - -Install Mawk by running the following commands: - -./configure && -make CC="gcc -static" && -make BINDIR=$LFS/usr/bin \ -   MANDIR=$LFS/usr/share/man/man1 install - - - diff --git a/chapter05/mawk.xml b/chapter05/mawk.xml deleted file mode 100644 index 9addff5c1..000000000 --- a/chapter05/mawk.xml +++ /dev/null @@ -1,14 +0,0 @@ - -Installing Mawk-&mawk-version; - - -Estimated build time: &mawk-time-static; -Estimated required disk space: &mawk-compsize-static; - -&c5-mawk-inst; -&c5-mawk-exp; -&aa-mawk-desc; -&aa-mawk-dep; - - - diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 905e4eb53..c24d79ea3 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -3,25 +3,21 @@ Install Bzip2 by running the following commands: -make -f Makefile-libbz2_so && -make bzip2recover libbz2.a && -ln -s libbz2.so.1.0.1 libbz2.so && +make && +make -f Makefile-libbz2_so && +make PREFIX=/usr install && cp bzip2-shared /bin/bzip2 && -cp bzip2recover /bin && -cp bzip2.1 /usr/share/man/man1 && -cp bzlib.h /usr/include && +ln -s libbz2.so.1.0 libbz2.so && cp -a libbz2.so* /lib && -rm /usr/lib/libbz2.a && -cp libbz2.a /usr/lib && cd /usr/lib && ln -sf ../../lib/libbz2.so && +cd /usr/bin && +rm bunzip2 bzcat bzip2 && +mv bzip2recover bzless bzmore /bin && cd /bin && ln -sf bzip2 bunzip2 && -ln -sf bzip2 bzcat && -cd /usr/share/man/man1 && -ln -sf bzip2.1 bunzip2.1 && -ln -sf bzip2.1 bzcat.1 && -ln -sf bzip2.1 bzip2recover.1 +ln -sf bzip2 bzcat + Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 3c7601438..2db19f760 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -12,7 +12,7 @@ &c6-makedev; &c6-manpages; &c6-findutils; -&c6-mawk; +&c6-gawk; &c6-ncurses; &c6-vim; &c6-gcc; diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml deleted file mode 100644 index 199bd0f56..000000000 --- a/chapter06/mawk-inst.xml +++ /dev/null @@ -1,14 +0,0 @@ - -Installation of Mawk - -Install Mawk by running the following commands: - -./configure && -make && -make BINDIR=/usr/bin \ -   MANDIR=/usr/share/man/man1 install && -cd /usr/bin && -ln -sf mawk awk - - - diff --git a/chapter06/mawk.xml b/chapter06/mawk.xml deleted file mode 100644 index b79830b62..000000000 --- a/chapter06/mawk.xml +++ /dev/null @@ -1,13 +0,0 @@ - -Installing Mawk-&mawk-version; - - -Estimated build time: &mawk-time; -Estimated required disk space: &mawk-compsize; - -&c6-mawk-inst; -&aa-mawk-desc; -&aa-mawk-dep; - - - diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index d89b56931..7af472138 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -9,24 +9,14 @@ passwords and how to get the most out of this Shadow package. Install the Shadow Password Suite by running the following commands: -cp src/useradd.c src/useradd.c.backup && -sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \ -   src/useradd.c.backup > src/useradd.c && -./configure --prefix=/usr && +./configure --prefix=/usr && make && make install && cd etc && cp limits login.access /etc && sed 's%/var/spool/mail%/var/mail%' login.defs.linux > /etc/login.defs && -cd /lib && -mv libshadow.*a /usr/lib && -ln -sf libshadow.so.0 libshadow.so && -cd /usr/lib && -ln -sf ../../lib/libshadow.so && cd /usr/sbin && -ln -sf vipw vigr && -cd /usr/share/man/man8 && -ln -sf vipw.8 vigr.8 +ln -sf vipw vigr diff --git a/index.xml b/index.xml index 531a94bd4..218dd8a04 100644 --- a/index.xml +++ b/index.xml @@ -4,8 +4,8 @@ - - + + @@ -92,7 +92,7 @@ - + @@ -174,9 +174,8 @@ - - - + + @@ -217,8 +216,8 @@ - - + + @@ -479,10 +478,10 @@ - - - - + + + + @@ -600,10 +599,10 @@ - + - + @@ -646,7 +645,7 @@ - + @@ -738,18 +737,18 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -771,7 +770,7 @@ - + @@ -800,7 +799,7 @@ - + @@ -846,7 +845,7 @@ - + @@ -855,7 +854,7 @@ - + @@ -900,7 +899,7 @@ - + @@ -909,7 +908,7 @@ - + @@ -945,7 +944,7 @@ - + @@ -965,7 +964,7 @@ - + @@ -974,7 +973,7 @@ - + @@ -983,7 +982,7 @@ - + @@ -992,7 +991,7 @@ - + @@ -1028,7 +1027,7 @@ - + @@ -1055,7 +1054,7 @@ - +