From 2a97593553736fc01983a7aea29aaed140d1a9e2 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 19 Feb 2017 23:06:02 +0000
Subject: Add a fix (embeeded patch) to shadow to fix an upstream bug. Minor
 text change in adjusting toolchanin.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11189 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter06/adjusting.xml |  5 +++--
 chapter06/shadow.xml    | 28 +++++++++++++++++++++++++++-
 general.ent             |  6 +++---
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 28a7cc575..0d4b3a472 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2017-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a fix (embeeded patch) to shadow
+          to fix an upstream bug.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2017-02-13</para>
       <itemizedlist>
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index b8cd5b530..1231c2ca8 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -52,8 +52,9 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="c"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-  <para>Note that <filename class="directory">/lib</filename> is now
-  the prefix of our dynamic linker.</para>
+  <para>Note that on 64-bit systems <filename class="directory">/lib</filename> is
+  the location of our dynamic linker, but is accessed via a symbolic link
+  in /lib64.</para>
 
   <note><para>On 32-bit systems the interpreter should be
   /lib/ld-linux.so.2.</para></note>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index c9d63a4d0..e54c4ee54 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -67,9 +67,35 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></s
     for user mailboxes that Shadow uses by default to the <filename
     class="directory">/var/mail</filename> location used currently:</para>
 
-<screen><userinput remap="configure">sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
+<screen><userinput remap="pre">sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
        -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen>
 
+    <para>Now fix a bug that prevents <command>useradd</command> from 
+    setting the shell entry in the /etc/passwd file.  In this case we need a 
+    short patch, but can include it directly here without the need for a
+    separate file:</para>
+
+<screen><userinput remap="pre">echo '--- src/useradd.c   (old)
++++ src/useradd.c   (new)
+@@ -2027,6 +2027,8 @@
+        is_shadow_grp = sgr_file_present ();
+ #endif
+ 
++       get_defaults ();
++
+        process_flags (argc, argv);
+ 
+ #ifdef ENABLE_SUBIDS
+@@ -2036,8 +2038,6 @@
+            (!user_id || (user_id &lt;= uid_max &amp;&amp; user_id >= uid_min));
+ #endif                         /* ENABLE_SUBIDS */
+ 
+-       get_defaults ();
+-
+ #ifdef ACCT_TOOLS_SETUID
+ #ifdef USE_PAM
+        {' | patch -p0 -l</userinput></screen>
+
     <note>
       <para>If you chose to build Shadow with Cracklib support, run the following:</para>
 
diff --git a/general.ent b/general.ent
index d1646fccf..b06bf0b53 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20170213">
+<!ENTITY version         "SVN-20170219">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170213-systemd">
+<!ENTITY versiond        "20170219-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 13, 2017">
+<!ENTITY releasedate     "February 19, 2017">
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.0">
 
-- 
cgit v1.2.3-54-g00ecf