Mainline merge as of 2005-08-12

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

15 files changed, 108 insertions, 32 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ee804d6de..4a5556e80 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -98,6 +98,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>&perl-libc-patch;</para></listitem>
 <listitem><para>&tar-gcc4_fix-patch;</para></listitem>
 <listitem><para>&mktemp-tempfile-patch;</para></listitem>
+<listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -111,10 +112,36 @@ First a summary, then a detailed log.</para>
 <listitem><para>iproute2-2.6.11-050330-remove_db-1.patch</para></listitem>
 <listitem><para>mktemp-1.5-add_tempfile-2.patch</para></listitem>
 <listitem><para>perl-5.8.6-libc-1.patch</para></listitem>
+<listitem><para>vim-6.3-security_fix-1.patch</para></listitem>
 <listitem><para>zlib-1.2.2-security_fix-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 12th, 2005 [matt]: Explain that libiconv isn't required
+on an LFS system (fixes bug 1614).</para></listitem>
+
+<listitem><para>August 12th, 2005 [matt]: Fix ownership of libtool's libltdl
+data files (fixes bug 1601).</para></listitem>
+
+<listitem><para>August 12th, 2005 [matt]: Change findutils and vim's configure
+switch explanations to the convention used in the rest of the book (Bug
+1613).</para></listitem>
+
+<listitem><para>August 12th, 2005 [matt]: Expand explanation of device node
+creation at the start of chapter 6.</para></listitem>
+
+<listitem><para>August 12th, 2005 [matt]: Fix incorrect version number for
+expect's installed library (Bug 1608)</para></listitem>
+
+<listitem><para>August 7th, 2005 [archaic]: Added note in Shadow regarding
+building Cracklib from BLFS first.</para></listitem>
+
+<listitem><para>August 6th, 2005 [matt]: Add texi2pdf to list of Texinfo's
+installed files.</para></listitem>
+
+<listitem><para>August 6th, 2005 [matt]: Updated Vim's security patch to address
+the latest modeline vulnerability.</para></listitem>
+
 <listitem><para>July  30th, 2005 [matt]: Added instructions for installing Bash
 documentation (Randy McMurchy).</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7f56e2733..a4f5cf10b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -177,7 +177,7 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Vim Security Patch - 8 KB:</term><listitem>
+<term>Vim Security Patch - 9 KB:</term><listitem>
 <para><ulink url="&patches-root;&vim-security_fix-patch;"/></para>
 </listitem>
 </varlistentry>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index bda9a531a..a0caafa5d 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -105,7 +105,7 @@ scripts, which are not needed.</para></listitem>
 <segmentedlist>
 <segtitle>Installed program</segtitle>
 <segtitle>Installed library</segtitle>
-<seglistitem><seg>expect</seg><seg>libexpect-5.42.a</seg></seglistitem>
+<seglistitem><seg>expect</seg><seg>libexpect-&expect-lib-version;.a</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -122,12 +122,12 @@ programs according to a script</para>
 </varlistentry>
 
 <varlistentry id="libexpect">
-<term><filename class="libraryfile">libexpect-5.42.a</filename></term>
+<term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
 <listitem>
 <para>Contains functions that allow Expect to be used as a Tcl extension or to
 be used directly from C or C++ (without Tcl)</para>
 <indexterm zone="ch-tools-expect libexpect"><primary
-sortas="c-libexpect-5.42">libexpect-5.42</primary></indexterm>
+sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary></indexterm>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index e075dfa20..1f016fafc 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -40,9 +40,8 @@ unset them when building Glibc.</para>
 the method suggested in this book puts the stability of the system at
 risk.</para>
 
-<para>Glibc has two tests which fail when the running kernel is 2.6.11.x The
-problem has been determined to be with the tests themselves, not with the libc
-nor the kernel. If you plan to run the testsuite apply this patch:</para>
+<para>Glibc has two tests which fail when the running kernel is 2.6.11 or later.
+The problem has been determined to be with the tests themselves, not with the C libarary or the kernel.  If you plan to run the testsuite apply this patch:</para>
 
 <screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index dbd2f9e12..6fd9b572d 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -57,7 +57,7 @@ following patch resolves this problem:</para>
 <variablelist>
 <varlistentry>
 <term><parameter>--with-installed-readline</parameter></term>
