From 60c6e3b8e366df2f2d2a582879f6249c1bcdd187 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 16 Feb 2011 20:20:30 +0000
Subject: Upgrade to Shadow-4.1.4.3. Fixes #2832.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9465 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/shadow.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index c114cfb57..de7f5cbe8 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -49,19 +49,16 @@
       command below.</para>
     </note>
 
-    <!-- <para>Fix a bug in the <command>useradd</command> and
-    <command>usermod</command> programs which prevent them from accepting group
-    names rather than group ID numbers to the <option>-g</option> option:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&shadow-useradd-patch;</userinput></screen>
-   -->
-
     <para>Disable the installation of the <command>groups</command> program
     and its man pages, as Coreutils provides a better version:</para>
 
-<screen><userinput remap="configure">sed -i 's/groups$(EXEEXT) //' src/Makefile.in
+<screen><userinput remap="pre">sed -i 's/groups$(EXEEXT) //' src/Makefile.in
 find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
 
+    <para>Fix an issue with the installation of Russian man pages:</para>
+
+<screen><userinput remap="pre">sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
+
     <para id="shadow-login_defs">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
     <emphasis>SHA-512</emphasis> method of password encryption, which also
@@ -82,11 +79,6 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
 
     <para>Prepare Shadow for compilation:</para>
 
-<!-- Keeping this in case we revert to an older version
-<screen><userinput remap="configure">./configure -libdir=/lib -sysconfdir=/etc -enable-shared \
-    -without-selinux</userinput></screen>
--->
-
 <screen><userinput remap="configure">./configure --sysconfdir=/etc</userinput></screen>
 
     <para>Compile the package:</para>
-- 
cgit v1.2.3-54-g00ecf