r1452 - in profiles/BLFS/trunk: chapter04 chapter05 tools

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Jul 14 13:35:59 PDT 2004


Author: thomasp
Date: 2004-07-14 14:35:57 -0600 (Wed, 14 Jul 2004)
New Revision: 1452

Modified:
   profiles/BLFS/trunk/chapter04/cracklib.xml
   profiles/BLFS/trunk/chapter04/gnupg.xml
   profiles/BLFS/trunk/chapter04/heimdal.xml
   profiles/BLFS/trunk/chapter04/iptables.xml
   profiles/BLFS/trunk/chapter04/linuxpam.xml
   profiles/BLFS/trunk/chapter04/mitkrb.xml
   profiles/BLFS/trunk/chapter04/shadow.xml
   profiles/BLFS/trunk/chapter04/tripwire.xml
   profiles/BLFS/trunk/chapter05/reiserfsutils.xml
   profiles/BLFS/trunk/chapter05/xfsprogs.xml
   profiles/BLFS/trunk/tools/tidy.conf
   profiles/BLFS/trunk/tools/tidyxml.sh
Log:
tidied chapters 4 and 5

Modified: profiles/BLFS/trunk/chapter04/cracklib.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cracklib.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/cracklib.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,81 +10,63 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="cracklib" version="&cracklib-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&cracklib-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&cracklib-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/usr/share/dict</name>
-		</mkdir>
-
-		<permissions mode="755">
-			<name>/usr/share/dict</name>
-		</permissions>
-
-		<copy>
-		        <source>&packages_dir;/&cracklib-wordlist;</source>
-			<destination>/usr/share/dict</destination>
-		</copy>
-
-		<permissions mode="644">
-			<name>/usr/share/dict/&cracklib-wordlist;</name>
-		</permissions>
-
-		<link base="/usr/share/dict">
-		        <option>force</option>
-		        <target>&cracklib-wordlist;</target>
-			<name>words</name>
-		</link>
-
-
-		<execute command="echo">
-			<param>$(hostname)</param>
-			<param>>></param>
-			<param>/usr/share/dict/extra.words</param>
-		</execute>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&cracklib-blfs-patch;</param>
-		</patch>
-
-		<copy>
-			<option>recursive</option>
-			<source>cracklib</source>
-			<destination>cracklib_krb5</destination>
-		</copy>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&cracklib-heimdal-patch;</param>
-		</patch>
-
-		<make>
-			<param>install</param>
-		</make>
-
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&cracklib-directory;</remove>
-	</stage>
-
-</package>
+  <package name="cracklib" version="&cracklib-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&cracklib-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&cracklib-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/share/dict</name>
+      </mkdir>
+      <permissions mode="755">
+        <name>/usr/share/dict</name>
+      </permissions>
+      <copy>
+        <source>&packages_dir;/&cracklib-wordlist;</source>
+        <destination>/usr/share/dict</destination>
+      </copy>
+      <permissions mode="644">
+        <name>/usr/share/dict/&cracklib-wordlist;</name>
+      </permissions>
+      <link base="/usr/share/dict">
+        <option>force</option>
+        <target>&cracklib-wordlist;</target>
+        <name>words</name>
+      </link>
+      <execute command="echo">
+        <param>$(hostname)</param>
+        <param>>></param>
+        <param>/usr/share/dict/extra.words</param>
+      </execute>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&cracklib-blfs-patch;</param>
+      </patch>
+      <copy>
+        <option>recursive</option>
+        <source>cracklib</source>
+        <destination>cracklib_krb5</destination>
+      </copy>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&cracklib-heimdal-patch;</param>
+      </patch>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&cracklib-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/gnupg.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/gnupg.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/gnupg.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,46 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="gnupg" version="&gnupg-version;">
-
-	<packageinfo>
-		<utilizes><name>openldap</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&gnupg-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&gnupg-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<permissions mode="4755">
-		         <name>/usr/bin/gpg</name>
-		</permissions>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&gnupg-directory;</remove>
-	</stage>
-
-</package>
+  <package name="gnupg" version="&gnupg-version;">
+    <packageinfo>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&gnupg-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&gnupg-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="4755">
+        <name>/usr/bin/gpg</name>
+      </permissions>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&gnupg-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/heimdal.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/heimdal.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/heimdal.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -151,28 +151,28 @@
     <textdump base="/etc/heimdal">
       <file>krb5.conf</file>
       <content>
