aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchaic <archaic@linuxfromscratch.org>2005-07-06 18:51:27 +0000
committerArchaic <archaic@linuxfromscratch.org>2005-07-06 18:51:27 +0000
commitcf62a33e4fccb15782427b27123384aed169f96d (patch)
tree9092191fd4de17b68dd1d57c6330eb104e8e03a2
parent334a0dfddeb324a3373488a3243c6eeec47573da (diff)
Added security patch for zlib.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6414 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter03/patches.xml6
-rw-r--r--chapter06/zlib.xml5
-rw-r--r--patches.ent2
4 files changed, 16 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a206cc5d5..764bb64bd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -107,6 +107,9 @@ First a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>July 6th, 2005 [archaic]: Added security patch for zlib.
+</para></listitem>
+
<listitem><para>July 6th, 2005 [matt]: Several typo corrections, as suggested
by Bernard Leak.</para></listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index fe14a70c8..f5a4709a3 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -147,6 +147,12 @@ needed to build an LFS system:</para>
</listitem>
</varlistentry>
+<varlistentry>
+<term>Zlib Security Patch - 1KB:</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 c11a41f62..140ed3780 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -30,6 +30,11 @@ some programs.</para>
<sect2 role="installation">
<title>Installation of Zlib</title>
+<para>Zlib has a security vulnerability currently being addressed upstream. 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/patches.ent b/patches.ent
index abc18e748..54c23b833 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,3 +34,5 @@
<!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
<!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-1.patch">
+
+<!ENTITY zlib-security_fix-patch "zlib-&zlib-version;-security_fix-1.patch">