* Upgrade to shadow-4.0.7

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

4 files changed, 21 insertions, 24 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a595ce1a0..99b14a7b1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,7 +38,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>Module-init-tools 3.1</para></listitem>
 <listitem><para>Perl 5.8.6</para></listitem>
 <listitem><para>Procps 3.2.4</para></listitem>
-<listitem><para>Shadow 4.0.6</para></listitem>
+<listitem><para>Shadow 4.0.7</para></listitem>
 <listitem><para>Sysvinit 2.86</para></listitem>
 <listitem><para>Tar 1.15.1</para></listitem>
 <listitem><para>Texinfo 4.8</para></listitem>
@@ -74,6 +74,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 29, 2005 [matt]: Upgraded to shadow-4.0.7</para>
+</listitem>
+
 <listitem><para>January 29, 2005 [matt]: Upgraded to util-linux-2.12q.</para>
 </listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index bc27862cc..519cc2da8 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -341,7 +341,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow (&shadow-version;) - 795 KB:</term>
+<term>Shadow (&shadow-version;) - 996 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;shadow/"/></para>
 </listitem>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 540a512d3..d8a97bf27 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -31,7 +31,13 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 
 <para>Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/usr/lib --enable-shared</userinput></screen>
+<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
+
+<para>Remove the installation of the groups program, and its man page as
+Coreutils provides a better version:</para>
+
+<screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
+sed -i '/groups/d' man/Makefile</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -62,25 +68,19 @@ file while copying it to its destination:</para>
 
 <indexterm zone="shadow-login_defs"><primary sortas="e-/etc/login.defs">/etc/login.defs</primary></indexterm>
 
-<screen><userinput>cp etc/login.defs.linux /etc/login.defs
-sed -i -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
-    -e 's@/var/spool/mail@/var/mail@' /etc/login.defs</userinput></screen>
+<screen><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
+    -e 's@/var/spool/mail@/var/mail@' \
+    etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
 
-<para>Move a misplaced program to their proper
-location:</para>
+<para>Move a misplaced program to its proper location:</para>
 
 <screen><userinput>mv /usr/bin/passwd /bin</userinput></screen>
 
-<para>Move Shadow's dynamic libraries to a more appropriate
-location:</para>
-
-<screen><userinput>mv /usr/lib/libshadow.so.0* /lib</userinput></screen>
+<para>Move Shadow's libraries to more appropriate locations:</para>
 
-<para>Because some packages expect to find the just-moved libraries in
-<filename class="directory">/usr/lib</filename>, create the following
-symlink:</para>
-
-<screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
+<screen><userinput>mv /lib/libshadow.*a /usr/lib
+rm /lib/libshadow.so
+ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
 <para>The <parameter>-D</parameter> option of the
 <command>useradd</command> program requires the <filename
@@ -89,12 +89,6 @@ properly:</para>
 
 <screen><userinput>mkdir /etc/default</userinput></screen>
 
-<para>Coreutils has already installed a better
-<command>groups</command> program in <filename
-class="directory">/usr/bin</filename>.  Remove the one installed by
-Shadow:</para>
-
-<screen><userinput>rm /bin/groups</userinput></screen>
 <beginpage/>
 </sect2>
 
diff --git a/general.ent b/general.ent
index fd64bdd22..b0ae31687 100644
--- a/general.ent
+++ b/general.ent
@@ -62,7 +62,7 @@
 <!ENTITY psmisc-version "21.5">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.2">
-<!ENTITY shadow-version "4.0.6">
+<!ENTITY shadow-version "4.0.7">
 <!ENTITY syslog-ng-version "1.6.5">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">