Changeset 73ace20 for BOOK/final-system/common/shadow.xml

Timestamp:

Oct 10, 2012, 6:42:21 PM (13 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

File:

• BOOK/final-system/common/shadow.xml (modified) (4 diffs)

BOOK/final-system/common/shadow.xml

@@ -34 +34 @@
     </note>
 
-    <para os="f1">Fix an issue with the Russian man pages:</para>
-
-    <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
-
-    <para os="b">Prepare Shadow for compilation:</para>
-
-<screen os="c"><userinput>./configure --sysconfdir=/etc</userinput></screen>
-
-<para os="d">The meaning of the configure options:</para>
-
-  <variablelist os="e">
+
+    <para os="b">Disable the installation of the <command>groups</command>
+    program and its man pages, as Coreutils provides a better version:</para>
+
+<screen os="c"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in
+find man -name Makefile.in -exec sed -i '/groups\.1\.xml/d' '{}' \;
+find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+
+    <para os="d">Prepare Shadow for compilation:</para>
+
+<screen os="e"><userinput>./configure --sysconfdir=/etc</userinput></screen>
+
+<para os="f">The meaning of the configure options:</para>
+
+  <variablelist os="g">
     <varlistentry>
       <term><parameter>--sysconfdir=/etc</parameter></term>
@@ -51 +55 @@
       <filename class="directory">/usr/etc</filename>.</para></listitem>
     </varlistentry>
+    
   </variablelist>
 
-    <para os="f">Disable the installation of the <command>groups</command>
-    program and its man pages, as Coreutils provides a better version:</para>
-
-<screen os="g"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
-find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
-find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;</userinput></screen>
 
     <para os="h">Compile the package:</para>
@@ -72 +71 @@
     <para os="m" id="shadow-login_defs">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
-    <emphasis>MD5</emphasis> method of password encryption, which also allows
+    <emphasis>SHA512</emphasis> method of password encryption, which also allows
     passwords longer than 8 characters. It is also necessary to change the
     obsolete <filename class="directory">/var/spool/mail</filename> location
@@ -85 +84 @@
 
 <screen os="s"><userinput>sed -i /etc/login.defs \
-    -e 's@#\(ENCRYPT_METHOD \).*@\1MD5@' \
+    -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
     -e 's@/var/spool/mail@/var/mail@'</userinput></screen>