-      =# Begin /etc/heimdal/krb5.conf
-      =  
-      =[libdefaults]
-      =    default_realm = &heimdal-all-caps-domain;
-      =    encrypt = true
-      =
-      =[realms]
-      =    &heimdal-all-caps-domain; = {
-      =        kdc = &heimdal-hostname;
-      =        admin_server = &heimdal-hostname;
-      =        kpasswd_server = &heimdal-hostname;
-      =    }
-      =
-      =[domain_realm]
-      =    .&heimdal-domain; = &heimdal-all-caps-domain;
-      =
-      =[logging]
-      =    kdc = FILE:/var/log/kdc.log
-      =    admin_server = FILE:/var/log/kadmin.log
-      =    default = FILE:/var/log/krb.log
-      =
-      =# End /etc/heimdal/krb5.conf
+	=# Begin /etc/heimdal/krb5.conf
+	=  
+	=[libdefaults]
+	=    default_realm = &heimdal-all-caps-domain;
+	=    encrypt = true
+	=
+	=[realms]
+	=    &heimdal-all-caps-domain; = {
+	=        kdc = &heimdal-hostname;
+	=        admin_server = &heimdal-hostname;
+	=        kpasswd_server = &heimdal-hostname;
+	=    }
+	=
+	=[domain_realm]
+	=    .&heimdal-domain; = &heimdal-all-caps-domain;
+	=
+	=[logging]
+	=    kdc = FILE:/var/log/kdc.log
+	=    admin_server = FILE:/var/log/kadmin.log
+	=    default = FILE:/var/log/krb.log
+	=
+	=# End /etc/heimdal/krb5.conf
       </content>
     </textdump>
     <!-- all other configuration concerning heimdal must be done manually -->

