From 241bb14b23e31c010193eeb541df10a1bd901fd9 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sun, 23 Oct 2005 10:36:22 +0000
Subject: [PATCH] Redaction changes ported from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7072 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  3 ++-
 chapter06/devices.xml   |  8 ++++++--
 chapter06/glibc.xml     | 12 +++++++++++-
 chapter06/sed.xml       |  7 +++++++
 chapter06/shadow.xml    | 11 +++++++++++
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8062142cc..a8b3b2054 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,7 +43,8 @@ First a summary, then a detailed log.</para>
 </listitem>
 
 <listitem><para>October 23, 2005 [manuel]: Added Bash documentation
-installation.</para></listitem>
+installation. Added notes about libiconv and Cracklib. Fixed the installation
+of Sed documentation.</para></listitem>
 
 <listitem><para>October 19, 2005 [manuel]: Updated the acknowledgements to 
 current trunk version. Ported some redaction changes in preface and chapter01 
diff --git a/chapter06/devices.xml b/chapter06/devices.xml
index 9737999db..4b3b0ba30 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>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 913c9f4d5..1e2d4f377 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -31,6 +31,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
@@ -98,7 +107,8 @@ circumstance.</para></important>
 
 <para>Test the results:</para>
 
-<screen><userinput>make check</userinput></screen>
+<screen><userinput>make -k check &gt;glibc-check-log 2&gt;&amp;1
+grep Error glibc-check-log</userinput></screen>
 
 <para>The Glibc test suite is highly dependent on certain functions of
 the host system, in particular the kernel. In general, the Glibc test
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index f8d5f3b3f..5102dd3e8 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -28,6 +28,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 9dbac598e..81e711ff2 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -29,6 +29,11 @@ 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>
@@ -68,6 +73,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>