Merge recent changes from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@11028 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -35,6 +35,22 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2016-03-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Prevent attr and shadow from overwriting
+          man pages installed by the man-pages package - Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Retain flex static library for automake
+          regression tests.  Remove at the end of Chapter 6 - Merged from
+          trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-02-19</para>
       <itemizedlist>

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>
 

chapter06/flex.xml

@@ -43,9 +43,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-            --disable-static \
-            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/revisedchroot.xml

@@ -43,15 +43,15 @@
 
   <para>Finally, there were several static libraries that were not supressed earlier
   in the chapter in order to satisfy the regression tests in several packages. These 
-  libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib.  If desired,
+  libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
   remove them now:</para>
 
 <screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
 rm -f /usr/lib/libbz2.a
 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 rm -f /usr/lib/libltdl.a
+rm -f /usr/lib/libfl.a
+rm -f /usr/lib/libfl_pic.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
-<!-- Flex shared library is broken. Keep static until next flex release. -->
-
 </sect1>

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

general.ent

@@ -1,6 +1,6 @@
-<!ENTITY version         "20160219-systemd">
+<!ENTITY version         "20160304-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 19, 2016">
+<!ENTITY releasedate     "March 04, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->