Modified: profiles/BLFS/trunk/chapter04/iptables.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/iptables.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/iptables.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,133 +10,116 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="iptables" version="&iptables-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&iptables-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&iptables-directory;</base>
-		</stageinfo>
-
-		<make>
-		        <param>PREFIX=/usr</param>
-			<param>LIBDIR=/usr</param>
-			<param>BINDIR=/sbin</param>
-		</make>
-
-		<make>
-		        <param>PREFIX=/usr</param>
-			<param>LIBDIR=/usr</param>
-			<param>BINDIR=/sbin</param>
-			<param>install</param>
-		</make>
-
-
-	</stage>
-
-	<stage name="Configuring">
-	<!-- setup for personal firewall -->
-	<!-- other setups are available in the book -->
-
-		<textdump base="/etc/rc.d/init.d">
-			<file>firewall</file>
-			<content>
-			=#!/bin/sh
-			=
-			=# Begin $rc_base/init.d/firewall
-			=
-			=# Insert connection-tracking modules (not needed if built into the kernel).
-			=modprobe ip_tables
-			=modprobe iptable_filter
-			=modprobe ip_conntrack
-			=modprobe ip_conntrack_ftp
-			=modprobe ipt_state
-			=modprobe ipt_LOG
-			=
-			=# allow local-only connections
-			=iptables -A INPUT  -i lo -j ACCEPT
-			=# free output on any interface to any ip for any service (equal to -P ACCEPT)
-			=iptables -A OUTPUT -j ACCEPT
-			=
-			=# permit answers on already established connections
-			=# and permit new connections related to established ones (eg active-ftp)
-			=iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
-			=
-			=# Log everything else:  What's Windows' latest exploitable vulnerability?
-			=iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
-			=
-			=# set a sane policy:    everything not accepted > /dev/null
-			=iptables -P INPUT    DROP
-			=iptables -P FORWARD  DROP
-			=iptables -P OUTPUT   DROP
-			=
-			=# be verbose on dynamic ip-addresses     (not needed in case of static IP)
-			=echo 2 > /proc/sys/net/ipv4/ip_dynaddr
-			=
-			=# disable ExplicitCongestionNotification - too many routers are still ignorant
-			=echo 0 > /proc/sys/net/ipv4/tcp_ecn
-			=
-			=# End $rc_base/init.d/firewall
-			</content>
-		</textdump>
-
-		<textdump base="/etc/rc.d/init.d">
-			<file>firewall.status</file>
-			<content>
-			=#!/bin/sh
-			=
-			=# Begin $rc_base/init.d/firewall.status
-			=
-			=echo "iptables.mangling:"
-			=iptables -t mangle  -v -L -n --line-numbers
-			=
-			=echo
-			=echo "iptables.nat:"
-			=iptables -t nat	    -v -L -n --line-numbers
-			=
-			=echo
-			=echo "iptables.filter:"
-			=iptables	    -v -L -n --line-numbers
-			</content>
-		</textdump>
-
-		<textdump base="/etc/rc.d/init.d">
-			<file>firewall.stop</file>
-			<content>
-			=#!/bin/sh
-			=
-			=# Being $rc_base/init.d/firewall.stop
-			=
-			=# deactivate IP-Forwarding 
-			=echo 0 > /proc/sys/net/ipv4/ip_forward
-			=
-			=iptables -Z
-			=iptables -F
-			=iptables -t nat         -F PREROUTING
-			=iptables -t nat         -F OUTPUT
-			=iptables -t nat         -F POSTROUTING
-			=iptables -t mangle      -F PREROUTING
-			=iptables -t mangle      -F OUTPUT
-			=iptables -X
-			=iptables -P INPUT       ACCEPT
-			=iptables -P FORWARD     ACCEPT
-			=iptables -P OUTPUT      ACCEPT
-			</content>
-		</textdump>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&iptables-directory;</remove>
-	</stage>
-
-</package>
+  <package name="iptables" version="&iptables-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&iptables-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&iptables-directory;</base>
+      </stageinfo>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>LIBDIR=/usr</param>
+        <param>BINDIR=/sbin</param>
+      </make>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>LIBDIR=/usr</param>
+        <param>BINDIR=/sbin</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Configuring">
+      <!-- setup for personal firewall -->
+      <!-- other setups are available in the book -->
+      <textdump base="/etc/rc.d/init.d">
+        <file>firewall</file>
+        <content>
+	  =#!/bin/sh
+	  =
+	  =# Begin $rc_base/init.d/firewall
+	  =
+	  =# Insert connection-tracking modules (not needed if built into the kernel).
+	  =modprobe ip_tables
+	  =modprobe iptable_filter
+	  =modprobe ip_conntrack
+	  =modprobe ip_conntrack_ftp
+	  =modprobe ipt_state
+	  =modprobe ipt_LOG
+	  =
+	  =# allow local-only connections
+	  =iptables -A INPUT -i lo -j ACCEPT
+	  =# free output on any interface to any ip for any service (equal to -P ACCEPT)
+	  =iptables -A OUTPUT -j ACCEPT
+	  =
+	  =# permit answers on already established connections
+	  =# and permit new connections related to established ones (eg active-ftp)
+	  =iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+	  =
+	  =# Log everything else: What's Windows' latest exploitable vulnerability?
+	  =iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
+	  =
+	  =# set a sane policy: everything not accepted > /dev/null
+	  =iptables -P INPUT DROP =iptables -P FORWARD DROP =iptables -P OUTPUT DROP
+	  =
+	  =# be verbose on dynamic ip-addresses (not needed in case of static IP
+	  =echo 2 > /proc/sys/net/ipv4/ip_dynaddr
+	  =
+	  =# disable ExplicitCongestionNotification - too many routers are still ignorant
+	  =echo 0 > /proc/sys/net/ipv4/tcp_ecn
+	  =
+	  =# End $rc_base/init.d/firewall
+	</content>
+      </textdump>
+      <textdump base="/etc/rc.d/init.d">
+        <file>firewall.status</file>
+        <content>
+	  =#!/bin/sh
+	  =
+	  =# Begin $rc_base/init.d/firewall.status
+	  =
+	  =echo "iptables.mangling:"
+	  =iptables -t mangle -v -L -n --line-numbers
+	  =
+	  =echo
+	  =echo "iptables.nat:"
+	  =iptables -t nat -v -L -n --line-numbers
+	  =
+	  =echo
+	  =echo "iptables.filter:"
+	  =iptables -v -L -n --line-numbers
+	</content>
+      </textdump>
+      <textdump base="/etc/rc.d/init.d">
+        <file>firewall.stop</file>
+        <content>
+	  =#!/bin/sh
+	  =
+	  =# Being $rc_base/init.d/firewall.stop
+	  =
+	  =# deactivate IP-Forwarding
+	  =echo 0 > /proc/sys/net/ipv4/ip_forward
+	  =
+	  =iptables -Z =iptables -F
+	  =iptables -t nat -F PREROUTING
+	  =iptables -t nat -F OUTPUT
+	  =iptables -t nat -F POSTROUTING
+	  =iptables -t mangle -F PREROUTING
+	  =iptables -t mangle -F OUTPUT
+	  =iptables -X
+	  =iptables -P INPUT ACCEPT
+	  =iptables -P FORWARD ACCEPT
+	  =iptables -P OUTPUT ACCEPT
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&iptables-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/linuxpam.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/linuxpam.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/linuxpam.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,124 +10,100 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="linuxpam" version="&linuxpam-version;">
-
-        <packageinfo>
-                <utilizes><name>cracklib</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&linuxpam-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&linuxpam-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<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>
-		        <param>--enable-static-libpam</param>
-		        <param>--with-mailspool=/var/mail</param>
-		        <param>--enable-read-both-confs</param>
-		        <param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-		        <source>/lib/libpam.a</source>
-			<source>/lib/libpam_misc.a</source>
-			<source>/lib/libpamc.a</source>
-			<destination>/usr/lib</destination>
-		</move>
-
-
-		<link>
-		        <option>force</option>
-			<target>../../lib/libpam.so.&linuxpam-version;</target>
-			<name>/usr/lib/libpam.so</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>../../lib/libpam_misc.so.&linuxpam-version;</target>
-			<name>/usr/lib/libpam_misc.so</name>
-		</link>
-
-		<link>
-		        <option>force</option>
-			<target>../../lib/libpamc.so.&linuxpam-version;</target>
-			<name>/usr/lib/libpamc.so</name>
-		</link>
-
-		<mkdir>
-		       <option>parents</option>
-		       <name>/etc/pam.d</name>
-		</mkdir>
-
-	</stage>
-
-	<stage name="Configuring">
-		<textdump base="/etc/pam.d">
-		        <file>other</file>
-
-			<content>
-			        =# Begin /etc/pam.d/other
-				=
-				=auth            required        pam_unix.so     nullok
-				=account         required        pam_unix.so
-				=session         required        pam_unix.so
-				=password        required        pam_unix.so     nullok
-				=
-				=# End /etc/pam.d/other
-			</content>
-		</textdump>
-
-		<textdump base="/etc">
-		        <file>pam.conf</file>
-
-			<content>
-			=# Begin /etc/pam.conf
-			=
-			=other           auth            required        pam_unix.so     nullok
-			=other           account         required        pam_unix.so
-			=other           session         required        pam_unix.so
-			=other           password        required        pam_unix.so     nullok
-			=
-			=# End /etc/pam.conf
-			</content>
-		</textdump>
-
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&linuxpam-directory;</remove>
-	</stage>
-
-</package>
+  <package name="linuxpam" version="&linuxpam-version;">
+    <packageinfo>
+      <utilizes>
+        <name>cracklib</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&linuxpam-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&linuxpam-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <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>
+        <param>--enable-static-libpam</param>
+        <param>--with-mailspool=/var/mail</param>
+        <param>--enable-read-both-confs</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/lib/libpam.a</source>
+        <source>/lib/libpam_misc.a</source>
+        <source>/lib/libpamc.a</source>
+        <destination>/usr/lib</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>../../lib/libpam.so.&linuxpam-version;</target>
+        <name>/usr/lib/libpam.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../../lib/libpam_misc.so.&linuxpam-version;</target>
+        <name>/usr/lib/libpam_misc.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../../lib/libpamc.so.&linuxpam-version;</target>
+        <name>/usr/lib/libpamc.so</name>
+      </link>
+      <mkdir>
+        <option>parents</option>
+        <name>/etc/pam.d</name>
+      </mkdir>
+    </stage>
+    <stage name="Configuring">
+      <textdump base="/etc/pam.d">
+        <file>other</file>
+        <content>
+	  =# Begin /etc/pam.d/other
+	  =
+	  =auth required pam_unix.so nullok
+	  =account required pam_unix.so
+	  =session required pam_unix.so
+	  =password required pam_unix.so nullok
+	  =
+	  =# End /etc/pam.d/other
+	</content>
+      </textdump>
+      <textdump base="/etc">
+        <file>pam.conf</file>
+        <content>
+	  =# Begin /etc/pam.conf
+	  =
+	  =other auth required pam_unix.so nullok
+	  =other account required pam_unix.so
+	  =other session required pam_unix.so
+	  =other password required pam_unix.so nullok
+	  =
+	  =# End /etc/pam.conf
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&linuxpam-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/mitkrb.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/mitkrb.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/mitkrb.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -90,27 +90,27 @@
     <textdump base="/etc">
       <file>krb5.conf</file>
       <content>
