diff options
37 files changed, 108 insertions, 80 deletions
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml index 345a7d929..6867ef504 100644 --- a/appendixa/gcc-down.xml +++ b/appendixa/gcc-down.xml @@ -2,9 +2,5 @@ <title>Official Download Location</title> <para><literallayout>GCC (&gcc-version;): -<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/> - -GCC Patch (&gcc-patch-version;): -<ulink url="&ftp;/"/> -<ulink url="&http;/"/></literallayout></para> +<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/></literallayout></para> </sect2> diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml index c7b5705a5..68c33c036 100644 --- a/appendixa/ncurses-down.xml +++ b/appendixa/ncurses-down.xml @@ -2,5 +2,9 @@ <title>Official Download Location</title> <para><literallayout>Ncurses (&ncurses-version;): -<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/></literallayout></para> +<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/> + +Ncurses Patch (&ncurses-version;): +<ulink url="&ftp;/"/> +<ulink url="&http;/"/></literallayout></para> </sect2> diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml index ede165d48..6c1e4976a 100644 --- a/appendixa/perl-down.xml +++ b/appendixa/perl-down.xml @@ -2,5 +2,9 @@ <title>Official Download Location</title> <para><literallayout>Perl (&perl-version;): -<ulink url="http://www.perl.com/"/></literallayout></para> +<ulink url="http://www.perl.com/"/> + +Perl Patch (&perl-version;): +<ulink url="&ftp;/"/> +<ulink url="&http;/"/></literallayout></para> </sect2> diff --git a/appendixa/vim-down.xml b/appendixa/vim-down.xml index 6d3ae1c52..337713f42 100644 --- a/appendixa/vim-down.xml +++ b/appendixa/vim-down.xml @@ -2,5 +2,9 @@ <title>Official Download Location</title> <para><literallayout>Vim (&vim-version;): -<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"/></literallayout></para> +<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/"/> + +Vim Patch (&vim-version;): +<ulink url="&ftp;/"/> +<ulink url="&http;/"/></literallayout></para> </sect2> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c87aba039..a2330b008 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -7,26 +7,43 @@ <itemizedlist> <listitem><para>Updated to: - <itemizedlist> +<listitem><para>automake-1.6.1</para></listitem> +<listitem><para>bin86-0.16.3</para></listitem> <listitem><para>bison-1.35</para></listitem> <listitem><para>diffutils-2.8.1</para></listitem> +<listitem><para>file-3.38</para></listitem> +<listitem><para>gawk-3.1.1</para></listitem> +<listitem><para>gcc-3.1</para></listitem> +<listitem><para>gettext-0.11.2</para></listitem> <listitem><para>MAKEDEV-1.5</para></listitem> +<listitem><para>modutils-2.4.16</para></listitem> +<listitem><para>psmisc-21</para></listitem> <listitem><para>texinfo-4.2</para></listitem> -<listitem><para>util-linux-2.11q</para></listitem> +<listitem><para>util-linux-2.11r</para></listitem> </itemizedlist> +</para></listitem> +<listitem><para>Added: +<itemizedlist> +<listitem><para>ncurses-5.2.patch</para></listitem> +<listitem><para>perl-5.6.1.patch</para></listitem> +<listitem><para>vim-6.1.patch</para></listitem> +</itemizedlist> </para></listitem> <listitem><para>Removed: - <itemizedlist> -<listitem><para>gzip-1.2.4a-patch</para></listitem> -<listitem><para>sh-utils-2.0-patch</para></listitem> +<listitem><para>gzip-1.2.4a.patch</para></listitem> +<listitem><para>sh-utils-2.0.patch</para></listitem> </itemizedlist> - </para></listitem> +<listitem><para>May 26th, 2002 [gerard]: Upgraded to: automake-1.6.1, +bin86-0.16.3, file-3.38, gawk-3.1.1, gcc-3.1, gettext-0.11.2, +modutils-2.4.16, psmisc-21 and util-linux-2.11r. Added gcc-3.1 compile fix +patches for ncurses, perl and vim.</para></listitem> + <listitem><para>May 26th, 2002 [gerard]: Chapter 05+06 - Binutils: Removed the tooldir setting from chapter 05-binutils, moved its description to chapter 06-binutils.</para></listitem> diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml deleted file mode 100644 index f93b6248e..000000000 --- a/chapter04/gcc-patch.xml +++ /dev/null @@ -1,3 +0,0 @@ -GCC Patch (&gcc-patch-version;) - &gcc-patch-size;: -<ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/> -<ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/> diff --git a/chapter04/ncurses-patch.xml b/chapter04/ncurses-patch.xml new file mode 100644 index 000000000..67a6672d6 --- /dev/null +++ b/chapter04/ncurses-patch.xml @@ -0,0 +1,3 @@ +Ncurses Patch (&ncurses-version;) - &ncurses-patch-size;: +<ulink url="&ftp;/ncurses-&ncurses-version;.patch.bz2"/> +<ulink url="&http;/ncurses-&ncurses-version;.patch.bz2"/> diff --git a/chapter04/packages.xml b/chapter04/packages.xml index e527a73c4..6a761c084 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -11,7 +11,6 @@ &c3-diffutils; &c3-fileutils; &c3-gcc; -&c3-gcc-patch; &c3-kernel; &c3-grep; &c3-gzip; @@ -32,12 +31,15 @@ &c3-findutils; &c3-findutils-patch; &c3-ncurses; +&c3-ncurses-patch; &c3-vim; +&c3-vim-patch; &c3-bison; &c3-less; &c3-groff; &c3-man; &c3-perl; +&c3-perl-patch; &c3-m4; &c3-autoconf; &c3-automake; diff --git a/chapter04/perl-patch.xml b/chapter04/perl-patch.xml new file mode 100644 index 000000000..451eed9ce --- /dev/null +++ b/chapter04/perl-patch.xml @@ -0,0 +1,3 @@ +Perl Patch (&perl-version;) - &perl-patch-size;: +<ulink url="&ftp;/perl-&perl-version;.patch.bz2"/> +<ulink url="&http;/perl-&perl-version;.patch.bz2"/> diff --git a/chapter04/vim-patch.xml b/chapter04/vim-patch.xml new file mode 100644 index 000000000..cc375793c --- /dev/null +++ b/chapter04/vim-patch.xml @@ -0,0 +1,3 @@ +Vim Patch (&vim-version;) - &vim-patch-size;: +<ulink url="&ftp;/vim-&vim-version;.patch.bz2"/> +<ulink url="&http;/vim-&vim-version;.patch.bz2"/> diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index 7d9d5f773..d79d92c14 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -1,11 +1,6 @@ <sect2> <title>Command explanations</title> -<para><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch:</userinput> -This patch deals with the incorrect handling of weak symbols, the -over-optimization of calls to those weak symbols, an atexit issue, and -the __dso_handle symbol required for atexit's proper function.</para> - <para><userinput>make BOOT_LDFLAGS=-static:</userinput> This is the equivalent to make LDFLAGS=-static as we use with other packages to compile them statically.</para> @@ -31,11 +26,5 @@ cpp in /lib.</para> creates the $LFS/usr/lib/cpp symlink as there are packages that expect cpp to be in /usr/lib.</para> -<para><userinput>rmdir $LFS/usr/*-gnu/include</userinput> and -<userinput>rmdir $LFS/usr/*-gnu</userinput>: These directories are created -as empty directories by GCC and serve absolutely no purpose whatsoever. -It's related to cross-compilers but that doesn't apply to us and it's -considered a bug in GCC that you can't turn that off, especially since they -end up being empty directories. So we remove them manually.</para> </sect2> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index ad9f79f51..f9dbc238a 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -14,16 +14,13 @@ been warned.</para> <para>Install GCC by running the following commands:</para> -<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -mkdir ../gcc-build && +<para><screen><userinput>mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c,c++ \ --disable-nls --disable-shared --enable-threads=posix && make BOOT_LDFLAGS=-static bootstrap && make prefix=$LFS/static install && -ln -s gcc $LFS/static/bin/cc && -rmdir $LFS/static/*-gnu/include && -rmdir $LFS/static/*-gnu</userinput></screen></para> +ln -s gcc $LFS/static/bin/cc</userinput></screen></para> </sect2> diff --git a/chapter06/file-exp.xml b/chapter06/file-exp.xml deleted file mode 100644 index b2a69083c..000000000 --- a/chapter06/file-exp.xml +++ /dev/null @@ -1,11 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in</userinput>: -This command works around an error which occurs when compiling file with -automake-1.5 installed by changing the modification dates of some files to -the current date. Changing the date will cause make to think the files are -already up-to-date so they're not recreated.</para> - -</sect2> - diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index 43696cf9a..a985f51b6 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -3,8 +3,7 @@ <para>Install File by running the following commands:</para> -<para><screen><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in && -./configure --prefix=/usr --datadir=/usr/share/misc && +<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc && make && make install</userinput></screen></para> diff --git a/chapter06/file.xml b/chapter06/file.xml index 81f9224e2..974f27630 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -6,7 +6,6 @@ Estimated required disk space: &file-compsize;</screen> &c6-file-inst; -&c6-file-exp; &aa-file-desc; &aa-file-dep; diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index 543269f3a..b8c48bdf0 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -7,7 +7,7 @@ commands.</para> <para>Install Findutils by running the following commands:</para> -<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch && +<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-version;.patch && ./configure --prefix=/usr && make libexecdir=/usr/bin && make libexecdir=/usr/bin install</userinput></screen></para> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 33eaee7f7..35eab2365 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -22,18 +22,16 @@ are available.</para> <para>Note: the build of other compilers is not tested by the people who actively work on LFS.</para> -<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -mkdir ../gcc-build && +<para><screen><userinput>mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ - --enable-languages=c,c++ --enable-threads=posix && + --enable-languages=c,c++ --enable-threads=posix \ + --with-slibdir=/lib && make bootstrap && make install && ln -sf ../usr/bin/cpp /lib && ln -sf ../bin/cpp /usr/lib && -ln -sf gcc /usr/bin/cc && -rmdir /usr/*-gnu/include && -rmdir /usr/*-gnu</userinput></screen></para> +ln -sf gcc /usr/bin/cc</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml index f7fb2ef06..4145f8481 100644 --- a/chapter06/ncurses-exp.xml +++ b/chapter06/ncurses-exp.xml @@ -1,6 +1,11 @@ <sect2> <title>Command explanations</title> +<para><userinput>patch -Np1 -i +../ncurses-&ncurses-version;-patch:</userinput> This patch fixes a compile +problem with GCC-3.1 because Ncurses uses constructions that are no longer +valid in the new C++ standard.</para> + <para><userinput>--with-shared:</userinput> This enables the build of the shared ncurses library files.</para> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 26b9cb05c..226d0392a 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -3,7 +3,8 @@ <para>Install Ncurses by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \ +<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-patch && +./configure --prefix=/usr --libdir=/lib \ --with-shared --disable-termcap && make && make install && diff --git a/chapter06/perl-exp.xml b/chapter06/perl-exp.xml new file mode 100644 index 000000000..01b4140c7 --- /dev/null +++ b/chapter06/perl-exp.xml @@ -0,0 +1,8 @@ +<sect2> +<title>Command explanations</title> + +<para><userinput>patch -Np1 -i ../perl-&perl-version;.patch:</userinput> This +patch fixes a compile problem with GCC-3.1.</para> + +</sect2> + diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index 66b067ed2..313fcf3fc 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -3,7 +3,8 @@ <para>Install Perl by running the following commands:</para> -<para><screen><userinput>./configure.gnu --prefix=/usr && +<para><screen><userinput>patch -Np1 -i ../perl-&perl-version;.patch && +./configure.gnu --prefix=/usr && make && make install</userinput></screen></para> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 5a56590ef..33b87163a 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -6,6 +6,7 @@ Estimated required disk space: &perl-compsize;</screen> &c6-perl-inst; +&c6-perl-exp; &aa-perl-desc; &aa-perl-dep; diff --git a/chapter06/vim-exp.xml b/chapter06/vim-exp.xml index 62af4675a..570141334 100644 --- a/chapter06/vim-exp.xml +++ b/chapter06/vim-exp.xml @@ -1,6 +1,9 @@ <sect2> <title>Command explanations</title> +<para><userinput>patch -Np1 -i ../vim-&vim-version;.patch:</userinput> This +patch fixes a compile problem with GCC-3.1.</para> + <para><userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":</userinput> Setting this will cause vim to look for the <filename>/etc/vimrc</filename> file that diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index e7e46a57a..69979fb86 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -9,7 +9,8 @@ which are currently available are for Emacs, Joe and nano.</para> <para>Install Vim by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr && +<para><screen><userinput>patch -Np1 -i ../vim-&vim-version;.patch && +./configure --prefix=/usr && make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && make install && ln -sf vim /usr/bin/vi</userinput></screen></para> diff --git a/entities/automake.ent b/entities/automake.ent index a2c87f9e8..8e7a45c96 100644 --- a/entities/automake.ent +++ b/entities/automake.ent @@ -8,10 +8,10 @@ <!ENTITY aa-automake-dep SYSTEM "../appendixa/automake-dep.xml"> <!ENTITY aa-automake-down SYSTEM "../appendixa/automake-down.xml"> -<!ENTITY automake-version "1.6"> +<!ENTITY automake-version "1.6.1"> <!ENTITY automake-depversion "1.5"> <!ENTITY automake-contversion "1.5"> -<!ENTITY automake-size "451 KB"> +<!ENTITY automake-size "486 KB"> <!ENTITY automake-package "automake-&automake-version;.tar.bz2"> <!ENTITY automake-dir "automake-&automake-version;"> diff --git a/entities/bin86.ent b/entities/bin86.ent index 8f3ba740d..5e0fe5e18 100644 --- a/entities/bin86.ent +++ b/entities/bin86.ent @@ -8,10 +8,10 @@ <!ENTITY aa-bin86-dep SYSTEM "../appendixa/bin86-dep.xml"> <!ENTITY aa-bin86-down SYSTEM "../appendixa/bin86-down.xml"> -<!ENTITY bin86-version "0.16.2"> +<!ENTITY bin86-version "0.16.3"> <!ENTITY bin86-depversion "0.16.0"> <!ENTITY bin86-contversion "0.16.0"> -<!ENTITY bin86-size "112 KB"> +<!ENTITY bin86-size "113 KB"> <!ENTITY bin86-dir "bin86-&bin86-version;"> <!ENTITY bin86-package "bin86-&bin86-version;.tar.bz2"> diff --git a/entities/file.ent b/entities/file.ent index 9207aae02..d6fc6db94 100644 --- a/entities/file.ent +++ b/entities/file.ent @@ -2,17 +2,16 @@ <!ENTITY c6-file SYSTEM "../chapter06/file.xml"> <!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml"> -<!ENTITY c6-file-exp SYSTEM "../chapter06/file-exp.xml"> <!ENTITY aa-file SYSTEM "../appendixa/file.xml"> <!ENTITY aa-file-desc SYSTEM "../appendixa/file-desc.xml"> <!ENTITY aa-file-dep SYSTEM "../appendixa/file-dep.xml"> <!ENTITY aa-file-down SYSTEM "../appendixa/file-down.xml"> -<!ENTITY file-version "3.37"> +<!ENTITY file-version "3.38"> <!ENTITY file-depversion "3.37"> <!ENTITY file-contversion "3.37"> -<!ENTITY file-size "140 KB"> +<!ENTITY file-size "149 KB"> <!ENTITY file-dir "file-&file-version;"> <!ENTITY file-package "file-&file-version;.tar.bz2"> diff --git a/entities/gawk.ent b/entities/gawk.ent index 50ca823ac..f97af4ec9 100644 --- a/entities/gawk.ent +++ b/entities/gawk.ent @@ -11,10 +11,10 @@ <!ENTITY aa-gawk-dep SYSTEM "../appendixa/gawk-dep.xml"> <!ENTITY aa-gawk-down SYSTEM "../appendixa/gawk-down.xml"> -<!ENTITY gawk-version "3.1.0"> +<!ENTITY gawk-version "3.1.1"> <!ENTITY gawk-depversion "3.1.0"> <!ENTITY gawk-contversion "3.1.0"> -<!ENTITY gawk-size "1,286 KB"> +<!ENTITY gawk-size "1,420 KB"> <!ENTITY gawk-dir "gawk-&gawk-version;"> <!ENTITY gawk-package "gawk&gawk-version;.tar.bz2"> diff --git a/entities/gcc.ent b/entities/gcc.ent index aac28107a..1bb40891f 100644 --- a/entities/gcc.ent +++ b/entities/gcc.ent @@ -13,12 +13,10 @@ <!ENTITY aa-gcc-dep SYSTEM "../appendixa/gcc-dep.xml"> <!ENTITY aa-gcc-down SYSTEM "../appendixa/gcc-down.xml"> -<!ENTITY gcc-version "2.95.3"> +<!ENTITY gcc-version "3.1"> <!ENTITY gcc-depversion "2.95.3"> <!ENTITY gcc-contversion "2.95.3"> -<!ENTITY gcc-size "9,618 KB"> -<!ENTITY gcc-patch-version "2.95.3-2"> -<!ENTITY gcc-patch-size "8 KB"> +<!ENTITY gcc-size "19,966 KB"> <!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2"> <!ENTITY gcc-dir "gcc-&gcc-version;"> diff --git a/entities/gettext.ent b/entities/gettext.ent index 36a653c68..6e5082034 100644 --- a/entities/gettext.ent +++ b/entities/gettext.ent @@ -8,10 +8,10 @@ <!ENTITY aa-gettext-dep SYSTEM "../appendixa/gettext-dep.xml"> <!ENTITY aa-gettext-down SYSTEM "../appendixa/gettext-down.xml"> -<!ENTITY gettext-version "0.11.1"> +<!ENTITY gettext-version "0.11.2"> <!ENTITY gettext-depversion "0.10.40"> <!ENTITY gettext-contversion "0.10.40"> -<!ENTITY gettext-size "2,039 KB"> +<!ENTITY gettext-size "2,120 KB"> <!ENTITY gettext-dir "gettext-&gettext-version;"> <!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2"> diff --git a/entities/modutils.ent b/entities/modutils.ent index 9674a05bc..dcf3d129f 100644 --- a/entities/modutils.ent +++ b/entities/modutils.ent @@ -8,7 +8,7 @@ <!ENTITY aa-modutils-dep SYSTEM "../appendixa/modutils-dep.xml"> <!ENTITY aa-modutils-down SYSTEM "../appendixa/modutils-down.xml"> -<!ENTITY modutils-version "2.4.15"> +<!ENTITY modutils-version "2.4.16"> <!ENTITY modutils-depversion "2.4.12"> <!ENTITY modutils-contversion "2.4.12"> <!ENTITY modutils-size "211 KB"> diff --git a/entities/ncurses.ent b/entities/ncurses.ent index bceb52b54..995ad24bc 100644 --- a/entities/ncurses.ent +++ b/entities/ncurses.ent @@ -1,4 +1,5 @@ <!ENTITY c3-ncurses SYSTEM "../chapter03/ncurses.xml"> +<!ENTITY c3-ncurses-patch SYSTEM "../chapter03/ncurses-patch.xml"> <!ENTITY c6-ncurses SYSTEM "../chapter06/ncurses.xml"> <!ENTITY c6-ncurses-inst SYSTEM "../chapter06/ncurses-inst.xml"> @@ -13,6 +14,7 @@ <!ENTITY ncurses-depversion "5.2"> <!ENTITY ncurses-contversion "5.2"> <!ENTITY ncurses-size "1,308 KB"> +<!ENTITY ncurses-patch-size "1 KB"> <!ENTITY ncurses-dir "ncurses-&ncurses-version;"> <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2"> diff --git a/entities/perl.ent b/entities/perl.ent index 2f4335058..ac4ad82f3 100644 --- a/entities/perl.ent +++ b/entities/perl.ent @@ -1,7 +1,9 @@ <!ENTITY c3-perl SYSTEM "../chapter03/perl.xml"> +<!ENTITY c3-perl-patch SYSTEM "../chapter03/perl-patch.xml"> <!ENTITY c6-perl SYSTEM "../chapter06/perl.xml"> <!ENTITY c6-perl-inst SYSTEM "../chapter06/perl-inst.xml"> +<!ENTITY c6-perl-exp SYSTEM "../chapter06/perl-exp.xml"> <!ENTITY aa-perl SYSTEM "../appendixa/perl.xml"> <!ENTITY aa-perl-desc SYSTEM "../appendixa/perl-desc.xml"> @@ -12,6 +14,7 @@ <!ENTITY perl-depversion "5.6.1"> <!ENTITY perl-contversion "5.6.1"> <!ENTITY perl-size "4,750 KB"> +<!ENTITY perl-patch-size "4 KB"> <!ENTITY perl-dir "perl-&perl-version;"> <!ENTITY perl-package "perl-&perl-version;.tar.bz2"> diff --git a/entities/psmisc.ent b/entities/psmisc.ent index 1c5be78aa..61338c4bc 100644 --- a/entities/psmisc.ent +++ b/entities/psmisc.ent @@ -9,10 +9,10 @@ <!ENTITY aa-psmisc-dep SYSTEM "../appendixa/psmisc-dep.xml"> <!ENTITY aa-psmisc-down SYSTEM "../appendixa/psmisc-down.xml"> -<!ENTITY psmisc-version "20.2"> +<!ENTITY psmisc-version "21"> <!ENTITY psmisc-depversion "20.2"> <!ENTITY psmisc-contversion "20.2"> -<!ENTITY psmisc-size "123 KB"> +<!ENTITY psmisc-size "172 KB"> <!ENTITY psmisc-dir "psmisc-&psmisc-version;"> <!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2"> diff --git a/entities/utillinux.ent b/entities/utillinux.ent index 5259ac969..2f0427767 100644 --- a/entities/utillinux.ent +++ b/entities/utillinux.ent @@ -12,7 +12,7 @@ <!ENTITY aa-utillinux-dep SYSTEM "../appendixa/utillinux-dep.xml"> <!ENTITY aa-utillinux-down SYSTEM "../appendixa/utillinux-down.xml"> -<!ENTITY util-linux-version "2.11q"> +<!ENTITY util-linux-version "2.11r"> <!ENTITY util-linux-depversion "2.11n"> <!ENTITY util-linux-contversion "2.11n"> <!ENTITY util-linux-size "1,035 KB"> diff --git a/entities/vim.ent b/entities/vim.ent index b9461e3cb..e58e904f6 100644 --- a/entities/vim.ent +++ b/entities/vim.ent @@ -1,4 +1,5 @@ <!ENTITY c3-vim SYSTEM "../chapter03/vim.xml"> +<!ENTITY c3-vim-patch SYSTEM "../chapter03/vim-patch.xml"> <!ENTITY c6-vim SYSTEM "../chapter06/vim.xml"> <!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml"> @@ -14,6 +15,7 @@ <!ENTITY vim-depversion "6.0"> <!ENTITY vim-contversion "6.0"> <!ENTITY vim-size "2,890 KB"> +<!ENTITY vim-patch-size "4 KB"> <!ENTITY vim-dir "vim&vim-version;"> <!ENTITY vim-package "vim-&vim-version;.tar.bz2"> @@ -13,9 +13,9 @@ <!ENTITY http "http://ftp.linuxfromscratch.org/lfs-packages/cvs"> <!ENTITY hints-root "http://hints.linuxfromscratch.org/hints/"> -<!ENTITY all-version "cvs-20020501-1159"> -<!ENTITY all-size-kb "87,320 KB"> -<!ENTITY all-size-mb "85.27 MB"> +<!ENTITY all-version "cvs-20020526-2002"> +<!ENTITY all-size-kb "97,940 KB"> +<!ENTITY all-size-mb "95.64 MB"> <!ENTITY % parts SYSTEM "entities/parts.ent"> <!ENTITY % bookinfo SYSTEM "entities/bookinfo.ent"> |