From b057615cc8318a54af9d82107c00f65a5843f686 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 27 Feb 2016 04:11:22 +0000
Subject: Prevent attr and shadow from overwriting man pages installed by the
 man-pages package.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11026 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 7 +++++++
 chapter06/attr.xml      | 2 +-
 chapter06/shadow.xml    | 8 ++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8ee7502af..5b4592731 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,13 @@
     <listitem>
       <para>2016-02-26</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Prevent attr and shadow from overwriting
+          man pages installed by the man-pages package.  Fixes
+          <ulink url="&lfs-ticket-root;3890">#3890</ulink>, 
+          <ulink url="&lfs-ticket-root;3891">#3891</ulink>, and 
+          <ulink url="&lfs-ticket-root;3892">#3892</ulink></para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Retain flex static library for automake
           regression tests.  Remove at the end of Chapter 6. Fixes
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 48d64fe63..03044a745 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -49,7 +49,7 @@
     <para>Prevent installation of manual pages that were already installed by
     the <xref linkend="man-pages"/> package:</para>
 
-<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
 
     <para>Prepare Attr for compilation:</para>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index d01ef11ee..66482202c 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -50,10 +50,14 @@
     </note>
 
     <para>Disable the installation of the <command>groups</command> program
-    and its man pages, as Coreutils provides a better version:</para>
+    and its man pages, as Coreutils provides a better version. Also 
+    Prevent the installation of manual pages that were already installed by the
+    <xref linkend="man-pages"/> package:</para>
 
 <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>
+find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
+find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
+find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></screen>
 
     <para id="shadow-login_defs">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
-- 
cgit v1.2.3-54-g00ecf