-      =# Begin /etc/krb5.conf
-      =  
-      =[libdefaults]
-      =    default_realm = &mitkrb-all-caps-domain;
-      =    encrypt = true
-      =
-      =[realms]
-      =    &mitkrb-all-caps-domain; = {
-      =        kdc = &mitkrb-hostname;
-      =        admin_server = &mitkrb-hostname;
-      =    }
-      =
-      =[domain_realm]
-      =    .&mitkrb-domain; = &mitkrb-all-caps-domain;
-      =
-      =[logging]
-      =    kdc = SYSLOG[:INFO[:AUTH]]
-      =    admin_server = SYSLOG[INFO[:AUTH]]
-      =    default = SYSLOG[[:SYS]]
-      =
-      =# End /etc/krb5.conf
+	=# Begin /etc/krb5.conf
+	=  
+	=[libdefaults]
+	=    default_realm = &mitkrb-all-caps-domain;
+	=    encrypt = true
+	=
+	=[realms]
+	=    &mitkrb-all-caps-domain; = {
+	=        kdc = &mitkrb-hostname;
+	=        admin_server = &mitkrb-hostname;
+	=    }
+	=
+	=[domain_realm]
+	=    .&mitkrb-domain; = &mitkrb-all-caps-domain;
+	=
+	=[logging]
+	=    kdc = SYSLOG[:INFO[:AUTH]]
+	=    admin_server = SYSLOG[INFO[:AUTH]]
+	=    default = SYSLOG[[:SYS]]
+	=
+	=# End /etc/krb5.conf
       </content>
     </textdump>
   </stage>

