update zlib, wipe list of package changes up to 6.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7004 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 11 insertions, 72 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ff500477a..b578eee0f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -19,75 +19,25 @@ First a summary, then a detailed log.</para>
 
 <listitem><para>Upgraded to:</para>
 <itemizedlist>
-<listitem><para>Automake 1.9.5</para></listitem>
-<listitem><para>Binutils 2.15.94.0.2.2</para></listitem>
-<listitem><para>Bison 2.0</para></listitem>
-<listitem><para>Bzip2 1.0.3</para></listitem>
-<listitem><para>E2fsprogs 1.37</para></listitem>
-<listitem><para>Expect 5.43.0</para></listitem>
-<listitem><para>File 4.13</para></listitem>
-<listitem><para>Findutils 4.2.23</para></listitem>
-<listitem><para>GCC 3.4.3</para></listitem>
-<listitem><para>Gettext 0.14.2</para></listitem>
-<listitem><para>Glibc 2.3.4</para></listitem>
-<listitem><para>Grep 2.5.1a</para></listitem>
-<listitem><para>Grub 0.96</para></listitem>
-<listitem><para>Iana-Etc 1.04</para></listitem>
-<listitem><para>Iproute2 2.6.11-050330</para></listitem>
-<listitem><para>LFS-Bootscripts 3.2.1</para></listitem>
-<listitem><para>Libtool 1.5.14</para></listitem>
-<listitem><para>Linux 2.6.11.12</para></listitem>
-<listitem><para>Linux-libc-headers 2.6.11.2</para></listitem>
-<listitem><para>M4 1.4.3</para></listitem>
-<listitem><para>Man 1.5p</para></listitem>
-<listitem><para>Man-pages 2.01</para></listitem>
-<listitem><para>Module-init-tools 3.1</para></listitem>
 <listitem><para>Perl 5.8.7</para></listitem>
-<listitem><para>Procps 3.2.5</para></listitem>
-<listitem><para>Psmisc 21.6</para></listitem>
-<listitem><para>Sed 4.1.4</para></listitem>
-<listitem><para>Shadow 4.0.9</para></listitem>
-<listitem><para>Sysvinit 2.86</para></listitem>
-<listitem><para>Tar 1.15.1</para></listitem>
-<listitem><para>Texinfo 4.8</para></listitem>
-<listitem><para>Tcl 8.4.9</para></listitem>
-<listitem><para>Udev 056</para></listitem>
-<listitem><para>Util-linux 2.12q</para></listitem>
-<listitem><para>Zlib 1.2.2</para></listitem>
+<listitem><para>Zlib 1.2.3</para></listitem>
 </itemizedlist>
 </listitem>
 
-<listitem><para>Added:</para>
+<!-- <listitem><para>Added:</para>
 <itemizedlist>
-<listitem><para>bash-3.0-fixes-3.patch</para></listitem>
-<listitem><para>bash-3.0-avoid_WCONTINUED-1.patch</para></listitem>
-<listitem><para>flex-2.5.31-debian_fixes-3.patch</para></listitem>
-<listitem><para>glibc-2.3.4-fix_test-1.patch</para></listitem>
-<listitem><para>gzip-1.3.5-security_fixes-1.patch</para></listitem>
-<listitem><para>Hotplug 2004_09_23</para></listitem>
-<listitem><para>mktemp-1.5-add_tempfile-2.patch</para></listitem>
-<listitem><para>sysklogd-1.4.1-fixes-1.patch</para></listitem>
-<listitem><para>tar-1.15.1-sparse_fix-1.patch</para></listitem>
-<listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
-<listitem><para>vim-6.0-security_fix-1.patch</para></listitem>
-<listitem><para>zlib-1.2.2-security_fix-1.patch;</para></listitem>
 </itemizedlist>
-</listitem>
+</listitem> -->
 
 <listitem><para>Removed:</para>
 <itemizedlist>
-<listitem><para>bash-3.0-display_wrap-1.patch</para></listitem>
-<listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
-<listitem><para>man-1.5o1-80cols-1.patch</para></listitem>
-<listitem><para>mktemp-1.5-add_tempfile-1.patch</para></listitem>
-<listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
-<listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
-<listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
-<listitem><para>util-linux-2.12b-sfdisk-1.patch</para></listitem>
-<listitem><para>zlib-1.2.1-security-1.patch</para></listitem>
+<listitem><para>zlib-1.2.2-security_fix-1.patch;</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 14th, 2005 [ken]: Update packages and patches in
+the changelog to only reflect changes since 6.1.  Update zlib.</para></listitem> 	
+
 <listitem><para>October 13th, 2005 [ken]: Fix known errors in lists of
 installed files and bump the perl version.</para></listitem> 	
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 5d0cfd802..6bff13547 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 655477307..49620432a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -160,12 +160,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-&zlib-version;-security_fix-1.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 701554633..55e0a9c46 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -28,11 +28,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-&zlib-version;-security_fix-1.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 a240bbe61..6edb43685 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "20051013">
-<!ENTITY releasedate "October 13, 2005">
+<!ENTITY version "20051014">
+<!ENTITY releasedate "October 14, 2005">
 <!ENTITY milestone "6.1.1">
 <!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -79,4 +79,4 @@
 <!ENTITY udev-version "056">
 <!ENTITY util-linux-version "2.12q">
 <!ENTITY vim-version "6.3">
-<!ENTITY zlib-version "1.2.2">
+<!ENTITY zlib-version "1.2.3">