aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2005-07-23 11:58:40 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2005-07-23 11:58:40 +0000
commit23bafc91801f542bc2c46b47c1dd75846164539c (patch)
tree178000a8b9c1fb7d7893bf20544244797106f5a2
parentf6eeb399c6509139b03c2f8ceebb455934143792 (diff)
Upgrade to zlib-1.2.3
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6576 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter03/packages.xml2
-rw-r--r--chapter03/patches.xml6
-rw-r--r--chapter06/zlib.xml5
-rw-r--r--general.ent2
5 files changed, 6 insertions, 14 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2a5cd688c..9f60f79c9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -81,7 +81,7 @@ First a summary, then a detailed log.</para>
<listitem><para>Udev &udev-version;</para></listitem>
<!-- <listitem><para>Util-Linux &util-linux-version;</para></listitem> -->
<!-- <listitem><para>Vim &vim-version;</para></listitem> -->
-<!-- <listitem><para>Zlib &zlib-version;</para></listitem> -->
+<listitem><para>Zlib &zlib-version;</para></listitem>
</itemizedlist>
</listitem>
@@ -104,9 +104,12 @@ First a summary, then a detailed log.</para>
<listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
<listitem><para>iproute2-2.6.11-050330-remove_db-1.patch</para></listitem>
<listitem><para>perl-5.8.6-libc-1.patch</para></listitem>
+<listitem><para>zlib-1.2.2-security_fix-1.patch</para></listitem>
</itemizedlist>
</listitem>
+<listitem><para>July 22nd, 2005 [matt]: Updated to zlib-1.2.3.</para></listitem>
+
<listitem><para>July 22th, 2005 [manuel]: Added obfuscate.sh and modified the
Makefile to obfuscate e-mail addresses in XHTML output.</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index d3a2c37f3..feff60006 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -422,7 +422,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
</varlistentry>
<varlistentry>
-<term>Zlib (&zlib-version;) - 368 KB:</term>
+<term>Zlib (&zlib-version;) - 415 KB:</term>
<listitem>
<para><ulink url="http://www.zlib.net/"/></para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 132c130b3..9a03056eb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -147,12 +147,6 @@ needed to build an LFS system:</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term>Zlib Security Patch - 1 KB:</term><listitem>
-<para><ulink url="&patches-root;&zlib-security_fix-patch;"/></para>
-</listitem>
-</varlistentry>
-
</variablelist>
<para>In addition to the above required patches, there exist a number of
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 4f08df639..c11a41f62 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -30,11 +30,6 @@ some programs.</para>
<sect2 role="installation">
<title>Installation of Zlib</title>
-<para>Zlib has a buffer overflow vulnerability that can lead to a Denial of
-Service attack. The following patch fixes the problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&zlib-security_fix-patch;</userinput></screen>
-
<note><para>Zlib is known to build its shared library incorrectly if
<envar>CFLAGS</envar> is specified in the environment. If using a
specified <envar>CFLAGS</envar>
diff --git a/general.ent b/general.ent
index 56f83ecd0..0f3266674 100644
--- a/general.ent
+++ b/general.ent
@@ -78,4 +78,4 @@
<!ENTITY udev-version "063">
<!ENTITY util-linux-version "2.12q">
<!ENTITY vim-version "6.3">
-<!ENTITY zlib-version "1.2.2">
+<!ENTITY zlib-version "1.2.3">