-<listitem><para>This options tells Bash to use the
+<listitem><para>This option tells Bash to use the
 <filename class="libraryfile">readline</filename> library that is already installed
 on the system rather than using its own readline version.</para></listitem>
 </varlistentry>
diff --git a/chapter06/devices.xml b/chapter06/devices.xml
index 22bb3bdb7..87bfd6a32 100644
--- a/chapter06/devices.xml
+++ b/chapter06/devices.xml
@@ -14,8 +14,12 @@
 
 <para>When the kernel boots the system, it requires the presence of a few device
 nodes, in particular the <filename class="devicefile">console</filename> and
-<filename class="devicefile">null</filename> devices. Create these by
-running the following commands:</para>
+<filename class="devicefile">null</filename> devices.  The device nodes will
+be created on the hard disk so that they are available before
+<command>udev</command> has been started, and additionally when Linux is started
+in single user mode (hence the restrictive permissions on
+<filename class="devicefile">console</filename>).  Create the devices by running
+the following commands:</para>
 
 <screen><userinput>mknod -m 600 /dev/console c 5 1
 mknod -m 666 /dev/null c 1 3</userinput></screen>
@@ -48,7 +52,6 @@ mknod -m 666 /dev/tty c 5 0
 mknod -m 444 /dev/random c 1 8
 mknod -m 444 /dev/urandom c 1 9
 chown root:tty /dev/{console,ptmx,tty}</userinput></screen>
-<!-- -->
 
 <para>There are some symlinks and directories required by LFS that are created
 during system startup by the LFS-Bootscripts package. Since this is a chroot
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 0c34ac14b..61674c1e9 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -38,9 +38,16 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make and Sed</seg></seglistitem>
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
-<para>The <parameter>localstatedir</parameter> option above changes the
-location of the <command>locate</command> database to be in <filename
-class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--localstatedir</parameter></term>
+<listitem><para>This option changes the location of the <command>locate</command>
+database to be in <filename class="directory">/var/lib/locate</filename>, which
+is FHS-compliant.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 807f326c1..319c38058 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -33,6 +33,15 @@ Gawk, GCC, Gettext, Grep, Make, Perl, Sed, and Texinfo</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Glibc</title>
 
+<note><para>Some packages outside of LFS suggest installing GNU libiconv in
+order to translate data from one encoding to another.  The project's home page
+(<ulink url="http://www.gnu.org/software/libiconv/"/>) says <quote>This library
+provides an <function>iconv()</function> implementation, for use on systems
+which don't have one, or whose implementation cannot convert from/to Unicode.
+</quote>  Glibc provides an <function>iconv()</function> implementation and can
+convert from/to Unicode, therefore libiconv is not required on an LFS
+system.</para></note>
+
 <para>This package is known to have issues when its default
 optimization flags (including the <parameter>-march</parameter> and
 <parameter>-mcpu</parameter> options) are changed. If any environment
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index ad97a6ba7..e637e8c7d 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -47,6 +47,10 @@ GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 
 <screen><userinput>make install</userinput></screen>
 
+<para>Correct the ownership of the libltdl data files:</para>
+
+<screen><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
+
 </sect2>
 
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 3d8188561..2b37959e8 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -42,8 +42,9 @@ prepare Perl for compilation with:</para>
 <variablelist>
 <varlistentry>
 <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
-<listitem><para>This corrects an error in the <command>perldoc</command> code with the invocation
-of the <command>less</command> program.</para></listitem>
+<listitem><para>This corrects an error in the way that
+<command>perldoc</command> invokes the <command>less</command> program.</para>
+</listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 6e8038adb..793e885f6 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -31,12 +31,16 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Shadow</title>
 
