[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-rc1-systemd-21-g9d5637f

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  9d5637f549fa455375122af848e4d9a8ccc31af2 (commit)
      from  59a35248f8f0e95f238de7491ffc16189e1850b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d5637f549fa455375122af848e4d9a8ccc31af2
Author: Chris Staub <chris at beaker67.com>
Date:   Sat Aug 2 04:28:15 2014 -0400

    Consolidated cracklib notes

diff --git a/BOOK/final-system/common/shadow.xml b/BOOK/final-system/common/shadow.xml
index f60b74b..c8c460f 100644
--- a/BOOK/final-system/common/shadow.xml
+++ b/BOOK/final-system/common/shadow.xml
@@ -28,9 +28,15 @@
     <note os="a">
       <para>If you would like to enforce the use of strong passwords,
       refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
-      for installing Cracklib prior to building Shadow. Then add
-      <parameter>--with-libcrack</parameter> to the <command>configure</command>
-      command below.</para>
+      for installing Cracklib prior to building Shadow. After Cracklib is
+      installed, execute this <command>sed</command> in Shadow's source
+      directory to correct the path to the Cracklib dictionary:</para>
+
+<screen role="nodump"><userinput>sed -i 's@\(DICTPATH.\).*@\1/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
+
+      <para>Finally, add <parameter>--with-libcrack</parameter> to the
+      <command>configure</command> command below.</para>
+
     </note>
 
     <para os="b">Disable the installation of the <command>groups</command> and
@@ -86,25 +92,17 @@ find man -name Makefile.in -exec sed -i \
     -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
     -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
 
-    <note os="t">
-      <para>If you built Shadow with Cracklib support, execute
-      this <command>sed</command> to correct the path to the Cracklib
-      dictionary:</para>
-
-<screen role="nodump"><userinput>sed -i 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</userinput></screen>
-    </note>
-
-    <para os="u">Move a misplaced program to its proper location:</para>
+    <para os="t">Move a misplaced program to its proper location:</para>
 
-<screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
+<screen os="u"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
 
-    <para os="w">The <command>login</command> program will write to
+    <para os="v">The <command>login</command> program will write to
     <filename>/var/log/lastlog</filename>, if it exists, to record the date and
     time of the latest successful login for each user. This log file is not
     created automatically if it does not already exist, so we will
     create it now and give it appropriate ownership and permissions:</para>
 
-<screen os="x"><userinput>touch /var/log/lastlog
+<screen os="w"><userinput>touch /var/log/lastlog
 chgrp -v utmp /var/log/lastlog
 chmod -v 664 /var/log/lastlog</userinput></screen>
 
diff --git a/BOOK/final-system/multilib/shadow.xml b/BOOK/final-system/multilib/shadow.xml
index 1c8e6e9..fac8dec 100644
--- a/BOOK/final-system/multilib/shadow.xml
+++ b/BOOK/final-system/multilib/shadow.xml
@@ -95,10 +95,6 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/shadow.xml   |   28 +++++++++++++---------------
 BOOK/final-system/multilib/shadow.xml |    4 ----
 2 files changed, 13 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book