Mainline merge as of 2005-08-18

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

8 files changed, 56 insertions, 18 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fcb8c7edb..bd7ba7f2a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -87,6 +87,7 @@ First a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>&bzip2-bzgrep-patch;</para></listitem>
 <listitem><para>&bzip2-docs-patch;</para></listitem>
 <listitem><para>&gcc-specs-patch;</para></listitem>
 <listitem><para>&glibc-gcc4_elf-patch;</para></listitem>
@@ -118,9 +119,22 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 18th, 2005 [ken]: Add a patch to sanitise bzgrep's
+handling of filenames.</para></listitem>
+
+<listitem><para>August 16th, 2005 [matt]: Install sed's man page to
+/usr/share/doc/sed-4.1.4 instead of /usr/share/doc (fixes bug 1600).</para>
+</listitem>
+
+<listitem><para>August 16th, 2005 [matt]: Upgraded to linux-2.6.12.5.</para>
+</listitem>
+
 <listitem><para>August 15th, 2005 [matt]: Alter the GCC -fomit-frame-pointer sed
 to protect from multiple invocations (Greg Schafer)</para></listitem>
 
+<listitem><para>August 14th, 2005 [ken]: Upgrade shadow to 4.0.11.1 with
+--enable-shadowgrp as advised by Greg Schafer.</para></listitem>
+
 <listitem><para>August 14th, 2005 [matt]: Mention the common libmudflap test
 failures in GCC (fixes bug 1615).</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 201b0debd..f49abc188 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -242,7 +242,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Linux (&linux-version;) - 36,619 KB:</term>
+<term>Linux (&linux-version;) - 36,522 KB:</term>
 <listitem>
 <para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/"/></para>
 </listitem>
@@ -347,7 +347,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow (&shadow-version;) - 1,080 KB:</term>
+<term>Shadow (&shadow-version;) - 1,031 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 fccbf2b78..2ebeffa49 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -37,8 +37,15 @@ needed to build an LFS system:</para>
 <para><ulink url="&patches-root;&bzip2-docs-patch;"/></para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
+<term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&bzip2-bzgrep-patch;"/></para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
 <term>Coreutils Suppress Uptime, Kill, Su Patch - 15 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;&coreutils-suppress-patch;"/></para>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 641fb5a25..7470cd84f 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -36,6 +36,13 @@ GCC, Glibc, and Make</seg></seglistitem>
 
 <screen><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
+<para>The <command>bzgrep</command> command does not escape '|' and '&amp;' in
+filenames passed to it. This allows arbitrary commands to be executed with the
+privileges of the user running <command>bzgrep</command>. Apply the following to
+address this:</para>
+
+<screen><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
+
 <para>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput>make -f Makefile-libbz2_so
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index e00d1fda0..bdc7a7fc7 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -30,6 +30,13 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Texinfo</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Sed</title>
 
+<para>By default, Sed installs its man page in
+<filename class="directory">/usr/share/doc</filename>.  Alter this to
+<filename class="directory">/usr/share/doc/sed-&sed-version;</filename> by
+applying the following <command>sed</command>:</para>
+
+<screen><userinput>sed -i 's@/doc@&amp;/sed-&sed-version;@' doc/Makefile.in</userinput></screen>
+
 <para>Prepare Sed for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 793e885f6..280945a42 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -18,7 +18,7 @@ way.</para>
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.4 SBU</seg><seg>13.7 MB</seg></seglistitem>
+<seglistitem><seg>0.3 SBU</seg><seg>15.9 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
@@ -38,7 +38,17 @@ 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</userinput></screen>
+<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>
 
 <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
@@ -153,8 +163,8 @@ by running:</para>
 <segtitle>Installed libraries</segtitle>
 <seglistitem><seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd,
 groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login,
-logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv, sg
-(link to newgrp), useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
+logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv, sg (link to newgrp),
+su, useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
 <seg>libshadow.[a,so]</seg>
 </seglistitem>
 </segmentedlist>
@@ -296,14 +306,6 @@ from <filename>/etc/gshadow</filename> and then deletes the latter</para>
 </listitem>
 </varlistentry>
 
-<varlistentry id="mkpasswd">
-<term><command>mkpasswd</command></term>
-<listitem>
-<para>Generates random passwords</para>
-<indexterm zone="ch-system-shadow mkpasswd"><primary sortas="b-mkpasswd">mkpasswd</primary></indexterm>
-</listitem>
-</varlistentry>
-
 <varlistentry id="newgrp">
 <term><command>newgrp</command></term>
 <listitem>
diff --git a/general.ent b/general.ent
index 1e07eaae2..ec60a0995 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050815">
-<!ENTITY releasedate "August 15, 2005">
+<!ENTITY version "GCC4-20050818">
+<!ENTITY releasedate "August 18, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -55,7 +55,7 @@
 <!ENTITY less-version "382">
 <!ENTITY lfs-bootscripts-version "3.2.1">
 <!ENTITY libtool-version "1.5.18">
-<!ENTITY linux-version "2.6.12.4">
+<!ENTITY linux-version "2.6.12.5">
 <!ENTITY linux-dl-version "2.6">
 <!ENTITY linux-libc-headers-version "2.6.12.0">
 <!ENTITY m4-version "1.4.3">
@@ -71,7 +71,7 @@
 <!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.10">
+<!ENTITY shadow-version "4.0.11.1">
 <!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 8be7896bd..3f4ea456e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -5,6 +5,7 @@
 <!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
+<!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 
 <!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-2.patch">