r957 - in trunk/BOOK: . final-system/multilib materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Dec 23 19:11:18 PST 2005


Author: jim
Date: 2005-12-23 20:11:15 -0700 (Fri, 23 Dec 2005)
New Revision: 957

Modified:
   trunk/BOOK/
   trunk/BOOK/final-system/multilib/shadow-64bit.xml
   trunk/BOOK/final-system/multilib/shadow-n32.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/patches.ent
Log:
 r1186 at server:  jim | 2005-12-23 19:09:46 -0800
 Reworked multilib fix. Reverted patch, changed into a sed.



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1184
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1186
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-64bit.xml	2005-12-23 23:47:13 UTC (rev 956)
+++ trunk/BOOK/final-system/multilib/shadow-64bit.xml	2005-12-24 03:11:15 UTC (rev 957)
@@ -21,10 +21,21 @@
   <sect2 role="installation">
     <title>Installation of Shadow</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    <note os="a">
+      <para>If you would like to enforce the use of strong passwords,
+      refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/>
+      for installing Cracklib prior to building Shadow. Then add
+      <parameter>--with-libcrack</parameter> to the <command>configure</command>
+      command below.</para>
 
+      <para>You will also need to use the follow sed after the configuration command
+      to make sure the correct library is linked.</para>
+
+      <screen><userinput>sed -i libtool \
+         -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g' \
+         -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib64 /usr/lib64 /usr/local/lib64"@g'</userinput></screen>
+    </note>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
     xpointer="xpointer(//*[@os='p1'])"/>

Modified: trunk/BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-n32.xml	2005-12-23 23:47:13 UTC (rev 956)
+++ trunk/BOOK/final-system/multilib/shadow-n32.xml	2005-12-24 03:11:15 UTC (rev 957)
@@ -22,10 +22,21 @@
   <sect2 role="installation">
     <title>Installation of Shadow</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    <note os="a">
+      <para>If you would like to enforce the use of strong passwords,
+      refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/>
+      for installing Cracklib prior to building Shadow. Then add
+      <parameter>--with-libcrack</parameter> to the <command>configure</command>
+      command below.</para>
 
+      <para>You will also need to use the follow sed after the configuration command
+      to make sure the correct library is linked.</para>
+
+      <screen><userinput>sed -i libtool \
+	 -e 's@\(^sys_lib_search_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g' \
+	 -e 's@\(^sys_lib_dlsearch_path_spec=\).*@\1"/lib32 /usr/lib32 /usr/local/lib32"@g'</userinput></screen>
+    </note>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
     xpointer="xpointer(//*[@os='p1'])"/>

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2005-12-23 23:47:13 UTC (rev 956)
+++ trunk/BOOK/materials/common/patches.xml	2005-12-24 03:11:15 UTC (rev 957)
@@ -171,7 +171,7 @@
     </varlistentry>
 
     <varlistentry os="p21">
-      <term>Shadow Configure Fixes Patch - 4.5 KB:</term>
+      <term>Shadow Configure Fixes Patch - 1.9 KB:</term>
       <listitem>
         <para><ulink
         url="&patches-root;shadow/&shadow-configure_fix-patch;"/></para>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-12-23 23:47:13 UTC (rev 956)
+++ trunk/BOOK/patches.ent	2005-12-24 03:11:15 UTC (rev 957)
@@ -45,7 +45,7 @@
 
 <!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
 
-<!ENTITY shadow-configure_fix-patch "shadow-&shadow-version;-configure_fix-2.patch">
+<!ENTITY shadow-configure_fix-patch "shadow-&shadow-version;-configure_fix-1.patch">
 
 <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
 




More information about the cross-lfs mailing list