Mainline merge as of 2005-09-04

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

8 files changed, 41 insertions, 30 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ea83fa334..e9b5a24ce 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,7 +39,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>E2fsprogs &e2fsprogs-version;</para></listitem>
 <!-- <listitem><para>Expect &expect-version;</para></listitem> -->
 <listitem><para>File &file-version;</para></listitem>
-<!-- <listitem><para>Findutils &findutils-version;</para></listitem> -->
+<listitem><para>Findutils &findutils-version;</para></listitem>
 <!-- <listitem><para>Flex &flex-version;</para></listitem> -->
 <!-- <listitem><para>Gawk &gawk-version;</para></listitem> -->
 <listitem><para>GCC &gcc-version;</para></listitem>
@@ -100,6 +100,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>&util-linux-reiser_crash-patch;</para></listitem>
 <listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
@@ -119,6 +120,17 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 4, 2005 [matt]: Add patch to stop
+<command>cfdisk</command> segfaulting when invoked on devices with partitions
+that don't contain an ext2, ext3, xfs or jfs filesystem (see bug 1604)</para>
+</listitem>
+
+<listitem><para>September 4, 2005 [matt]: Upgrade to libtool-1.5.20</para>
+</listitem>
+
+<listitem><para>September 4, 2005 [matt]: Upgrade to findutils-4.2.25</para>
+</listitem>
+
 <listitem><para>September 2, 2005 [matt]: The optimization flag for util-linux
 comes from <filename>configure</filename> rather than
 <filename>MCONFIG</filename>, so adjust the <command>sed</command> in order for
@@ -135,6 +147,9 @@ compiling with -O instead of the default -O2 optimization setting (fixes bug
 <listitem><para>August 30th, 2005 [matt]: Update the inetutils patch to use the
 upstream fix for GCC-4.x compilation problems (fixes bug 1602).</para></listitem>
 
+<listitem><para>August 30th, 2005 [matt]: Upgrade to shadow-2.0.12</para>
+</listitem>
+
 <listitem><para>August 30th, 2005 [ken]: Remove <command>sed -i</command>
  commands from gcc-pass2.</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index ab47938c1..d5c71213b 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -109,7 +109,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Findutils (&findutils-version;) - 784 KB:</term>
+<term>Findutils (&findutils-version;) - 836 KB:</term>
 <listitem>
 <para><ulink url="&gnu;findutils/"/></para>
 </listitem>
@@ -235,7 +235,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Libtool (&libtool-version;) - 1,644 KB:</term>
+<term>Libtool (&libtool-version;) - 1,642 KB:</term>
 <listitem>
 <para><ulink url="&gnu;libtool/"/></para>
 </listitem>
@@ -347,7 +347,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow (&shadow-version;) - 1,031 KB:</term>
+<term>Shadow (&shadow-version;) - 1,057 KB:</term>
 <listitem>
 <para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para>
 <note><para>Shadow (&shadow-version;) may no longer be available at the listed
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2ebeffa49..5428318bb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -191,6 +191,12 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
+<term>Util-linux Reiser Crash Patch - 2 KB:</term> <listitem>
+<para><ulink url="&patches-root;&util-linux-reiser_crash-patch;"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Vim Security Patch - 9 KB:</term><listitem>
 <para><ulink url="&patches-root;&vim-security_fix-patch;"/></para>
 </listitem>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index e637e8c7d..ad97a6ba7 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -47,10 +47,6 @@ 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/shadow.xml b/chapter06/shadow.xml
index 280945a42..a0a64b899 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -38,17 +38,7 @@ prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
 
 <para>Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/lib --enable-shared --enable-shadowgrp</userinput></screen>
-
-<para>The meaning of the new configure options:</para>
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-shadowgrp</parameter></term>
-<listitem><para>This version of Shadow defaults to not enabling
-shadow group functionality, which will cause <command>grpconv</command> to fail.
-</para></listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
 <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 609d14c45..37b8be852 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -53,12 +53,14 @@ The following patch properly fixes this issue:</para>
 
 <screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
-<para>A bug in <command>cfdisk</command> causes it to segfault when compiled
-with GCC's <option>-O2</option> optimization setting.  The following
-<command>sed</command> works around the problem by using the less aggressive
-<option>-O</option> optimization level instead:</para>
-
-<screen><userinput>sed -i 's/-O2/-O/' configure</userinput></screen> 
+<para><command>cfdisk</command> segfaults if the disk contains a linux partition
+(type 83) that doesn't have an <systemitem class="filesystem">ext2</systemitem>,
+<systemitem class="filesystem">ext3</systemitem>,
+<systemitem class="filesystem">xfs</systemitem> or
+<systemitem class="filesystem">jfs</systemitem> filesystem on it.  Apply the
+following patch to fix the problem:</para>
+
+<screen><userinput>patch -Np1 -i ../&util-linux-reiser_crash-patch;</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 
diff --git a/general.ent b/general.ent
index 9d1712771..c57a0f75a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "GCC4-20050902">
-<!ENTITY releasedate "September 2, 2005">
+<!ENTITY version "GCC4-20050904">
+<!ENTITY releasedate "September 4, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -36,7 +36,7 @@
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
 <!ENTITY file-version "4.15">
-<!ENTITY findutils-version "4.2.23">
+<!ENTITY findutils-version "4.2.25">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.4">
 <!ENTITY gcc-version "4.0.1">
@@ -53,7 +53,7 @@
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY lfs-bootscripts-version "3.2.1">
-<!ENTITY libtool-version "1.5.18">
+<!ENTITY libtool-version "1.5.20">
 <!ENTITY linux-version "2.6.12.5">
 <!ENTITY linux-dl-version "2.6">
 <!ENTITY linux-libc-headers-version "2.6.12.0">
@@ -70,7 +70,7 @@
 <!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.11.1">
+<!ENTITY shadow-version "4.0.12">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
diff --git a/patches.ent b/patches.ent
index 9c6671122..12ac57258 100644
--- a/patches.ent
+++ b/patches.ent
@@ -42,6 +42,8 @@
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 
+<!ENTITY util-linux-reiser_crash-patch "util-linux-&util-linux-version;-reiser_crash-2.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">