diff options
| -rw-r--r-- | appendixa/zlib-down.xml | 5 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 8 | ||||
| -rw-r--r-- | chapter04/chapter04.xml | 3 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 54 | ||||
| -rw-r--r-- | entities/lfs-utils.ent | 6 | ||||
| -rw-r--r-- | entities/tcl.ent | 8 | ||||
| -rw-r--r-- | entities/zlib.ent | 11 |
7 files changed, 46 insertions, 49 deletions
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml index 76570bf1e..9c725ecc7 100644 --- a/appendixa/zlib-down.xml +++ b/appendixa/zlib-down.xml @@ -4,8 +4,5 @@ <title>Official Download Location</title> <literallayout>Zlib (&zlib-version;): -<ulink url="http://www.gzip.org/zlib/"/> - -Zlib Vsnprintf Patch: -<ulink url="&patches-root;&zlib-patch;"/></literallayout> +<ulink url="http://www.gzip.org/zlib/"/></literallayout> </sect2> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e9d7ddc09..d877781a1 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -13,11 +13,13 @@ <listitem><para>file-4.06</para></listitem> <listitem><para>gcc-3.3.2</para></listitem> <listitem><para>man-pages-1.63</para></listitem> -<listitem><para>lfs-utils-0.4.1</para></listitem> +<listitem><para>lfs-utils-0.4.2</para></listitem> <listitem><para>modutils-2.4.26</para></listitem> <listitem><para>perl-5.8.2</para></listitem> <listitem><para>procps-3.1.14</para></listitem> <listitem><para>sed-4.0.8</para></listitem> +<listitem><para>tcl-8.4.5</para></listitem> +<listitem><para>zlib-1.2.1</para></listitem> </itemizedlist> </listitem> @@ -36,9 +38,13 @@ <listitem><para>man-1.5m2-pager.patch</para></listitem> <listitem><para>ncurses-5.3-vsscanf.patch</para></listitem> <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem> +<listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem> </itemizedlist> </listitem> +<listitem><para>November 26th, 2003 [greg]: Upgraded to Lfs-Utils-0.4.2, +Tcl-8.4.5 and Zlib-1.2.1. Obsoletes the Zlib Vsnprintf patch.</para></listitem> + <listitem><para>November 23rd, 2003 [greg]: Upgraded to Lfs-Utils-0.4.1 and improved its build commands.</para></listitem> diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 5a1be1998..f53ab3127 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -313,9 +313,6 @@ Perl Libc Patch - &perl-libc-patch-size;: Shadow Newgrp Patch - &shadow-patch-size;: <ulink url="&patches-root;&shadow-patch;"/> - -Zlib Vsnprintf Patch - &zlib-patch-size;: -<ulink url="&patches-root;&zlib-patch;"/> </literallayout> <para>In addition to the above required patches, there exist a number of diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 354994793..5c9e7b6e6 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -13,13 +13,7 @@ Estimated required disk space: &zlib-compsize;</screen> <sect2> <title>Installation of Zlib</title> -<para>Zlib has a potential buffer overflow in its -<emphasis>gzprintf()</emphasis> function, that, though difficult to take -advantage of, should be taken care of by applying this patch:</para> - -<screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen> - -<para>Now prepare Zlib for compilation:</para> +<para>Prepare Zlib for compilation:</para> <screen><userinput>./configure --prefix=/usr --shared</userinput></screen> @@ -33,45 +27,51 @@ afterwards.</para></note> <screen><userinput>make</userinput></screen> -<para>Install the shared libraries:</para> +<para>This package has a test suite available which can perform a number of +checks to ensure it built correctly. The test suite for Zlib is quick and +painless so we recommend it be run. The following command will test the shared +library:</para> + +<screen><userinput>make check</userinput></screen> + +<para>Install the shared library:</para> <screen><userinput>make install</userinput></screen> -<para>Now also build the non-shared libraries:</para> +<para>Now also build the non-shared (static) library:</para> <screen><userinput>make clean ./configure --prefix=/usr make</userinput></screen> -<para>This package has a test suite available which can perform a number of -checks to ensure it built correctly. Should you choose to run it, the -following command will do so:</para> +<para>The following command will test the static library:</para> -<screen><userinput>make test</userinput></screen> +<screen><userinput>make check</userinput></screen> <para>And install the package:</para> <screen><userinput>make install</userinput></screen> -<para>The shared Zlib library should be installed in the -<filename>/lib</filename> directory. That way, in the event -that you must boot without the <filename>/usr</filename> -directory, vital system programs will still have access to -the library:</para> +<para>It is good policy and common practice to place important libraries into +the <filename class="directory">/lib</filename> directory. This matters most +in scenarios where <filename class="directory">/usr</filename> is on a +separate partition. Essentially, the run-time components of any libraries +depended upon by programs in <filename class="directory">/bin</filename> or +<filename class="directory">/sbin</filename> should reside in +<filename class="directory">/lib</filename> so that they are on the root +partition and available in the event of +<filename class="directory">/usr</filename> being inaccessible.</para> + +<para>Therefore we move the run-time components of the shared Zlib into +<filename class="directory">/lib</filename> by issuing the following +command:</para> <screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen> -<para>The <filename>/usr/lib/libz.so</filename> symlink is -linked to a file which no longer exists, because we moved -it. Create a symbolic link to the new location of the -library:</para> +<para>Now we need to fix up the <filename>/usr/lib/libz.so</filename> symlink +because we just moved the location of the file it points to:</para> <screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen> -<para>Zlib does not install its manual page. Issue the -following command to install this documentation:</para> - -<screen><userinput>cp zlib.3 /usr/share/man/man3</userinput></screen> - </sect2> </sect1> diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent index 318fa4bbc..eaa64c004 100644 --- a/entities/lfs-utils.ent +++ b/entities/lfs-utils.ent @@ -6,12 +6,12 @@ <!ENTITY aa-lfs-utils-dep SYSTEM "../appendixa/lfs-utils-dep.xml"> <!ENTITY aa-lfs-utils-down SYSTEM "../appendixa/lfs-utils-down.xml"> -<!ENTITY lfs-utils-version "0.4.1"> +<!ENTITY lfs-utils-version "0.4.2"> <!ENTITY lfs-utils-depversion ""> -<!ENTITY lfs-utils-contversion "0.4.1"> +<!ENTITY lfs-utils-contversion "0.4.2"> <!ENTITY lfs-utils-dir "lfs-utils-&lfs-utils-version;"> <!ENTITY lfs-utils-package "lfs-utils-&lfs-utils-version;.tar.bz2"> -<!ENTITY lfs-utils-size "225 KB"> +<!ENTITY lfs-utils-size "221 KB"> <!ENTITY lfs-utils-compsize "1.1 MB"> <!ENTITY lfs-utils-time "0.1 SBU"> diff --git a/entities/tcl.ent b/entities/tcl.ent index 8d93dd6f7..47dbc0fce 100644 --- a/entities/tcl.ent +++ b/entities/tcl.ent @@ -6,12 +6,12 @@ <!ENTITY aa-tcl-dep SYSTEM "../appendixa/tcl-dep.xml"> <!ENTITY aa-tcl-down SYSTEM "../appendixa/tcl-down.xml"> -<!ENTITY tcl-version "8.4.4"> -<!ENTITY tcl-depversion "8.4.4"> -<!ENTITY tcl-contversion "8.4.4"> +<!ENTITY tcl-version "8.4.5"> +<!ENTITY tcl-depversion "8.4.5"> +<!ENTITY tcl-contversion "8.4.5"> <!ENTITY tcl-dir "tcl-&tcl-version;"> <!ENTITY tcl-package "tcl-&tcl-version;.tar.gz"> -<!ENTITY tcl-size "3,292 KB"> +<!ENTITY tcl-size "3,363 KB"> <!ENTITY tcl-compsize-tools "23 MB"> <!ENTITY tcl-time-tools "0.9 SBU"> diff --git a/entities/zlib.ent b/entities/zlib.ent index a405c9425..5e5509259 100644 --- a/entities/zlib.ent +++ b/entities/zlib.ent @@ -6,15 +6,12 @@ <!ENTITY aa-zlib-dep SYSTEM "../appendixa/zlib-dep.xml"> <!ENTITY aa-zlib-down SYSTEM "../appendixa/zlib-down.xml"> -<!ENTITY zlib-version "1.1.4"> -<!ENTITY zlib-depversion "1.1.4"> -<!ENTITY zlib-contversion "1.1.4"> +<!ENTITY zlib-version "1.2.1"> +<!ENTITY zlib-depversion "1.2.1"> +<!ENTITY zlib-contversion "1.2.1"> <!ENTITY zlib-dir "zlib-&zlib-version;"> <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2"> -<!ENTITY zlib-size "144 KB"> - -<!ENTITY zlib-patch "zlib-&zlib-version;-vsnprintf.patch"> -<!ENTITY zlib-patch-size "10 KB"> +<!ENTITY zlib-size "277 KB"> <!ENTITY zlib-compsize "1.5 MB"> <!ENTITY zlib-time "0.1 SBU"> |