[lfs-book] r11026 - in trunk/BOOK: chapter01 chapter06

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Fri Feb 26 20:11:22 PST 2016


Author: bdubbs
Date: Fri Feb 26 20:11:22 2016
New Revision: 11026

Log:
Prevent attr and shadow from overwriting man pages installed by the man-pages
package.

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter06/attr.xml
   trunk/BOOK/chapter06/shadow.xml

Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml	Fri Feb 26 11:59:11 2016	(r11025)
+++ trunk/BOOK/chapter01/changelog.xml	Fri Feb 26 20:11:22 2016	(r11026)
@@ -39,6 +39,13 @@
       <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
           <ulink url="&lfs-ticket-root;3894">#3894</ulink>.</para>

Modified: trunk/BOOK/chapter06/attr.xml
==============================================================================
--- trunk/BOOK/chapter06/attr.xml	Fri Feb 26 11:59:11 2016	(r11025)
+++ trunk/BOOK/chapter06/attr.xml	Fri Feb 26 20:11:22 2016	(r11026)
@@ -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>
 

Modified: trunk/BOOK/chapter06/shadow.xml
==============================================================================
--- trunk/BOOK/chapter06/shadow.xml	Fri Feb 26 11:59:11 2016	(r11025)
+++ trunk/BOOK/chapter06/shadow.xml	Fri Feb 26 20:11:22 2016	(r11026)
@@ -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


More information about the lfs-book mailing list