Modified: profiles/BLFS/trunk/chapter04/shadow.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/shadow.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/shadow.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,277 +10,235 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="shadow" version="&shadow-version;">
-
-        <packageinfo>
-	        <requires><name>linuxpam</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&shadow-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&shadow-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<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>
-			<param>--enable-shared</param>
-			<param>--with-libpam</param>
-			<param>--without-libcrack</param>
-		</configure>
-
-		<textdump mode="append">
-			<file>config.h</file>
-			<content>
-			=#define HAVE_SETLOCALE 1
-			</content>
-		</textdump>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<move>
-			<source>/bin/sg</source>
-			<destination>/usr/bin</destination>
-		</move>
-
-		<move>
-			<source>/bin/vigr</source>
-			<destination>/usr/sbin</destination>
-		</move>
-
-		<move>
-		        <source>/usr/lib/lib{misc,shadow}.so.0*</source>
-			<destination>/lib</destination>
-		</move>
-
-		<link>
-		       <option>force</option>
-		       <target>../../lib/libshadow.so.0</target>
-		       <name>/usr/lib/libshadow.so</name>
-		</link>
-
-		<link>
-		       <option>force</option>
-		       <target>../../lib/libmisc.so.0</target>
-		       <name>/usr/lib/libmisc.so</name>
-		</link>
-
-
-	</stage>
-
-	<stage name="Configuring">
-		<stageinfo>
-			<base>/etc</base>
-		</stageinfo>
-
-		<textdump>
-		       <file>pam.d/login</file>
-		       <content>
-                           =# Begin /etc/pam.d/login
-                           =
-                           =auth        requisite      pam_securetty.so
-                           =auth        requisite      pam_nologin.so
-                           =auth        required       pam_env.so
-                           =auth        required       pam_unix.so
-                           =account     required       pam_access.so
-                           =account     required       pam_unix.so
-                           =session     required       pam_motd.so
-                           =session     required       pam_limits.so
-                           =session     optional       pam_mail.so     dir=/var/mail standard
-                           =session     optional       pam_lastlog.so
-                           =session     required       pam_unix.so
-                           =
-                           =# End /etc/pam.d/login
-		       </content>
-		</textdump>
-
-
-		<textdump>
-		       <file>pam.d/passwd</file>
-		       <content>
-                           =# Begin /etc/pam.d/passwd
-                           =
-                           =password    required       pam_unix.so     md5 shadow 
-                           =
-                           =# End /etc/pam.d/passwd
-		       </content>
-		</textdump>
-
-		<textdump>
-		       <file>pam.d/shadow</file>
-		       <content>
-                           =# Begin /etc/pam.d/shadow
-                           =
-                           =auth        sufficient      pam_rootok.so
-                           =auth        required        pam_unix.so
-                           =account     required        pam_unix.so
-                           =session     required        pam_unix.so
-                           =password    required        pam_permit.so
-                           =
-                           =# End /etc/pam.d/shadow
-		       </content>
-		</textdump>
-
-		<textdump>
-		       <file>pam.d/su</file>
-		       <content>
-                           =# Begin /etc/pam.d/su
-                           =
-                           =auth        sufficient      pam_rootok.so
-                           =auth        required        pam_unix.so
-                           =account     required        pam_unix.so
-                           =session     required        pam_unix.so
-                           =
-                           =# End /etc/pam.d/su
-		       </content>
-		</textdump>
-
-		<textdump>
-		       <file>pam.d/useradd</file>
-		       <content>
-                           =# Begin /etc/pam.d/useradd
-                           =
-                           =auth        sufficient      pam_rootok.so
-                           =auth        required        pam_unix.so
-                           =account     required        pam_unix.so
-                           =session     required        pam_unix.so
-                           =password    required        pam_permit.so
-                           =
-                           =# End /etc/pam.d/useradd
-		       </content>
-		</textdump>
-
-		<textdump>
-		       <file>pam.d/chage</file>
-		       <content>
-                           =# Begin /etc/pam.d/chage
-                           =
-                           =auth        sufficient      pam_rootok.so
-                           =auth        required        pam_unix.so
-                           =account     required        pam_unix.so
-                           =session     required        pam_unix.so
-                           =password    required        pam_permit.so
-                           =
-                           =# End /etc/pam.d/chage
-		       </content>
-		</textdump>
-
-<!--
+  <package name="shadow" version="&shadow-version;">
+    <packageinfo>
+      <requires>
+        <name>linuxpam</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&shadow-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&shadow-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <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>
+        <param>--enable-shared</param>
+        <param>--with-libpam</param>
+        <param>--without-libcrack</param>
+      </configure>
+      <textdump mode="append">
+        <file>config.h</file>
+        <content>=#define HAVE_SETLOCALE 1</content>
+      </textdump>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <move>
+        <source>/bin/sg</source>
+        <destination>/usr/bin</destination>
+      </move>
+      <move>
+        <source>/bin/vigr</source>
+        <destination>/usr/sbin</destination>
+      </move>
+      <move>
+        <source>/usr/lib/lib{misc,shadow}.so.0*</source>
+        <destination>/lib</destination>
+      </move>
+      <link>
+        <option>force</option>
+        <target>../../lib/libshadow.so.0</target>
+        <name>/usr/lib/libshadow.so</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>../../lib/libmisc.so.0</target>
+        <name>/usr/lib/libmisc.so</name>
+      </link>
+    </stage>
+    <stage name="Configuring">
+      <stageinfo>
+        <base>/etc</base>
+      </stageinfo>
+      <textdump>
+        <file>pam.d/login</file>
+        <content>
+	  =# Begin /etc/pam.d/login
+	  =
+	  =auth		requisite 	pam_securetty.so
+	  =auth 	requisite 	pam_nologin.so
+	  =auth 	required 	pam_env.so
+	  =auth 	required 	pam_unix.so
+	  =account 	required 	pam_access.so
+	  =account 	required 	pam_unix.so
+	  =session 	required 	pam_motd.so
+	  =session 	required 	pam_limits.so
+	  =session 	optional 	pam_mail.so	dir=/var/mail standard
+	  =session 	optional 	pam_lastlog.so
+	  =session 	required 	pam_unix.so
+	  =
+	  =# End /etc/pam.d/login
+	</content>
+      </textdump>
+      <textdump>
+        <file>pam.d/passwd</file>
+        <content>
+	  =# Begin /etc/pam.d/passwd
+	  =
+	  =password 	required 	pam_unix.so 	md5 shadow
+	  =
+	  =# End /etc/pam.d/passwd
+	</content>
+      </textdump>
+      <textdump>
+        <file>pam.d/shadow</file>
+        <content>
+	  =# Begin /etc/pam.d/shadow
+	  =
+	  =auth 	sufficient 	pam_rootok.so
+	  =auth 	required 	pam_unix.so
+	  =account 	required 	pam_unix.so
+	  =session 	required 	pam_unix.so
+	  =password 	required 	pam_permit.so
+	  =
+	  =# End /etc/pam.d/shadow
+	</content>
+      </textdump>
+      <textdump>
+        <file>pam.d/su</file>
+        <content>
+	  =# Begin /etc/pam.d/su
+	  =
+	  =auth 	sufficient 	pam_rootok.so
+	  =auth 	required 	pam_unix.so
+	  =account 	required 	pam_unix.so
+	  =session 	required 	pam_unix.so
+	  =
+	  =# End /etc/pam.d/su</content>
+      </textdump>
+      <textdump>
+        <file>pam.d/useradd</file>
+        <content>
+	  =# Begin /etc/pam.d/useradd
+	  =
+	  =auth 	sufficient 	pam_rootok.so
+	  =auth 	required 	pam_unix.so
+	  =account 	required 	pam_unix.so
+	  =session 	required 	pam_unix.so
+	  =password	required 	pam_permit.so
+	  =
+	  =# End /etc/pam.d/useradd
+	</content>
+      </textdump>
+      <textdump>
+        <file>pam.d/chage</file>
+        <content>
+	  =# Begin /etc/pam.d/chage
+	  =
+	  =auth 	sufficient 	pam_rootok.so
+	  =auth 	required 	pam_unix.so
+	  =account 	required 	pam_unix.so
+	  =session 	required 	pam_unix.so
+	  =password 	required 	pam_permit.so
+	  =
+	  =# End /etc/pam.d/chage
+	</content>
+      </textdump>
+      <!--
   uncomment after checking PAM for proper configuration
