Changeset 4d4f8776

Timestamp:

Feb 21, 2006, 1:53:33 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

c8819a6

Parents:

d4285da

Message:

r959@server (orig r957): jim | 2005-12-23 19:11:15 -0800

r1186@server: jim | 2005-12-23 19:09:46 -0800
Reworked multilib fix. Reverted patch, changed into a sed.

Files:

• final-system/multilib/shadow-64bit.xml (modified) (1 diff)
• final-system/multilib/shadow-n32.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

final-system/multilib/shadow-64bit.xml

@@ -22 +22 @@
     <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"

final-system/multilib/shadow-n32.xml

@@ -23 +23 @@
     <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"

materials/common/patches.xml

@@ -172 +172 @@
 
     <varlistentry os="p21">
-      <term>Shadow Configure Fixes Patch - 4.5 KB:</term>
+      <term>Shadow Configure Fixes Patch - 1.9 KB:</term>
       <listitem>
         <para><ulink

patches.ent

@@ -46 +46 @@
 <!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">