r2002 - profiles/BLFS/trunk/chapter04

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Sep 15 16:30:47 PDT 2005


Author: thomasp
Date: 2005-09-15 17:30:44 -0600 (Thu, 15 Sep 2005)
New Revision: 2002

Modified:
   profiles/BLFS/trunk/chapter04/cracklib.xml
   profiles/BLFS/trunk/chapter04/openssl.xml
   profiles/BLFS/trunk/chapter04/shadow.xml
   profiles/BLFS/trunk/chapter04/stunnel.xml
Log:
apply patch from Torsten Vollmann for ch.4

Modified: profiles/BLFS/trunk/chapter04/cracklib.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cracklib.xml	2005-09-15 20:49:22 UTC (rev 2001)
+++ profiles/BLFS/trunk/chapter04/cracklib.xml	2005-09-15 23:30:44 UTC (rev 2002)
@@ -42,6 +42,7 @@
 	<param>--prefix=/usr</param>
 	<param>--datadir=/lib</param>
       </configure>
+      <make/>
       <make>
         <param>install</param>
       </make>

Modified: profiles/BLFS/trunk/chapter04/openssl.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/openssl.xml	2005-09-15 20:49:22 UTC (rev 2001)
+++ profiles/BLFS/trunk/chapter04/openssl.xml	2005-09-15 23:30:44 UTC (rev 2002)
@@ -43,11 +43,6 @@
         <param>--prefix=/usr</param>
         <param>shared</param>
       </configure>
-      <search_replace>
-	<file>Makefile</file>
-	<find>SHLIBDIRS= fips crypto ssl</find>
-	<replace>SHLIBDIRS= crypto ssl</replace>
-      </search_replace>
       <make>
         <param>MANDIR=/usr/share/man</param>
       </make>

Modified: profiles/BLFS/trunk/chapter04/shadow.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/shadow.xml	2005-09-15 20:49:22 UTC (rev 2001)
+++ profiles/BLFS/trunk/chapter04/shadow.xml	2005-09-15 23:30:44 UTC (rev 2002)
@@ -259,7 +259,7 @@
         <replace>#PASS_ALWAYS_WARN</replace>
       </search_replace>
       -->
-      <execute command="&blfs-config;/scripts/pam-env.sh" />
+      <execute command="sh &blfs-config;/scripts/pam-env.sh" />
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&shadow-directory;</remove>

Modified: profiles/BLFS/trunk/chapter04/stunnel.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/stunnel.xml	2005-09-15 20:49:22 UTC (rev 2001)
+++ profiles/BLFS/trunk/chapter04/stunnel.xml	2005-09-15 23:30:44 UTC (rev 2002)
@@ -74,13 +74,15 @@
     <configure>
       <param>--prefix=/usr</param>
       <param>--sysconfdir=/etc</param>
+      <param>--localstatedir=/var/lib</param>
+      <!-- uncomment if you don't have tcpwrappers installed -->
+      <!-- <param>- -disable-libwrap</param> --> 
     </configure>
+    <make />
     <make>
+      <param>install</param>
       <param>< stunnel_answers</param>
     </make>
-    <make>
-      <param>install</param>
-    </make>
   </stage>
   <stage name="Installing bootscript and configuration">
     <stageinfo>




More information about the alfs-log mailing list