-
-		<textdump>
-		       <file>pam.d/other</file>
-		       <content>
-                           =# Begin /etc/pam.d/other
-                           =
-                           =auth        required        pam_deny.so
-                           =auth        required        pam_warn.so
-                           =account     required        pam_deny.so
-                           =session     required        pam_deny.so
-                           =password    required        pam_deny.so
-                           =password    required        pam_warn.so
-                           =
-                           =# End /etc/pam.d/other
-		       </content>
-		</textdump>
+      <textdump>
+	<file>pam.d/other</file>
+	<content>
+	  =# Begin /etc/pam.d/other
+	  =
+	  =auth        	required        pam_deny.so
+	  =auth        	required        pam_warn.so
+	  =account     	required        pam_deny.so
+	  =session     	required        pam_deny.so
+	  =password    	required        pam_deny.so
+	  =password    	required        pam_warn.so
+	  =
+	  =# End /etc/pam.d/other
+	</content>
+      </textdump>
 -->
-
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>LASTLOG_ENAB</find>
-			<replace>#LASTLOG_ENAB</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>MAIL_CHECK_ENAB</find>
-			<replace>#MAIL_CHECK_ENAB</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>PORTTIME_CHECKS_ENAB</find>
-			<replace>#PORTTIME_CHECKS_ENAB</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>CONSOLE</find>
-			<replace>#CONSOLE</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>MOTD_FILE</find>
-			<replace>#MOTD_FILE</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>NOLOGINS_FILE</find>
-			<replace>#NOLOGINS_FILE</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>PASS_MIN_LEN</find>
-			<replace>#PASS_MIN_LEN</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>SU_WHEEL_ONLY</find>
-			<replace>#SU_WHEEL_ONLY</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>MD5_CRYPT_ENAB</find>
-			<replace>#MD5_CRYPT_ENAB</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>CONSOLE_GROUPS</find>
-			<replace>#CONSOLE_GROUPS</replace>
-		</search_replace>
-
-		<search_replace>
-		        <file>login.defs</file>
-			<find>ENVIRON_FILE</find>
-			<replace>#ENVIRON_FILE</replace>
-		</search_replace>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&shadow-directory;</remove>
-	</stage>
-</package>
+      <search_replace>
+        <file>login.defs</file>
+        <find>LASTLOG_ENAB</find>
+        <replace>#LASTLOG_ENAB</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>MAIL_CHECK_ENAB</find>
+        <replace>#MAIL_CHECK_ENAB</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>PORTTIME_CHECKS_ENAB</find>
+        <replace>#PORTTIME_CHECKS_ENAB</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>CONSOLE</find>
+        <replace>#CONSOLE</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>MOTD_FILE</find>
+        <replace>#MOTD_FILE</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>NOLOGINS_FILE</find>
+        <replace>#NOLOGINS_FILE</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>PASS_MIN_LEN</find>
+        <replace>#PASS_MIN_LEN</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>SU_WHEEL_ONLY</find>
+        <replace>#SU_WHEEL_ONLY</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>MD5_CRYPT_ENAB</find>
+        <replace>#MD5_CRYPT_ENAB</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>CONSOLE_GROUPS</find>
+        <replace>#CONSOLE_GROUPS</replace>
+      </search_replace>
+      <search_replace>
+        <file>login.defs</file>
+        <find>ENVIRON_FILE</find>
+        <replace>#ENVIRON_FILE</replace>
+      </search_replace>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&shadow-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/tripwire.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/tripwire.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter04/tripwire.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,125 +10,100 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="tripwire" version="&tripwire-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&tripwire-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&tripwire-directory;</base>
-		</stageinfo>
-	
-		<patch>
-			<param>-N</param>
-			<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>
-			<param>release</param>
-		</make>
-
-		<copy>
-			<source>install/install.{sh,cfg}</source>
-			<destination>.</destination>
-		</copy>
-
-		<!--The default configuration is to use a local MTA. If you don't have a MTA
+  <package name="tripwire" version="&tripwire-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&tripwire-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&tripwire-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <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>
+        <param>release</param>
+      </make>
+      <copy>
+        <source>install/install.{sh,cfg}</source>
+        <destination>.</destination>
+      </copy>
+      <!--The default configuration is to use a local MTA. If you don't have a MTA
                 installed and have no wish to install one, modify the install.cfg to use an SMTP server