+<note><para>If you would like to enforce the use of strong passwords, refer to
+<ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing Cracklib
+prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
+<command>configure</command> command below.</para></note>
+
 <para>Prepare Shadow for compilation:</para>
 
 <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
-<para>Remove the installation of the <command>groups</command> program, and its man page as
-Coreutils provides a better version:</para>
+<para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
 <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
 sed -i '/groups/d' man/Makefile</userinput></screen>
@@ -70,6 +74,12 @@ file while copying it to its destination:</para>
 
 <indexterm zone="shadow-login_defs"><primary sortas="e-/etc/login.defs">/etc/login.defs</primary></indexterm>
 
+<note><para>If you built Shadow with Cracklib support, insert the following into
+the <command>sed</command> given below:</para>
+
+<screen><literal>-e 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@'</literal></screen>
+</note>
+
 <screen><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
     etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 274a8f2d8..5807bbdaa 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -83,7 +83,7 @@ done</userinput></screen>
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
 <seglistitem><seg>info, infokey, install-info,
-makeinfo, texi2dvi, and texindex</seg></seglistitem>
+makeinfo, texi2dvi, texi2pdf, and texindex</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -136,6 +136,15 @@ device-independent file that can be printed</para>
 </listitem>
 </varlistentry>
 
+<varlistentry id="texi2pdf">
+<term><command>texi2pdf</command></term>
+<listitem>
+<para>Used to format the given Texinfo document into a
+Portable Document Format (PDF) file</para>
+<indexterm zone="ch-system-texinfo texi2pdf"><primary sortas="b-texi2pdf">texi2pdf</primary></indexterm>
+</listitem>
+</varlistentry>
+
 <varlistentry id="texindex">
 <term><command>texindex</command></term>
 <listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 0e2e7d81e..299ea6e23 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -40,14 +40,14 @@ for suggested installation instructions.</para>
 <para>First, unpack both
 <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
 <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
-same directory. Then, change the default locations of the
+same directory. Then, change the default location of the
 <filename>vimrc</filename> configuration file to <filename
 class="directory">/etc</filename>:</para>
 
 <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
 
-<para>Vim has a security vulnerability already addressed upstream.  The
-following patch fixes the problem:</para>
+<para>Vim has two known security vulnerabilities that have already been
+addressed upstream.  The following patch fixes the problems:</para>
 
 <screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
 
@@ -55,13 +55,19 @@ following patch fixes the problem:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-<para>The optional but highly recommended
-<parameter>--enable-multibyte</parameter> switch includes support for
-editing files in multibyte character encodings into
-<command>vim</command>.  This is needed if using a locale with
-a multibyte character set. This switch is also helpful to be able to
-edit text files initially created in Linux distributions like Fedora
-Core that use UTF-8 as a default character set.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--enable-multibyte</parameter></term>
+<listitem><para>This optional but highly recommended switch enables support for
+editing files in multibyte character encodings.  This is needed if using a
+locale with a multibyte character set. This switch is also helpful to be able to
+edit text files initially created in Linux distributions like Fedora Core that
+use UTF-8 as a default character set.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/general.ent b/general.ent
index 718a50c7d..b15851782 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050730">
-<!ENTITY releasedate "July 30, 2005">
+<!ENTITY version "GCC4-20050812">
+<!ENTITY releasedate "August 12, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -35,6 +35,7 @@
 <!ENTITY diffutils-version "2.8.1">
 <!ENTITY e2fsprogs-version "1.38">
 <!ENTITY expect-version "5.43.0">
+<!ENTITY expect-lib-version "5.43">
 <!ENTITY file-version "4.14">
 <!ENTITY findutils-version "4.2.23">
 <!ENTITY flex-version "2.5.31">
diff --git a/patches.ent b/patches.ent
index f755b3120..36c75a704 100644
--- a/patches.ent
+++ b/patches.ent
@@ -39,6 +39,6 @@
 
 <!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 vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
 
 <!ENTITY zlib-security_fix-patch "zlib-&zlib-version;-security_fix-1.patch">