From 804a46a4a407c3e057430e397d61eec513680da1 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 31 Oct 2005 19:55:28 +0000
Subject: [PATCH] Upgrade to shadow 4.0.13

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7114 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter03/patches.xml   | 7 +++++++
 chapter06/shadow.xml    | 7 ++++++-
 general.ent             | 2 +-
 patches.ent             | 2 ++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4892c2ccb..0e75028b2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -101,6 +101,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>&kbd-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&mktemp-tempfile-patch;</para></listitem>
 <listitem><para>&perl-libc-patch;</para></listitem>
+<listitem><para>&shadow-configure-patch;</para></listitem>
 <listitem><para>&tar-gcc4_fix-patch;</para></listitem>
 <listitem><para>&texinfo-tempfile_fix-patch;</para></listitem>
 </itemizedlist>
@@ -121,6 +122,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 31, 2005 [matt]: Upgrade to shadow-4.0.13.</para>
+</listitem>
+
 <listitem><para>October 31, 2005 [matt]: Upgrade to vim-6.4.</para>
 </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d37075822..108bb3769 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -177,6 +177,13 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Shadow Configure Script Patch - 1KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&shadow-configure-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Sysklogd Fixes Patch - 27 KB:</term>
 <listitem>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 2415453ee..539fa90b5 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -36,6 +36,11 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
 <command>configure</command> command below.</para></note>
 
+<para>Apply a patch to fix a number of incorrect assumptions in Shadow's
+<command>configure</command> script:</para>
+
+<screen><userinput>patch -Np1 -i ../&shadow-configure-patch;</userinput></screen>
+
 <para>Prepare Shadow for compilation:</para>
 
 <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
@@ -82,7 +87,7 @@ the <command>sed</command> given below:</para>
 
 <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>
+    etc/login.defs &gt; /etc/login.defs</userinput></screen>
 
 <para>Move a misplaced program to its proper location:</para>
 
diff --git a/general.ent b/general.ent
index ebf0bac64..759f21bc3 100644
--- a/general.ent
+++ b/general.ent
@@ -71,7 +71,7 @@
 <!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.12">
+<!ENTITY shadow-version "4.0.13">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
diff --git a/patches.ent b/patches.ent
index 26b61a2ff..425ec0e71 100644
--- a/patches.ent
+++ b/patches.ent
@@ -38,6 +38,8 @@
 
 <!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
 
+<!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch">
+
 <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
 
 <!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch">