cvs commit: ALFS/profiles/BLFS/chapter08 openssl.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sat May 15 19:22:31 PDT 2004


thomasp     04/05/15 20:22:31

  Modified:    profiles/BLFS BLFS.xml packages.ent
               profiles/BLFS/chapter08 openssl.xml
  Log:
  entity fixes
  
  Revision  Changes    Path
  1.25      +0 -2      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- BLFS.xml	16 May 2004 02:14:12 -0000	1.24
  +++ BLFS.xml	16 May 2004 02:22:31 -0000	1.25
  @@ -92,7 +92,6 @@
   
   </stage>
   
  -<!--
   <stage name="Chapter 8 (General Libraries)">
   
       &openssl;
  @@ -137,7 +136,6 @@
       &imlib2;
   
   </stage>
  --->
   
   <stage name="Chapter 10 (General Utilities)">
   
  
  
  
  1.32      +5 -7      ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- packages.ent	16 May 2004 02:14:13 -0000	1.31
  +++ packages.ent	16 May 2004 02:22:31 -0000	1.32
  @@ -10,7 +10,6 @@
   <!ENTITY cracklib-wordlist "allwords">
   <!ENTITY cracklib-blfs-patch "cracklib-&cracklib-version;-blfs-1.patch">
   
  -
   <!ENTITY linuxpam-version   "0.77">
   <!ENTITY linuxpam-package   "Linux-PAM-&linuxpam-version;.tar.bz2">
   <!ENTITY linuxpam-directory "Linux-PAM-&linuxpam-version;">
  @@ -37,14 +36,13 @@
   
   <!ENTITY tripwire-gcc-patch "tripwire-&tripwire-version;-gcc3-build-fixes.patch">
   <!-- the content of the following entity should be the name of your policy file for tripwire -->
  -<!--<!ENTITY tripwire-policy-file "tripwire-policy.txt">-->
  -<!ENTITY tripwire-policy-file "twpol-all.txt">
  +<!ENTITY tripwire-policy-file "tripwire-policy.txt">
  +<!-- these should be changed to usable values -->
   <!ENTITY tripwire-mail-domain "mail.domain.com">
   <!ENTITY tripwire-smtp-port "25">
   <!ENTITY tripwire-sitepassphrase "blahville">
   <!ENTITY tripwire-localpassphrase "blahville2">
   
  -
   <!--************* packages for chapter 5 *************-->
   
   <!ENTITY reiserfsutils-version   "3.6.14">
  @@ -109,10 +107,10 @@
   <!ENTITY slang-directory "slang-&slang-version;">
   
   <!ENTITY libfam-version   "2.7.0">
  -<!ENTITY libfam-package   "fam-&fam-version;.tar.gz">
  -<!ENTITY libfam-directory "fam-&fam-version;">
  +<!ENTITY libfam-package   "fam-&libfam-version;.tar.gz">
  +<!ENTITY libfam-directory "fam-&libfam-version;">
   
  -<!ENTITY libfam-patch     "fam-&fam-version;-dnotify.patch">
  +<!ENTITY libfam-patch     "fam-&libfam-version;-dnotify.patch">
   
   <!ENTITY libxml-version   "1.8.17">
   <!ENTITY libxml-package   "libxml-&libxml-version;.tar.gz">
  
  
  
  1.3       +11 -19    ALFS/profiles/BLFS/chapter08/openssl.xml
  
  Index: openssl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/openssl.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- openssl.xml	19 Nov 2003 22:28:57 -0000	1.2
  +++ openssl.xml	16 May 2004 02:22:31 -0000	1.3
  @@ -5,12 +5,6 @@
   			<archive>&packages_dir;/&openssl-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -	<copy>
  -		<source>&packages_dir;/&openssl-patch;</source>
  -		<destination>&build_dir;</destination>
  -	</copy>
  -
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -18,12 +12,6 @@
   			<base>&build_dir;/&openssl-directory;</base>
   		</stageinfo>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&openssl-patch;</param>
  -		</patch>
  -
   		<search_replace base="&build_dir;/&openssl-directory;/doc/apps">
   		       <file>passwd.pod</file>
   		       <find>passwd - compute password hashes</find>
  @@ -35,6 +23,17 @@
   			<destination>doc/apps/openssl-passwd.pod</destination>
   		</move>
   
  +		<move>
  +			<source>doc/crypto/threads.pod</source>
  +			<destination>doc/crypto/openssl_threads.pod</destination>
  +		</move>
  +
  +		<search_replace>
  +			<file>Configure</file>
  +			<find>-m486</find>
  +			<replace>-march=i486</replace>
  +		</search_replace>
  +
   		<configure command="./config">
   			<param>--openssldir=/etc/ssl</param>
   			<param>--prefix=/usr</param>
  @@ -57,18 +56,11 @@
   		</copy>
   
   		<remove>/etc/ssl/lib</remove>
  -
  -		<permissions mode="755">
  -		        <name>/usr/lib/pkgconfig</name>
  -		</permissions>
  -
  -
   	</stage>
   
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&openssl-directory;</remove>
  -		<remove>&build_dir;/&openssl-patch;</remove>
   	</stage>
   
   </package>
  
  
  



More information about the alfs-log mailing list