-		instead.-->
-
-		<!-- the following commands are for automating the build of tripwire, these command are not in the book -->
-
-		<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>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>&packages_dir;/&tripwire-policy-file;</source>
-			<destination>/etc/tripwire</destination>
-		</copy>
-
-		<execute command="twadmin">
-			<param>-m P</param>
-			<param>-Q &tripwire-sitepassphrase;</param>
-			<param>/etc/tripwire/&tripwire-policy-file;</param>
-		</execute>
-
-		<execute command="tripwire">
-			<param>-m i</param>
-			<param>-P &tripwire-localpassphrase;</param>
-		</execute>
-	</stage>
-
-
-	<stage name="Clean-Up">
-		<remove>&build_dir;/&tripwire-package;</remove>
-	</stage>
-
-</package>
+                instead.-->
+      <!-- the following commands are for automating the build of tripwire, these command are not in the book -->
+      <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>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>&packages_dir;/&tripwire-policy-file;</source>
+        <destination>/etc/tripwire</destination>
+      </copy>
+      <execute command="twadmin">
+        <param>-m P</param>
+        <param>-Q &tripwire-sitepassphrase;</param>
+        <param>/etc/tripwire/&tripwire-policy-file;</param>
+      </execute>
+      <execute command="tripwire">
+        <param>-m i</param>
+        <param>-P &tripwire-localpassphrase;</param>
+      </execute>
+    </stage>
+    <stage name="Clean-Up">
+      <remove>&build_dir;/&tripwire-package;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter05/reiserfsutils.xml
===================================================================
--- profiles/BLFS/trunk/chapter05/reiserfsutils.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter05/reiserfsutils.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch05.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,50 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="reiserfsutils" version="&reiserfsutils-version;">
-
+  <package name="reiserfsutils" version="&reiserfsutils-version;">
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&reiserfsutils-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&reiserfsutils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&reiserfsutils-directory;</base>
-	</stageinfo>
-
-	<configure>
-	        <param>--prefix=/usr</param>
-	        <param>--sbindir=/sbin</param>
-	</configure>
-	
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
-	
-	<link>
-	        <option>force</option>
-	        <target>reiserfsck</target>
-		<name>/sbin/fsck.reiserfs</name>
-	</link>
-
-	<link>
-	        <option>force</option>
-	        <target>mkreiserfs</target>
-		<name>/sbin/mkfs.reiserfs</name>
-	</link>
-
+      <stageinfo>
+        <base>&build_dir;/&reiserfsutils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sbindir=/sbin</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <link>
+        <option>force</option>
+        <target>reiserfsck</target>
+        <name>/sbin/fsck.reiserfs</name>
+      </link>
+      <link>
+        <option>force</option>
+        <target>mkreiserfs</target>
+        <name>/sbin/mkfs.reiserfs</name>
+      </link>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&reiserfsutils-directory;</remove>
+      <remove>&build_dir;/&reiserfsutils-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter05/xfsprogs.xml
===================================================================
--- profiles/BLFS/trunk/chapter05/xfsprogs.xml	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/chapter05/xfsprogs.xml	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch05.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,41 +10,32 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xfsprogs" version="&xfsprogs-version;">
-
+  <package name="xfsprogs" version="&xfsprogs-version;">
     <stage name="Unpacking">
