Changeset b057615

Timestamp:

02/27/2016 04:11:22 AM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

2005e74

Parents:

5b7d4da

Message:

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/attr.xml (modified) (1 diff)
• chapter06/shadow.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -40 +40 @@
       <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

chapter06/attr.xml

@@ -50 +50 @@
     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>

chapter06/shadow.xml

@@ -51 +51 @@
 
     <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