cvs commit: ALFS/profiles/BLFS/chapter43 opensp.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 13:45:31 PDT 2004


kpfleming    04/07/03 14:45:31

  Modified:    profiles/BLFS/chapter04 heimdal.xml iptables.xml
                        tripwire.xml
               profiles/BLFS/chapter08 libfam.xml
               profiles/BLFS/chapter09 freetype.xml libpng.xml libungif.xml
                        svgalib.xml
               profiles/BLFS/chapter10 bc.xml compface.xml rep-gtk.xml
               profiles/BLFS/chapter11 gpm.xml hdparm.xml unzip.xml
               profiles/BLFS/chapter12 gcc-full.xml gcc295.xml python.xml
               profiles/BLFS/chapter13 ppp.xml
               profiles/BLFS/chapter14 dhcpcd.xml
               profiles/BLFS/chapter16 wvstreams.xml
               profiles/BLFS/chapter18 portmap.xml tcpwrappers.xml
               profiles/BLFS/chapter20 pine.xml
               profiles/BLFS/chapter43 opensp.xml
  Log:
  minor cleanups
  use ALFS elements properly
  eliminate patch references from cleanup stages
  
  Revision  Changes    Path
  1.3       +0 -10     ALFS/profiles/BLFS/chapter04/heimdal.xml
  
  Index: heimdal.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/heimdal.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- heimdal.xml	3 Jul 2004 15:33:51 -0000	1.2
  +++ heimdal.xml	3 Jul 2004 20:45:30 -0000	1.3
  @@ -3,23 +3,13 @@
     <!--<packageinfo>
       <requires>
         <name>openssl</name>
  -    </requires>
  -    <requires>
         <name>db</name>
       </requires>
       <utilizes>
         <name>readline</name>
  -    </utilizes>
  -    <utilizes>
         <name>linuxpam</name>
  -    </utilizes>
  -    <utilizes>
         <name>openldap</name>
  -    </utilizes>
  -    <utilizes>
         <name>xfree86</name>
  -    </utilizes>
  -    <utilizes>
         <name>cracklib</name>
       </utilizes>
     </packageinfo>-->
  
  
  
  1.5       +2 -2      ALFS/profiles/BLFS/chapter04/iptables.xml
  
  Index: iptables.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/iptables.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- iptables.xml	3 Jul 2004 15:33:51 -0000	1.4
  +++ iptables.xml	3 Jul 2004 20:45:30 -0000	1.5
  @@ -26,8 +26,8 @@
   		</make>
   
   
  -	<!-- set-up for personnal firewall -->
  -	<!-- other set-ups are available in the Book -->
  +	<!-- setup for personal firewall -->
  +	<!-- other setups are available in the book -->
   
   		<textdump base="/etc/rc.d/init.d">
   			<file>firewall</file>
  
  
  
  1.3       +40 -11    ALFS/profiles/BLFS/chapter04/tripwire.xml
  
  Index: tripwire.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/tripwire.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tripwire.xml	3 Jul 2004 17:14:26 -0000	1.2
  +++ tripwire.xml	3 Jul 2004 20:45:30 -0000	1.3
  @@ -41,14 +41,41 @@
   
   		<!-- the following commands are for automating the build of tripwire, these command are not in the book -->
   
  -		<execute command="sed -i 's%TWMAILMETHOD=SENDMAIL%#&%' install.cfg" />
  -		<execute command="sed -i 's%TWMAILPROGRAM%#&%' install.cfg" />
  -
  -		<execute command="sed -i 's%# TWMAILMETHOD=SMTP%TWMAILMETHOD=SMTP%' install.cfg" />
  -		<execute command="sed -i 's%# TWSMTPHOST="mail.domain.com"%TWSMTPHOST="&tripwire-mail-domain;"%' install.cfg" />
  -		<execute command="sed -i 's%# TWSMTPPORT=25%TWSMTPPORT=&tripwire-smtp-port;%' install.cfg" />
  -
  -		<execute command="./install.sh -n -s "&tripwire-sitepassphrase;" -l "&tripwire-localpassphrase;"" />
  +		<search_replace>
  +			<file>install.cfg</file>
  +			<find>TWMAILMETHOD=SENDMAIL</find>
  +			<replace>#TWMAILMETHOD=SENDMAIL</replace>
  +		</search_replace>
  +
  +		<search_replace>
  +			<file>install.cfg</file>
  +			<find>TWMAILPROGRAM</find>
  +			<replace>#TWMAILPROGRAM</replace>
  +		</search_replace>
  +
  +		<search_replace>
  +			<file>install.cfg</file>
  +			<find># TWMAILMETHOD=SMTP</find>
  +			<replace>TWMAILMETHOD=SMTP</replace>
  +		</search_replace>
  +
  +		<search_replace>
  +			<file>install.cfg</file>
  +			<find># TWSMTPHOST="mail.domain.com"</find>
  +			<replace>TWSMTPHOST="&tripwire-mail-domain;"</replace>
  +		</search_replace>
  +
  +		<search_replace>
  +			<file>install.cfg</file>
  +			<find># TWSMTPPORT=25</find>
  +			<replace>TWSMTPPORT=&tripwire-smtp-port;</replace>
  +		</search_replace>
  +
  +		<execute command="./install.sh">
  +			<param>-n</param>
  +			<param>-s "&tripwire-sitepassphrase;"</param>
  +			<param>-l "&tripwire-localpassphrase;"</param>
  +		</execute>
   	
   		<copy>
   			<source>/etc/tripwire/tw.cfg</source>
  @@ -66,11 +93,14 @@
   		</copy>
   
   		<execute command="twadmin">
  -			<param>-m P -Q &tripwire-sitepassphrase; /etc/tripwire/&tripwire-policy-file;</param>
  +			<param>-m P</param>
  +			<param>-Q &tripwire-sitepassphrase;</param>
  +			<param>/etc/tripwire/&tripwire-policy-file;</param>
   		</execute>
   
   		<execute command="tripwire">
  -			<param>-m i -P &tripwire-localpassphrase;</param>
  +			<param>-m i</param>
  +			<param>-P &tripwire-localpassphrase;</param>
   		</execute>
   
   	</stage>
  @@ -78,7 +108,6 @@
   
   	<stage name="Clean-Up">
   		<remove>&build_dir;/&tripwire-package;</remove>
  -		<remove>&build_dir;/&tripwire-gcc-patch;</remove>
   		<remove>&build_dir;/&tripwire-policy-file;</remove>
   	</stage>
   
  
  
  
  1.7       +0 -1      ALFS/profiles/BLFS/chapter08/libfam.xml
  
  Index: libfam.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/libfam.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libfam.xml	3 Jul 2004 17:14:26 -0000	1.6
  +++ libfam.xml	3 Jul 2004 20:45:30 -0000	1.7
  @@ -57,7 +57,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&libfam-directory;</remove>
  -		<remove>&build_dir;/&libfam-patch;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   	</stage>
   
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter09/freetype.xml
  
  Index: freetype.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/freetype.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- freetype.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ freetype.xml	3 Jul 2004 20:45:30 -0000	1.6
  @@ -34,7 +34,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&freetype-directory;</remove>
  -		<remove>&build_dir;/&freetype-bytecode-interpreter-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.7       +0 -1      ALFS/profiles/BLFS/chapter09/libpng.xml
  
  Index: libpng.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libpng.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libpng.xml	3 Jul 2004 17:14:27 -0000	1.6
  +++ libpng.xml	3 Jul 2004 20:45:30 -0000	1.7
  @@ -37,7 +37,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&libpng-directory;</remove>
  -		<remove>&build_dir;/&libpng-link-to-proper-libs-patch;</remove>
   	</stage>
   
   
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter09/libungif.xml
  
  Index: libungif.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libungif.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- libungif.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ libungif.xml	3 Jul 2004 20:45:30 -0000	1.6
  @@ -33,7 +33,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&libungif-directory;</remove>
  -		<remove>&build_dir;/&libungif-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.8       +0 -1      ALFS/profiles/BLFS/chapter09/svgalib.xml
  
  Index: svgalib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/svgalib.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- svgalib.xml	3 Jul 2004 17:14:27 -0000	1.7
  +++ svgalib.xml	3 Jul 2004 20:45:30 -0000	1.8
  @@ -32,7 +32,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&svgalib-directory;</remove>
  -		<remove>&build_dir;/&svgalib-gcc3-1-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.6       +0 -2      ALFS/profiles/BLFS/chapter10/bc.xml
  
  Index: bc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/bc.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- bc.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ bc.xml	3 Jul 2004 20:45:30 -0000	1.6
  @@ -42,8 +42,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&bc-directory;</remove>
  -		<remove>&build_dir;/&bc-flex-invocation-patch;</remove>
  -		<remove>&build_dir;/&bc-readline-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.5       +0 -1      ALFS/profiles/BLFS/chapter10/compface.xml
  
  Index: compface.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/compface.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- compface.xml	3 Jul 2004 17:14:27 -0000	1.4
  +++ compface.xml	3 Jul 2004 20:45:30 -0000	1.5
  @@ -31,7 +31,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&compface-directory;</remove>
  -		<remove>&build_dir;/&compface-errno-2-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.5       +0 -1      ALFS/profiles/BLFS/chapter10/rep-gtk.xml
  
  Index: rep-gtk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/rep-gtk.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rep-gtk.xml	3 Jul 2004 17:14:27 -0000	1.4
  +++ rep-gtk.xml	3 Jul 2004 20:45:30 -0000	1.5
  @@ -37,7 +37,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&rep-gtk-directory;</remove>
  -		<remove>&build_dir;/&rep-gtk-gtk2.4-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.6       +0 -2      ALFS/profiles/BLFS/chapter11/gpm.xml
  
  Index: gpm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/gpm.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gpm.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ gpm.xml	3 Jul 2004 20:45:30 -0000	1.6
  @@ -71,8 +71,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&gpm-directory;</remove>
  -		<remove>&build_dir;/&gpm-patch1;</remove>
  -		<remove>&build_dir;/&gpm-patch2;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   	</stage>
   
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter11/hdparm.xml
  
  Index: hdparm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/hdparm.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- hdparm.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ hdparm.xml	3 Jul 2004 20:45:30 -0000	1.6
  @@ -29,7 +29,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&hdparm-directory;</remove>
  -		<remove>&build_dir;/&hdparm-patch1;</remove>
   	</stage>
   
   </package>
  
  
  
  1.7       +0 -3      ALFS/profiles/BLFS/chapter11/unzip.xml
  
  Index: unzip.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/unzip.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- unzip.xml	3 Jul 2004 17:14:27 -0000	1.6
  +++ unzip.xml	3 Jul 2004 20:45:30 -0000	1.7
  @@ -59,9 +59,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&unzip-directory;</remove>
  -		<remove>&build_dir;/&unzip-patch1;</remove>
  -		<remove>&build_dir;/&unzip-patch2;</remove>
  -		<remove>&build_dir;/&unzip-patch3;</remove>
   	</stage>
   
   </package>
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter12/gcc-full.xml
  
  Index: gcc-full.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc-full.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gcc-full.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ gcc-full.xml	3 Jul 2004 20:45:31 -0000	1.6
  @@ -75,7 +75,6 @@
   	<stage name="Cleanup">
   		<remove>&build_dir;/&gcc-full-directory;</remove>
   		<remove>&build_dir;/gcc-build</remove>
  -		<remove>&build_dir;/&gcc-full-patch1;</remove>
   		<remove>/opt/gnat</remove>
   	</stage>
   
  
  
  
  1.5       +0 -3      ALFS/profiles/BLFS/chapter12/gcc295.xml
  
  Index: gcc295.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc295.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gcc295.xml	3 Jul 2004 17:14:27 -0000	1.4
  +++ gcc295.xml	3 Jul 2004 20:45:31 -0000	1.5
  @@ -60,9 +60,6 @@
   	<stage name="Cleanup">
   		<remove>&build_dir;/&gcc295-directory;</remove>
   		<remove>&build_dir;/gcc-build</remove>
  -		<remove>&build_dir;/&gcc295-patch1;</remove>
  -		<remove>&build_dir;/&gcc295-patch2;</remove>
  -		<remove>&build_dir;/&gcc295-patch3;</remove>
   	</stage>
   
   </package>
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter12/python.xml
  
  Index: python.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/python.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- python.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ python.xml	3 Jul 2004 20:45:31 -0000	1.6
  @@ -44,7 +44,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&python-directory;</remove>
  -		<remove>&build_dir;/&python-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.5       +0 -1      ALFS/profiles/BLFS/chapter13/ppp.xml
  
  Index: ppp.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter13/ppp.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ppp.xml	3 Jul 2004 17:14:27 -0000	1.4
  +++ ppp.xml	3 Jul 2004 20:45:31 -0000	1.5
  @@ -32,7 +32,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&ppp-directory;</remove>
  -		<remove>&build_dir;/&ppp-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter14/dhcpcd.xml
  
  Index: dhcpcd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter14/dhcpcd.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dhcpcd.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ dhcpcd.xml	3 Jul 2004 20:45:31 -0000	1.6
  @@ -60,7 +60,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&dhcpcd-directory;</remove>
  -		<remove>&build_dir;/&dhcpcd-patch;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   	</stage>
   
  
  
  
  1.7       +0 -2      ALFS/profiles/BLFS/chapter16/wvstreams.xml
  
  Index: wvstreams.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/wvstreams.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- wvstreams.xml	3 Jul 2004 17:14:27 -0000	1.6
  +++ wvstreams.xml	3 Jul 2004 20:45:31 -0000	1.7
  @@ -43,8 +43,6 @@
   
       <stage name="Cleanup">
   	<remove>&build_dir;/&wvstreams-directory;</remove>
  -	<remove>&build_dir;/&wvstreams-wvcrypto-patch;</remove>
  -	<remove>&build_dir;/&wvstreams-wvresolver-patch;</remove>
       </stage>
   
   </package>
  
  
  
  1.7       +0 -2      ALFS/profiles/BLFS/chapter18/portmap.xml
  
  Index: portmap.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/portmap.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- portmap.xml	3 Jul 2004 17:14:27 -0000	1.6
  +++ portmap.xml	3 Jul 2004 20:45:31 -0000	1.7
  @@ -53,8 +53,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&portmap-directory;</remove>
  -		<remove>&build_dir;/&portmap-compilation-fixes-patch;</remove>
  -		<remove>&build_dir;/&portmap-glibc-errno-fix-patch;</remove>
   		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   	</stage>
   
  
  
  
  1.6       +0 -1      ALFS/profiles/BLFS/chapter18/tcpwrappers.xml
  
  Index: tcpwrappers.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/tcpwrappers.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tcpwrappers.xml	3 Jul 2004 17:14:27 -0000	1.5
  +++ tcpwrappers.xml	3 Jul 2004 20:45:31 -0000	1.6
  @@ -31,6 +31,5 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&tcpwrappers-directory;</remove>
  -		<remove>&build_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.7       +0 -1      ALFS/profiles/BLFS/chapter20/pine.xml
  
  Index: pine.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter20/pine.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pine.xml	3 Jul 2004 17:14:27 -0000	1.6
  +++ pine.xml	3 Jul 2004 20:45:31 -0000	1.7
  @@ -59,7 +59,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&pine-directory;</remove>
  -		<remove>&build_dir;/&pine-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.3       +0 -1      ALFS/profiles/BLFS/chapter43/opensp.xml
  
  Index: opensp.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter43/opensp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- opensp.xml	3 Jul 2004 15:33:59 -0000	1.2
  +++ opensp.xml	3 Jul 2004 20:45:31 -0000	1.3
  @@ -120,7 +120,6 @@
   
   	<stage name="Cleanup">
   		<remove>&build_dir;/&opensp-directory;</remove>
  -		<remove>&build_dir;/&opensp-patch;</remove>
   	</stage>
   
   </package>
  
  
  



More information about the alfs-log mailing list