Changeset 026bb5d for BOOK/final-system/common/shadow.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/common/shadow.xml (modified) (6 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> and
+    <command>nologin</command> programs and their man pages, as better versions
+    of these programs are provided by Coreutils and Util-linux:</para>
+
+<screen os="c"><userinput>sed -i src/Makefile.in \
+  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
+find man -name Makefile.in -exec sed -i \
+  -e 's/man1\/groups\.1 //' -e 's/man8\/nologin\.8 //' '{}' \;</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 +57 @@
       <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 +73 @@
     <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 +86 @@
 
 <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>
 
@@ -155 +156 @@
         <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
+        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
         vigr (link to vipw), and vipw</seg>
@@ -380 +381 @@
       </varlistentry>
 
-      <varlistentry id="nologin">
-        <term><command>nologin</command></term>
-        <listitem>
-          <para>Displays a message that an account is not available. Designed
-          to be used as the default shell for accounts that have been
-          disabled</para>
-          <indexterm zone="ch-system-shadow nologin">
-            <primary sortas="b-nologin">nologin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="passwd">
         <term><command>passwd</command></term>