-	<unpack>
-		<archive>&packages_dir;/&xfsprogs-package;</archive>
-		<destination>&build_dir;</destination>
-	</unpack>
+      <unpack>
+        <archive>&packages_dir;/&xfsprogs-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
     </stage>
-
     <!-- If planning to use xfs filesystems, you should patch your kernel to support XFS prior to running
-	this profile -->
-
+        this profile -->
     <stage name="Installing">
-        <stageinfo>
-		<base>&build_dir;/&xfsprogs-directory;</base>
-	</stageinfo>
-
-	<search_replace>
-		<file>Makefile</file>
-		<find>autoconf</find>
-		<replace> </replace>
-	</search_replace>
-
-	<make />
-
-	<make>
-		<param>install</param>
-	</make>
+      <stageinfo>
+        <base>&build_dir;/&xfsprogs-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>Makefile</file>
+        <find>autoconf</find>
+        <replace></replace>
+      </search_replace>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
     </stage>
-
     <stage name="Cleanup">
-	<remove>&build_dir;/&xfsprogs-directory;</remove>
+      <remove>&build_dir;/&xfsprogs-directory;</remove>
     </stage>
-
-</package>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/tools/tidy.conf
===================================================================
--- profiles/BLFS/trunk/tools/tidy.conf	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/tools/tidy.conf	2004-07-14 20:35:57 UTC (rev 1452)
@@ -4,6 +4,6 @@
 write-back: true
 add-xml-decl: true
 tidy-mark: false
-vertical-space: 1
+vertical-space: true
 output-encoding: latin1
 literal-attributes: true

Modified: profiles/BLFS/trunk/tools/tidyxml.sh
===================================================================
--- profiles/BLFS/trunk/tools/tidyxml.sh	2004-07-13 18:36:52 UTC (rev 1451)
+++ profiles/BLFS/trunk/tools/tidyxml.sh	2004-07-14 20:35:57 UTC (rev 1452)
@@ -1,3 +1,4 @@
 cp $1 $1.bak
 tidy -config ../tools/tidy.conf $1
 sed -i 's/\&/\&/g' $1
+rm $1.bak




More information about the alfs-log mailing list