aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml45
-rw-r--r--chapter01/whatsnew.xml11
-rw-r--r--chapter03/packages.xml6
-rw-r--r--chapter03/patches.xml13
-rw-r--r--chapter06/bzip2.xml6
-rw-r--r--chapter06/file.xml4
-rw-r--r--chapter06/flex.xml14
-rw-r--r--chapter06/iproute2.xml5
-rw-r--r--general.ent12
-rw-r--r--patches.ent8
10 files changed, 76 insertions, 48 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7a08b4fbd..fa92e862b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,51 @@
</listitem>
-->
+ <listitem>
+ <para>March 22, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[archaic] - Updated to lfs-bootscripts-20060321.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>March 18, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Do not run configure manually for iproute2 as it
+ is run automatically by the Makefile. Thanks to Chris Staub for the
+ patch. Fixes ticket #1734.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Make bzdiff use mktemp instead of the deprecated
+ tempfile command. Thanks to Chris Staub for the patch. Fixes ticket
+ #1713.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to flex-2.5.33.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to readline-5.1.004.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to bash-3.1.014.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to psmisc-22.2.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to file-4.17.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Use updated version of the coreutils suppression
+ patch to prevent coreutils version of the su man page from being
+ installed. Fixes #1690.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>March 11, 2006</para>
<itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a96b24483..9f4e0d79e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -64,9 +64,9 @@
<listitem>
<para>Findutils &findutils-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Flex &flex-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Gawk &gawk-version;</para>
</listitem>
@@ -109,9 +109,9 @@
<listitem>
<para>Less &less-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>LFS-Bootscripts &lfs-bootscripts-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Libtool &libtool-version;</para>
</listitem>
@@ -255,6 +255,9 @@
<title>Removed:</title>
<listitem>
+ <para>flex-2.5.31-debian_fixes-3.patch</para>
+ </listitem>
+ <listitem>
<para>gcc-3.4.3-linkonce-1.patch</para>
</listitem>
<listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 4b0faed15..0e5813a01 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -106,7 +106,7 @@
</varlistentry>
<varlistentry>
- <term>File (&file-version;) - 399 KB:</term>
+ <term>File (&file-version;) - 404 KB:</term>
<listitem>
<para><ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
@@ -129,7 +129,7 @@
</varlistentry>
<varlistentry>
- <term>Flex (&flex-version;) - 672 KB:</term>
+ <term>Flex (&flex-version;) - 679 KB:</term>
<listitem>
<para><ulink url="&sourceforge;flex/"/></para>
</listitem>
@@ -356,7 +356,7 @@
</varlistentry>
<varlistentry>
- <term>Psmisc (&psmisc-version;) - 194 KB:</term>
+ <term>Psmisc (&psmisc-version;) - 199 KB:</term>
<listitem>
<para><ulink url="&sourceforge;psmisc/"/></para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4d7bf5782..9a6132cbc 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,7 +19,7 @@
<variablelist role="materials">
<varlistentry>
- <term>Bash Upstream Fixes Patch - 120 KB:</term>
+ <term>Bash Upstream Fixes Patch - 18 KB:</term>
<listitem>
<para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
</listitem>
@@ -47,7 +47,7 @@
</varlistentry>
<varlistentry>
- <term>Coreutils Suppress Uptime, Kill, Su Patch - 15 KB:</term>
+ <term>Coreutils Suppress Uptime, Kill, Su Patch - 13 KB:</term>
<listitem>
<para><ulink url="&patches-root;&coreutils-suppress-patch;"/></para>
</listitem>
@@ -75,13 +75,6 @@
</varlistentry>
<varlistentry>
- <term>Flex Brokenness Patch - 156 KB:</term>
- <listitem>
- <para><ulink url="&patches-root;&flex-fixes-patch;"/></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Gawk Segfault Patch - 1 KB:</term>
<listitem>
<para><ulink url="&patches-root;&gawk-segfault-patch;"/></para>
@@ -173,7 +166,7 @@
</varlistentry>
<varlistentry>
- <term>Readline Upstream Fixes Patch - 2 KB:</term>
+ <term>Readline Upstream Fixes Patch - 4 KB:</term>
<listitem>
<para><ulink url="&patches-root;&readline-fixes-patch;"/></para>
</listitem>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 8e89f525d..93b348423 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -57,6 +57,12 @@
<screen><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
+ <para>The bzdiff script still uses the deprecated
+ <command>tempfile</command> program. Update it to use
+ <command>mktemp</command> instead:</para>
+
+<screen><userinput>sed -i 's@tempfile -d /tmp -p bz@mktemp -p /tmp@' bzdiff</userinput></screen>
+
<para>Prepare Bzip2 for compilation with:</para>
<screen><userinput>make -f Makefile-libbz2_so
diff --git a/chapter06/file.xml b/chapter06/file.xml
index cae4324f7..2fb0f3f3b 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -25,8 +25,8 @@
<segtitle>&diskspace;</segtitle>
<seglistitem>
- <seg>0.1 SBU</seg>
- <seg>6.2 MB</seg>
+ <seg>0.2 SBU</seg>
+ <seg>6.6 MB</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 234974752..5e24092b0 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -26,7 +26,7 @@
<seglistitem>
<seg>0.1 SBU</seg>
- <seg>22.5 MB</seg>
+ <seg>21.3 MB</seg>
</seglistitem>
</segmentedlist>
@@ -44,18 +44,6 @@
<sect2 role="installation">
<title>Installation of Flex</title>
- <para>Flex contains several known bugs. Fix these with the following
- patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
-
- <para>The GNU autotools detects that the Flex source code has been
- modified by the previous patch and tries to update the man page
- accordingly. This does not work correctly on many systems, and the
- default page is fine, so make sure it does not get regenerated:</para>
-
-<screen><userinput>touch doc/flex.1</userinput></screen>
-
<para>Prepare Flex for compilation:</para>
<screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 96a992878..84e4244e0 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -43,11 +43,6 @@
<sect2 role="installation">
<title>Installation of IPRoute2</title>
- <para>Prepare IPRoute2 for compilation:</para>
-
-<screen><userinput>chmod u+x configure &amp;&amp;
-./configure</userinput></screen>
-
<para>Compile the package:</para>
<screen><userinput>make SBINDIR=/sbin</userinput></screen>
diff --git a/general.ent b/general.ent
index 633174060..387aa2626 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "ALPHABETICAL-20060312">
-<!ENTITY releasedate "March 12, 2006">
+<!ENTITY version "ALPHABETICAL-20060325">
+<!ENTITY releasedate "March 25, 2006">
<!ENTITY milestone "6.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
@@ -40,9 +40,9 @@
<!ENTITY e2fsprogs-version "1.38">
<!ENTITY expect-version "5.43.0">
<!ENTITY expect-lib-version "5.43">
-<!ENTITY file-version "4.16">
+<!ENTITY file-version "4.17">
<!ENTITY findutils-version "4.2.27">
-<!ENTITY flex-version "2.5.31">
+<!ENTITY flex-version "2.5.33">
<!ENTITY gawk-version "3.1.5">
<!ENTITY gcc-version "4.0.3">
<!ENTITY gettext-version "0.14.5">
@@ -57,7 +57,7 @@
<!ENTITY iproute2-version "051007">
<!ENTITY kbd-version "1.12">
<!ENTITY less-version "394">
-<!ENTITY lfs-bootscripts-version "20051223">
+<!ENTITY lfs-bootscripts-version "20060321">
<!ENTITY libtool-version "1.5.22">
<!ENTITY linux-version "2.6.12.5">
<!ENTITY linux-dl-version "2.6">
@@ -73,7 +73,7 @@
<!ENTITY patch-version "2.5.4">
<!ENTITY perl-version "5.8.8">
<!ENTITY procps-version "3.2.6">
-<!ENTITY psmisc-version "22.1">
+<!ENTITY psmisc-version "22.2">
<!ENTITY readline-version "5.1">
<!ENTITY sed-version "4.1.5">
<!ENTITY shadow-version "4.0.14">
diff --git a/patches.ent b/patches.ent
index 6200c3ab6..c960066bd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-5.patch">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
<!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
+<!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-2.patch">
<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
<!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
<!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
-<!ENTITY flex-fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
-
<!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
@@ -41,7 +39,7 @@
<!ENTITY perl-libc-patch "perl-&perl-version;-libc-2.patch">
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-2.patch">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-3.patch">
<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">