cvs commit: ALFS/profiles/BLFS/chapter04 heimdal.xml iptables.xml linuxpam.xml mitkrb.xml shadow.xml tripwire.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 20:59:33 PDT 2004


kpfleming    04/07/03 21:59:33

  Modified:    profiles/BLFS/chapter04 heimdal.xml iptables.xml
                        linuxpam.xml mitkrb.xml shadow.xml tripwire.xml
  Log:
  various stage splitting and cleanup
  
  Revision  Changes    Path
  1.5       +22 -14    ALFS/profiles/BLFS/chapter04/heimdal.xml
  
  Index: heimdal.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/heimdal.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- heimdal.xml	3 Jul 2004 21:04:26 -0000	1.4
  +++ heimdal.xml	4 Jul 2004 03:59:33 -0000	1.5
  @@ -31,14 +31,10 @@
         <destination>&build_dir;</destination>
       </unpack>	
     </stage>
  -  <stage name="Installing.">
  +  <stage name="Patching.">
       <stageinfo>
         <base>&build_dir;/&heimdal-directory;</base>
       </stageinfo>
  -    <move base="/usr/bin">
  -      <source>ftp</source>
  -      <destination>ftpn</destination>
  -    </move>
       <patch>
         <param>-N</param>
         <param>-p1</param>
  @@ -49,6 +45,15 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&heimdal-cracklib-patch;</param>
       </patch>
  +  </stage>
  +  <stage name="Installing.">
  +    <stageinfo>
  +      <base>&build_dir;/&heimdal-directory;</base>
  +    </stageinfo>
  +    <move base="/usr/bin">
  +      <source>ftp</source>
  +      <destination>ftpn</destination>
  +    </move>
       <configure>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc/heimdal</param>
  @@ -117,7 +122,18 @@
         <name>/usr/lib</name>
       </link>
       &ldconfig;
  -    <execute command="install -d /etc/heimdal" />
  +  </stage>
  +  <stage name="Installing bootscript and configuration">
  +    <stageinfo>
  +      <base>&build_dir;/&blfs-bootscripts-directory;</base>
  +    </stageinfo>
  +    <make>
  +      <param>install-heimdal</param>
  +    </make>
  +    <mkdir>
  +      <option>parents</option>
  +      <name>/etc/heimdal</name>
  +    </mkdir>
       <textdump base="/etc/heimdal">
         <file>krb5.conf</file>
         <content>
  @@ -147,14 +163,6 @@
       </textdump>
       <!-- all other configuration concerning heimdal must be done manually -->
     </stage>
  -  <stage name="Installing bootscript and configuration">
  -    <stageinfo>
  -      <base>&build_dir;/&blfs-bootscripts-directory;</base>
  -    </stageinfo>
  -    <make>
  -      <param>install-heimdal</param>
  -    </make>
  -  </stage>
     <stage name="Cleanup.">
       <remove>&build_dir;/&heimdal-directory;</remove>
       <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
  
  
  
  1.6       +3 -0      ALFS/profiles/BLFS/chapter04/iptables.xml
  
  Index: iptables.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/iptables.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- iptables.xml	3 Jul 2004 20:45:30 -0000	1.5
  +++ iptables.xml	4 Jul 2004 03:59:33 -0000	1.6
  @@ -26,6 +26,9 @@
   		</make>
   
   
  +	</stage>
  +
  +	<stage name="Configuring">
   	<!-- setup for personal firewall -->
   	<!-- other setups are available in the book -->
   
  
  
  
  1.8       +11 -1     ALFS/profiles/BLFS/chapter04/linuxpam.xml
  
  Index: linuxpam.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/linuxpam.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- linuxpam.xml	3 Jul 2004 15:33:51 -0000	1.7
  +++ linuxpam.xml	4 Jul 2004 03:59:33 -0000	1.8
  @@ -11,7 +11,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  +	<stage name="Patching">
   		<stageinfo>
   			<base>&build_dir;/&linuxpam-directory;</base>
   		</stageinfo>
  @@ -22,6 +22,13 @@
   			<param>-i &packages_dir;/&linuxpam-linkage-patch;</param>
   		</patch>
   
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&linuxpam-directory;</base>
  +		</stageinfo>
  +
   		<execute command="autoconf" />
   
   		<configure>
  @@ -68,6 +75,9 @@
   		       <name>/etc/pam.d</name>
   		</mkdir>
   
  +	</stage>
  +
  +	<stage name="Configuring">
   		<textdump base="/etc/pam.d">
   		        <file>other</file>
   
  
  
  
  1.3       +8 -8      ALFS/profiles/BLFS/chapter04/mitkrb.xml
  
  Index: mitkrb.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/mitkrb.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mitkrb.xml	3 Jul 2004 15:33:51 -0000	1.2
  +++ mitkrb.xml	4 Jul 2004 03:59:33 -0000	1.3
  @@ -67,6 +67,14 @@
         <name>/usr/lib</name>
       </link>
       &ldconfig;
  +  </stage>
  +  <stage name="Installing bootscript and configuration">
  +    <stageinfo>
  +      <base>&build_dir;/&blfs-bootscripts-directory;</base>
  +    </stageinfo>
  +    <make>
  +      <param>install-kerberos</param>
  +    </make>
       <textdump base="/etc">
         <file>krb5.conf</file>
         <content>
  @@ -94,14 +102,6 @@
         </content>
       </textdump>
     </stage>
  -  <stage name="Installing bootscript and configuration">
  -    <stageinfo>
  -      <base>&build_dir;/&blfs-bootscripts-directory;</base>
  -    </stageinfo>
  -    <make>
  -      <param>install-kerberos</param>
  -    </make>
  -  </stage>
     <stage name="Cleanup.">
       <remove>&build_dir;/&mitkrb-directory;</remove>
       <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
  
  
  
  1.7       +51 -37    ALFS/profiles/BLFS/chapter04/shadow.xml
  
  Index: shadow.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/shadow.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- shadow.xml	3 Jul 2004 15:33:51 -0000	1.6
  +++ shadow.xml	4 Jul 2004 03:59:33 -0000	1.7
  @@ -11,7 +11,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing">
  +	<stage name="Patching">
   		<stageinfo>
   			<base>&build_dir;/&shadow-directory;</base>
   		</stageinfo>
  @@ -22,6 +22,13 @@
   			<param>-i &packages_dir;/&shadow-pam-patch;</param>
   		</patch>
   
  +	</stage>
  +
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&shadow-directory;</base>
  +		</stageinfo>
  +
   		<configure>
   			<prefix>LIBS="-lpam -lpam_misc"</prefix>
   			<param>--libdir=/usr/lib</param>
  @@ -71,8 +78,15 @@
   		</link>
   
   
  -		<textdump base="/etc/pam.d">
  -		       <file>login</file>
  +	</stage>
  +
  +	<stage name="Configuring">
  +		<stageinfo>
  +			<base>/etc</base>
  +		</stageinfo>
  +
  +		<textdump>
  +		       <file>pam.d/login</file>
   		       <content>
                              =# Begin /etc/pam.d/login
                              =
  @@ -93,8 +107,8 @@
   		</textdump>
   
   
  -		<textdump base="/etc/pam.d">
  -		       <file>passwd</file>
  +		<textdump>
  +		       <file>pam.d/passwd</file>
   		       <content>
                              =# Begin /etc/pam.d/passwd
                              =
  @@ -104,8 +118,8 @@
   		       </content>
   		</textdump>
   
  -		<textdump base="/etc/pam.d">
  -		       <file>shadow</file>
  +		<textdump>
  +		       <file>pam.d/shadow</file>
   		       <content>
                              =# Begin /etc/pam.d/shadow
                              =
  @@ -119,8 +133,8 @@
   		       </content>
   		</textdump>
   
  -		<textdump base="/etc/pam.d">
  -		       <file>su</file>
  +		<textdump>
  +		       <file>pam.d/su</file>
   		       <content>
                              =# Begin /etc/pam.d/su
                              =
  @@ -133,8 +147,8 @@
   		       </content>
   		</textdump>
   
  -		<textdump base="/etc/pam.d">
  -		       <file>useradd</file>
  +		<textdump>
  +		       <file>pam.d/useradd</file>
   		       <content>
                              =# Begin /etc/pam.d/useradd
                              =
  @@ -148,8 +162,8 @@
   		       </content>
   		</textdump>
   
  -		<textdump base="/etc/pam.d">
  -		       <file>chage</file>
  +		<textdump>
  +		       <file>pam.d/chage</file>
   		       <content>
                              =# Begin /etc/pam.d/chage
                              =
  @@ -166,8 +180,8 @@
   <!--
     uncomment after checking PAM for proper configuration
   
  -		<textdump base="/etc/pam.d">
  -		       <file>other</file>
  +		<textdump>
  +		       <file>pam.d/other</file>
   		       <content>
                              =# Begin /etc/pam.d/other
                              =
  @@ -184,68 +198,68 @@
   -->
   
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>LASTLOG_ENAB</find>
   			<replace>#LASTLOG_ENAB</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>MAIL_CHECK_ENAB</find>
   			<replace>#MAIL_CHECK_ENAB</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>PORTTIME_CHECKS_ENAB</find>
   			<replace>#PORTTIME_CHECKS_ENAB</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>CONSOLE</find>
   			<replace>#CONSOLE</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>MOTD_FILE</find>
   			<replace>#MOTD_FILE</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>NOLOGINS_FILE</find>
   			<replace>#NOLOGINS_FILE</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>PASS_MIN_LEN</find>
   			<replace>#PASS_MIN_LEN</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>SU_WHEEL_ONLY</find>
   			<replace>#SU_WHEEL_ONLY</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>MD5_CRYPT_ENAB</find>
   			<replace>#MD5_CRYPT_ENAB</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>CONSOLE_GROUPS</find>
   			<replace>#CONSOLE_GROUPS</replace>
   		</search_replace>
   
  -		<search_replace base="/etc">
  -		        <file>/etc/login.defs</file>
  +		<search_replace>
  +		        <file>login.defs</file>
   			<find>ENVIRON_FILE</find>
   			<replace>#ENVIRON_FILE</replace>
   		</search_replace>
  
  
  
  1.4       +19 -14    ALFS/profiles/BLFS/chapter04/tripwire.xml
  
  Index: tripwire.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/tripwire.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tripwire.xml	3 Jul 2004 20:45:30 -0000	1.3
  +++ tripwire.xml	4 Jul 2004 03:59:33 -0000	1.4
  @@ -5,12 +5,6 @@
   			<archive>&packages_dir;/&tripwire-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&tripwire-policy-file;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
   	</stage>
   
   	<stage name="Installing">
  @@ -23,7 +17,13 @@
   			<param>-p1</param>
   			<param>-i &packages_dir;/&tripwire-gcc-patch;</param>
   		</patch>
  +	</stage>
   
  +	<stage name="Installing">
  +		<stageinfo>
  +			<base>&build_dir;/&tripwire-directory;</base>
  +		</stageinfo>
  +	
   		<make>
   			<param>-C</param>
   			<param>src</param>
  @@ -76,19 +76,26 @@
   			<param>-s "&tripwire-sitepassphrase;"</param>
   			<param>-l "&tripwire-localpassphrase;"</param>
   		</execute>
  -	
  -		<copy>
  -			<source>/etc/tripwire/tw.cfg</source>
  -			<destination>/usr/sbin</destination>
  -		</copy>
   
   		<copy>
   			<source>policy/*.txt</source>
   			<destination>/usr/share/doc/tripwire</destination>
   		</copy>
   
  +	</stage>
  +
  +	<stage name="Configuring">
  +		<stageinfo>
  +			<base>&build_dir;/&tripwire-directory;</base>
  +		</stageinfo>
  +	
  +		<copy>
  +			<source>/etc/tripwire/tw.cfg</source>
  +			<destination>/usr/sbin</destination>
  +		</copy>
  +
   		<copy>
  -			<source>&build_dir;/&tripwire-policy-file;</source>
  +			<source>&packages_dir;/&tripwire-policy-file;</source>
   			<destination>/etc/tripwire</destination>
   		</copy>
   
  @@ -102,13 +109,11 @@
   			<param>-m i</param>
   			<param>-P &tripwire-localpassphrase;</param>
   		</execute>
  -
   	</stage>
   
   
   	<stage name="Clean-Up">
   		<remove>&build_dir;/&tripwire-package;</remove>
  -		<remove>&build_dir;/&tripwire-policy-file;</remove>
   	</stage>
   
   </package>
  
  
  



More information about the alfs-log mailing list