Hi.

Attached is the diff for chapter 4 but only for

openssl
cracklib
pam
shadow
gnupg
stunnel

and NOT for

iptables
tripwire
heimdal
(mit-krb5)
cyrus-sasl

as I don't use them.


Note: ftp.lfs-matrix.net has the wrong stunnel version: it is
stunnel-4.09.tar.bz2 but should be stunnel-4.11.tar.gz (and patch)! Please
correct this (or tell me wher to report it)

Cheers,

Torsten.
Index: config_standard/packages/ch04.ent
===================================================================
--- config_standard/packages/ch04.ent	(revision 2000)
+++ config_standard/packages/ch04.ent	(working copy)
@@ -70,6 +70,6 @@
 <!ENTITY cyrus-sasl-directory "cyrus-sasl-&cyrus-sasl-version;">
 
 <!ENTITY stunnel-version   "4.11">
-<!ENTITY stunnel-package   "stunnel-&stunnel-version;.tar.bz2">
+<!ENTITY stunnel-package   "stunnel-&stunnel-version;.tar.gz">
 <!ENTITY stunnel-md5       "">
 <!ENTITY stunnel-directory "stunnel-&stunnel-version;">
Index: chapter04/openssl.xml
===================================================================
--- chapter04/openssl.xml	(revision 2000)
+++ chapter04/openssl.xml	(working copy)
@@ -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>
Index: chapter04/shadow.xml
===================================================================
--- chapter04/shadow.xml	(revision 2000)
+++ chapter04/shadow.xml	(working copy)
@@ -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>
Index: chapter04/stunnel.xml
===================================================================
--- chapter04/stunnel.xml	(revision 2000)
+++ chapter04/stunnel.xml	(working copy)
@@ -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>&lt; stunnel_answers</param>
     </make>
-    <make>
-      <param>install</param>
-    </make>
   </stage>
   <stage name="Installing bootscript and configuration">
     <stageinfo>
Index: chapter04/cracklib.xml
===================================================================
--- chapter04/cracklib.xml	(revision 2000)
+++ chapter04/cracklib.xml	(working copy)
@@ -42,6 +42,7 @@
 	<param>--prefix=/usr</param>
 	<param>--datadir=/lib</param>
       </configure>
+      <make/>
       <make>
         <param>install</param>
       </make>
Index: wget/chapter04.urls
===================================================================
--- wget/chapter04.urls	(revision 2000)
+++ wget/chapter04.urls	(working copy)
@@ -1,29 +1,29 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/openssl-0.9.7g.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/openssl-0.9.7g-fix_manpages-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/M-P/openssl-0.9.7g.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/M-P/openssl-0.9.7g-fix_manpages-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cracklib-2.8.3.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cracklib-2.8.3-heimdal-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cracklib-words.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/A-C/cracklib-2.8.3.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/A-C/cracklib-2.8.3-heimdal-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/A-C/cracklib-words.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/Linux-PAM-0.80.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/Linux-PAM-0.80-docs.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/L/Linux-PAM-0.80.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/L/Linux-PAM-0.80-docs.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/shadow-4.0.9.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/shadow-4.0.9-Linux_PAM_fixes-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/Q-S/shadow-4.0.9.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/Q-S/shadow-4.0.9-Linux_PAM_fixes-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/iptables-1.3.3.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/I-K/iptables-1.3.3.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/gnupg-1.4.1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/F-H/gnupg-1.4.1.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/T-V/tripwire-portable-0.9.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/T-V/tripwire-portable-0.9.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/heimdal-0.7.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/heimdal-0.7-fhs_compliance-1.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/heimdal-0.7-cracklib-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/F-H/heimdal-0.7.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/F-H/heimdal-0.7-fhs_compliance-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/F-H/heimdal-0.7-cracklib-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/krb5-1.4.1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/I-K/krb5-1.4.1.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cyrus-sasl-2.1.21.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/A-C/cyrus-sasl-2.1.21.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/stunnel-4.11.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/stunnel-4.11-1_minute_sleep_fix.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/Q-S/stunnel-4.11.tar.gz
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.1/Q-S/stunnel-4.11-1_minute_sleep_fix.patch
-- 
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to