aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Bauscher <timothy@linuxfromscratch.org>2002-09-07 16:42:31 +0000
committerTimothy Bauscher <timothy@linuxfromscratch.org>2002-09-07 16:42:31 +0000
commit549cfcfe7ac0afc6676ff824027c1c3e03c8f0fd (patch)
tree0f5ed649feb63483daef589f9d3d7067ec01e4b7
parent4bc6304e662f1ea1806a9828d85a0866f5751f8e (diff)
Added gzip patch, added re_max_failures2 to Textutils.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2079 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml8
-rw-r--r--chapter04/gzip-patch.xml3
-rw-r--r--chapter04/packages.xml1
-rw-r--r--chapter05/textutils-inst.xml3
-rw-r--r--chapter06/gzip-exp.xml8
-rw-r--r--chapter06/gzip-inst.xml3
-rw-r--r--chapter06/gzip.xml1
-rw-r--r--entities/gzip.ent4
-rw-r--r--index.xml4
9 files changed, 30 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 15e2e697c..223480f83 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,7 @@
<listitem><para>gawk-3.1.1.patch</para></listitem>
<listitem><para>gcc-3.2.patch</para></listitem>
<listitem><para>glibc-2.2.5-2.patch</para></listitem>
+<listitem><para>gzip-1.2.4b.patch</para></listitem>
<listitem><para>ncurses-5.2.patch</para></listitem>
<listitem><para>vim-6.1.patch</para></listitem>
<listitem><para>zlib-1.1.4</para></listitem>
@@ -47,11 +48,16 @@
<listitem><para>Removed:
<itemizedlist>
-<listitem><para>gzip-1.2.4a.patch</para></listitem>
<listitem><para>reiserfsprogs-3.x.1b</para></listitem>
</itemizedlist>
</para></listitem>
+<listitem><para>September 7th, 2002 [timothy]: Chapter 06 - Gzip:
+Added gzip-1.2.4b.patch.</para></listitem>
+
+<listitem><para>September 7th, 2002 [timothy]: Chapter 05 - Textutils:
+Added re_max_failures2 for old host systems.</para></listitem>
+
<listitem><para>September 2nd, 2002 [timothy]: Chapter 06 - Bash: Removed
creation of sh symlink. Creating the bash and sh symlinks: Added /bin/bash
symlink, symlinked sh to bash. Gzip, Sysvinit, Util-Linux: Shortened cp
diff --git a/chapter04/gzip-patch.xml b/chapter04/gzip-patch.xml
new file mode 100644
index 000000000..4cb3def7c
--- /dev/null
+++ b/chapter04/gzip-patch.xml
@@ -0,0 +1,3 @@
+Gzip Patch (&gzip-patch-version;) - &gzip-patch-size;:
+<ulink url="&ftp;/gzip-&gzip-patch-version;.patch.bz2"/>
+<ulink url="&http;/gzip-&gzip-patch-version;.patch.bz2"/>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 5cb8a69e5..c41bc0030 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -16,6 +16,7 @@
&c3-kernel;
&c3-grep;
&c3-gzip;
+&c3-gzip-patch;
&c3-make;
&c3-sed;
&c3-shellutils;
diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml
index 4dd4c9606..675f8b609 100644
--- a/chapter05/textutils-inst.xml
+++ b/chapter05/textutils-inst.xml
@@ -3,7 +3,8 @@
<para>Install Textutils by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=$LFS/static \
+<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static \
&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
make LDFLAGS=-static &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter06/gzip-exp.xml b/chapter06/gzip-exp.xml
new file mode 100644
index 000000000..503f642e0
--- /dev/null
+++ b/chapter06/gzip-exp.xml
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../gzip-1.2.4b.patch:</userinput>
+This patch fixes a buffer overflow that occurs when a filename is
+longer than 1020 characters.</para>
+
+</sect2>
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index c4048e571..51aaf8748 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -3,7 +3,8 @@
<para>Install Gzip by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-patch-version;.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
cp gzexe.in{,.backup} &amp;&amp;
sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in &amp;&amp;
make &amp;&amp;
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index fbc7fcf9f..0cf15fa30 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -6,6 +6,7 @@
Estimated required disk space: &gzip-compsize;</screen>
&c6-gzip-inst;
+&c6-gzip-exp;
&aa-gzip-desc;
&aa-gzip-dep;
diff --git a/entities/gzip.ent b/entities/gzip.ent
index ff7cd4730..b2347c380 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -1,10 +1,12 @@
<!ENTITY c3-gzip SYSTEM "../chapter03/gzip.xml">
+<!ENTITY c3-gzip-patch SYSTEM "../chapter03/gzip-patch.xml">
<!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
<!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
<!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
<!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">
+<!ENTITY c6-gzip-exp SYSTEM "../chapter06/gzip-exp.xml">
<!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
<!ENTITY aa-gzip-desc SYSTEM "../appendixa/gzip-desc.xml">
@@ -15,6 +17,8 @@
<!ENTITY gzip-depversion "1.2.4a">
<!ENTITY gzip-contversion "1.2.4a">
<!ENTITY gzip-size "179 KB">
+<!ENTITY gzip-patch-size "1 KB">
+<!ENTITY gzip-patch-version "1.2.4b">
<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
<!ENTITY gzip-dir "gzip-&gzip-version;">
diff --git a/index.xml b/index.xml
index d25fc25c4..62922f859 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
<!ENTITY book SYSTEM "book/book.xml">
-<!ENTITY version "20020902">
-<!ENTITY releasedate "September 2nd, 2002">
+<!ENTITY version "20020907">
+<!ENTITY releasedate "September 7th, 2002">
<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
<!ENTITY http-root "http://ftp.linuxfromscratch.org">