r1466 - in profiles/BLFS/trunk: chapter22 chapter23 chapter24

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Jul 18 17:06:49 PDT 2004


Author: thomasp
Date: 2004-07-18 18:06:47 -0600 (Sun, 18 Jul 2004)
New Revision: 1466

Modified:
   profiles/BLFS/trunk/chapter22/bind.xml
   profiles/BLFS/trunk/chapter22/dhcp.xml
   profiles/BLFS/trunk/chapter22/leafnode.xml
   profiles/BLFS/trunk/chapter22/openldap.xml
   profiles/BLFS/trunk/chapter22/openssh.xml
   profiles/BLFS/trunk/chapter22/rsync.xml
   profiles/BLFS/trunk/chapter22/samba.xml
   profiles/BLFS/trunk/chapter22/xinetd.xml
   profiles/BLFS/trunk/chapter23/db.xml
   profiles/BLFS/trunk/chapter23/db3.xml
   profiles/BLFS/trunk/chapter23/mysql.xml
   profiles/BLFS/trunk/chapter23/postgresql.xml
   profiles/BLFS/trunk/chapter24/apache.xml
   profiles/BLFS/trunk/chapter24/php.xml
   profiles/BLFS/trunk/chapter24/proftpd.xml
Log:
tidied chapters 22-24

Modified: profiles/BLFS/trunk/chapter22/bind.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/bind.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,215 +10,188 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="bind" version="&bind-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&bind-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>named</param>
-		</execute>
-
-		<execute command="grep -q ^named /etc/passwd || useradd">
-			<param>-c named</param>
-			<param>-m</param>
-			<param>-g named</param>
-			<param>-s /bin/false</param>
-			<param>named</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&bind-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		        <param>--sysconfdir=/etc</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Configuring chroot environment">
-		<stageinfo>
-			<base>/home/named</base>
-		</stageinfo>
-
-		<mkdir>
-			<option>parents</option>
-			<name>dev</name>
-			<name>etc/namedb/slave</name>
-			<name>var/run</name>
-		</mkdir>
-
-		<execute command="mknod">
-			<param>dev/null</param>
-			<param>c 1 3</param>
- 		</execute>
-
-		<execute command="mknod">
-			<param>dev/random</param>
-			<param>c 1 8</param>
- 		</execute>
-		
-		<permissions mode="666">
-			<name>dev/null</name>
-			<name>dev/random</name>
-		</permissions>
-
-		<mkdir>
-			<option>parents</option>
-			<name>etc/namedb/pz</name>
-		</mkdir>
-
-		<copy>
-			<source>/etc/localtime</source>
-			<destination>etc</destination>
-		</copy>
-	</stage>
-
-	<stage name="Configuring bind">
-		<textdump>
-			<file>/home/named/etc/named.conf</file>
-			<content>
-			= options {
-			=     directory "/etc/namedb";
-			=    pid-file "/var/run/named.pid";
-			=    statistics-file "/var/run/named.stats";
-			=       
-			= };
-			= controls {
-			=     inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
-			= };
-			= key "rndc_key" {
-			=     algorithm hmac-md5;
-			=     secret "[c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K]";
-			= };
-			= zone "." {
-			=     type hint;
-			=     file "root.hints";
-			= };
-			= zone "0.0.127.in-addr.arpa" {
-			=     type master;
-			=     file "pz/127.0.0";
-			= };
-			</content>
-		</textdump>
-
-		<textdump>
-			<file>/home/named/etc/namedb/pz/127.0.0</file>
-			<content>
-			=$TTL 3D
-			=@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
-			=                        1       ; Serial
-			=                        8H      ; Refresh
-			=                        2H      ; Retry
-			=                        4W      ; Expire
-			=                        1D)     ; Minimum TTL
-          		=	         NS      ns.local.domain.
-			=1               PTR     localhost.
-			</content>
-		</textdump>
-
-		<textdump>
-			<file>/home/named/etc/namedb/root.hints</file>
-			<content>
-			=.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-			=.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-			=A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-			=B.ROOT-SERVERS.NET.     6D  IN      A       128.9.0.107
-			=C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-			=D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
-			=E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-			=F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-			=G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-			=H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
-			=I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-			=J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-			=K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-			=L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
-			=M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-			</content>
-		</textdump>
-
-		<textdump>
-			<file>/etc/rndc.conf</file>
-			<content>
-			=key rndc_key {
-			=algorithm "hmac-md5";
-			=    secret
-			=    "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
-			=    };
-			=options {
-			=    default-server localhost;
-			=    default-key    rndc_key;
-			=};
-			</content>
-		</textdump>
-
-		<copy base="/etc">
-			<source>resolv.conf</source>
-			<destination>resolv.conf.bak</destination>
-		</copy>
-
-		<textdump>
-			<file>/etc/resolv.conf</file>
-			<content>
-			=search &domain;
-			=nameserver 127.0.0.1
-			</content>
-		</textdump>
-
-		<ownership user="named" group="named">
-			<option>recursive</option>
-			<name>/home/named</name>
-		</ownership>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-bind</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&bind-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="bind" version="&bind-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&bind-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>named</param>
+      </execute>
+      <execute command="grep -q ^named /etc/passwd || useradd">
+        <param>-c named</param>
+        <param>-m</param>
+        <param>-g named</param>
+        <param>-s /bin/false</param>
+        <param>named</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bind-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Configuring chroot environment">
+      <stageinfo>
+        <base>/home/named</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>dev</name>
+        <name>etc/namedb/slave</name>
+        <name>var/run</name>
+      </mkdir>
+      <execute command="mknod">
+        <param>dev/null</param>
+        <param>c 1 3</param>
+      </execute>
+      <execute command="mknod">
+        <param>dev/random</param>
+        <param>c 1 8</param>
+      </execute>
+      <permissions mode="666">
+        <name>dev/null</name>
+        <name>dev/random</name>
+      </permissions>
+      <mkdir>
+        <option>parents</option>
+        <name>etc/namedb/pz</name>
+      </mkdir>
+      <copy>
+        <source>/etc/localtime</source>
+        <destination>etc</destination>
+      </copy>
+    </stage>
+    <stage name="Configuring bind">
+      <textdump>
+        <file>/home/named/etc/named.conf</file>
+        <content>
+	  = options {
+	  =   directory "/etc/namedb";
+	  =   pid-file "/var/run/named.pid";
+	  =   statistics-file "/var/run/named.stats";
+	  =
+	  = };
+	  = controls {
+	  =   inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
+	  = };
+	  = key "rndc_key" {
+	  =   algorithm hmac-md5;
+	  =   secret "[c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K]";
+	  = };
+	  = zone "." {
+	  =   type hint;
+	  =   file "root.hints";
+	  = };
+	  = zone "0.0.127.in-addr.arpa" {
+	  =   type master;
+	  =   file "pz/127.0.0";
+	  = };
+	</content>
+      </textdump>
+      <textdump>
+        <file>/home/named/etc/namedb/pz/127.0.0</file>
+        <content>
+	  =$TTL 3D
+	  =@	  IN	  SOA	    ns.local.domain.	  hostmaster.local.domain. ( 
+	  =			      1	    ; Serial
+	  =			      8H    ; Refresh
+	  =			      2H    ; Retry
+	  =			      4W    ; Expire
+	  =			      1D)   ; Minimum TTL
+	  =		    NS	    ns.local.domain.
+	  =1		    PTR	    localhost.
+	</content>
+      </textdump>
+      <textdump>
+        <file>/home/named/etc/namedb/root.hints</file>
+        <content>
+	  =.                       6D  IN      NS      A.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      B.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      C.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      D.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      E.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      F.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      G.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      H.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      I.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      J.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      K.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      L.ROOT-SERVERS.NET.
+	  =.                       6D  IN      NS      M.ROOT-SERVERS.NET.
+	  =A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
+	  =B.ROOT-SERVERS.NET.     6D  IN      A       128.9.0.107
+	  =C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
+	  =D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
+	  =E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
+	  =F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
+	  =G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
+	  =H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
+	  =I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
+	  =J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
+	  =K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
+	  =L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
+	  =M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
+	</content>
+      </textdump>
+      <textdump>
+        <file>/etc/rndc.conf</file>
+        <content>
+	  =key rndc_key {
+	  =algorithm "hmac-md5";
+	  =    secret
+	  =    "[c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K]";
+	  =    };
+	  =options {
+	  =    default-server localhost;
+	  =    default-key    rndc_key;
+	  =};
+	</content>
+      </textdump>
+      <copy base="/etc">
+        <source>resolv.conf</source>
+        <destination>resolv.conf.bak</destination>
+      </copy>
+      <textdump>
+        <file>/etc/resolv.conf</file>
+        <content>
+	  =search &domain;
+	  =nameserver 127.0.0.1
+	</content>
+      </textdump>
+      <ownership user="named" group="named">
+        <option>recursive</option>
+        <name>/home/named</name>
+      </ownership>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-bind</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bind-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/dhcp.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/dhcp.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,73 +10,58 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="dhcp" version="&dhcp-version;">
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&dhcp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&dhcp-package;</base>
-		</stageinfo>
-
-		<configure />
-
-		<make />
-
-		<make>
-			<param>LIBDIR=/usr/lib</param>
-			<param>INCDIR=/usr/include</param>
-			<param>install</param>
-		</make>
-
-		<execute command="touch">
-			<param>/var/state/dhcp/dhcpd.leases</param>
-		</execute>
-
-		<textdump>
-			<file>/etc/dhcpd.conf</file>
-			<content>
-			=default-lease-time 72000;
-			=max-lease-time 144000;
-			=ddns-update-style ad-hoc;
-			=
-			=subnet 192.168.5.0 netmask 255.255.255.0 {
-			=  range 192.168.5.10 192.168.5.240;
-			=  option broadcast-address 195.168.5.255;
-			=  option routers 192.168.5.1;
-			=}
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-	
-		<make>
-			<param>install-dhcp</param>
-		</make>
-	</stage>
-
-
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&dhcp-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="dhcp" version="&dhcp-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&dhcp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&dhcp-package;</base>
+      </stageinfo>
+      <configure />
+      <make />
+      <make>
+        <param>LIBDIR=/usr/lib</param>
+        <param>INCDIR=/usr/include</param>
+        <param>install</param>
+      </make>
+      <execute command="touch">
+        <param>/var/state/dhcp/dhcpd.leases</param>
+      </execute>
+      <textdump>
+        <file>/etc/dhcpd.conf</file>
+        <content>
+	  =default-lease-time 72000;
+	  =max-lease-time 144000;
+	  =ddns-update-style ad-hoc;
+	  =
+	  =subnet 192.168.5.0 netmask 255.255.255.0 {
+	  =  range 192.168.5.10 192.168.5.240;
+	  =  option broadcast-address 195.168.5.255;
+	  =  option routers 192.168.5.1;
+	  =}
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-dhcp</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&dhcp-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/leafnode.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/leafnode.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/leafnode.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,87 +10,72 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="leafnode" version="&leafnode-version;">
-
-        <packageinfo>
-                <requires><name>pcre</name></requires>
-                <requires><name>xinetd</name></requires>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&leafnode-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>news</param>
-		</execute>
-
-		<execute command="grep -q ^news /etc/passwd || useradd">
-			<param>-g news</param>
-			<param>news</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&leafnode-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--localstatedir=/var</param>
-			<param>--sysconfdir=/etc/news</param>
-			<param>--with-lockfile=/var/lock/fetchnews.lck</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		&ldconfig;
-
-		<make>
-		        <param>update</param>
-		</make>
-
-
-		<textdump mode="append" base="/etc">
-			<file>xinetd.conf</file>		
-			<content>
-		        =
-		        =service nntp
-			={
-			=    flags           = NAMEINARGS NOLIBWRAP
-			=    socket_type     = stream
-			=    protocol        = tcp
-			=    wait            = no
-			=    user            = news
-			=    server          = /usr/sbin/tcpd
-			=    server_args     = /usr/sbin/leafnode
-			=    instances       = 7
-			=    per_source      = 3
-			=}
-			</content>
-		</textdump>
-
-		<copy>
-		        <source>/etc/news/config.example</source>
-			<destination>/etc/news/config</destination>
-		</copy>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&leafnode-directory;</remove>
-	</stage>
-
-</package>
+  <package name="leafnode" version="&leafnode-version;">
+    <packageinfo>
+      <requires>
+        <name>pcre</name>
+      </requires>
+      <requires>
+        <name>xinetd</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&leafnode-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>news</param>
+      </execute>
+      <execute command="grep -q ^news /etc/passwd || useradd">
+        <param>-g news</param>
+        <param>news</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+    <stageinfo>
+      <base>&build_dir;/&leafnode-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+      <param>--localstatedir=/var</param>
+      <param>--sysconfdir=/etc/news</param>
+      <param>--with-lockfile=/var/lock/fetchnews.lck</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>&ldconfig; 
+    <make>
+      <param>update</param>
+    </make>
+    <textdump mode="append" base="/etc">
+      <file>xinetd.conf</file>
+      <content>
+        =service nntp
+        ={
+        =   flags           = NAMEINARGS NOLIBWRAP
+        =   socket_type     = stream
+        =   protocol        = tcp
+        =   wait            = no
+        =   user            = news
+        =   server          = /usr/sbin/tcpd
+        =   server_args     = /usr/sbin/leafnode
+        =   instances       = 7
+        =   per_source      = 3
+        =}
+	</content>
+    </textdump>
+    <copy>
+      <source>/etc/news/config.example</source>
+      <destination>/etc/news/config</destination>
+    </copy></stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&leafnode-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/openldap.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openldap.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/openldap.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,58 +10,59 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="openldap" version="&openldap-version;">
-
-        <packageinfo>
-	        <requires><name>db</name></requires>
-		<utilizes><name>openssl</name></utilizes>
-		<utilizes><name>gdbm</name></utilizes>
-		<utilizes><name>tcpwrappers</name></utilizes>
-		<utilizes><name>readline</name></utilizes>
-		<utilizes><name>heimdal</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&openldap-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&openldap-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--localstatedir=/var/lib</param>
-			<param>--disable-debug</param>
-			<param>--enable-ldbm</param>
-		</configure>
-
-		<make>
-		        <param>depend</param>
-		</make>
-
-		<make />
-
-		<make>
-		        <param>test</param>
-		</make>
-
-		<make>
-		        <param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&openldap-directory;</remove>
-	</stage>
-
-</package>
+  <package name="openldap" version="&openldap-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>gdbm</name>
+      </utilizes>
+      <utilizes>
+        <name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+      <utilizes>
+        <name>heimdal</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&openldap-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&openldap-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--localstatedir=/var/lib</param>
+        <param>--disable-debug</param>
+        <param>--enable-ldbm</param>
+      </configure>
+      <make>
+        <param>depend</param>
+      </make>
+      <make />
+      <make>
+        <param>test</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openldap-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/openssh.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,96 +10,82 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="openssh" version="&openssh-version;">
-
-        <packageinfo>
-                <requires><name>openssl</name></requires>
-		<utilizes><name>linuxpam</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&openssh-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-		
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>sshd</param>
-		</execute>
-
-		<execute command="grep -q ^sshd /etc/passwd || useradd">
-			<param>-c sshd</param>
-			<param>-d /var/empty</param>
-			<param>-g sshd</param>
-			<param>-s /bin/false</param>
-			<param>sshd</param>
-		</execute>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&openssh-directory;</base>
-		</stageinfo>
-
-		<search_replace>
-			<file>configure</file>
-			<find>-lcrypto</find>
-			<replace>/usr/lib/libcrypto.a</replace>
-		</search_replace>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&openssh-directory;</base>
-		</stageinfo>
-
-		<mkdir>
-		        <option>parents</option>
-			<name>/var/empty</name>
-		</mkdir>
-
-		<ownership user="root" group="sys">
-		        <name>/var/empty</name>
-                </ownership>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		        <param>--sysconfdir=/etc/ssh</param>
-		        <param>--libexecdir=/usr/sbin</param>
-		        <param>--with-md5-passwords</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-sshd</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&openssh-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="openssh" version="&openssh-version;">
+    <packageinfo>
+      <requires>
+        <name>openssl</name>
+      </requires>
+      <utilizes>
+        <name>linuxpam</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&openssh-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>sshd</param>
+      </execute>
+      <execute command="grep -q ^sshd /etc/passwd || useradd">
+        <param>-c sshd</param>
+        <param>-d /var/empty</param>
+        <param>-g sshd</param>
+        <param>-s /bin/false</param>
+        <param>sshd</param>
+      </execute>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&openssh-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>configure</file>
+        <find>-lcrypto</find>
+        <replace>/usr/lib/libcrypto.a</replace>
+      </search_replace>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&openssh-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/empty</name>
+      </mkdir>
+      <ownership user="root" group="sys">
+        <name>/var/empty</name>
+      </ownership>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc/ssh</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--with-md5-passwords</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-sshd</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openssh-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/rsync.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/rsync.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,72 +10,60 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="rsync" version="&rsync-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&rsync-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>rsyncd</param>
-		</execute>
-
-		<execute command="grep -q ^rsyncd /etc/passwd || useradd">
-			<param>-c rsyncd</param>
-			<param>-d /home/rsync</param>
-			<param>-g rsyncd</param>
-			<param>-s /bin/false</param>
-			<param>rsyncd</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&rsync-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-		
-		<textdump base="/etc">
-        		<file>/etc/rsyncd.conf</file>
-			<content>
-			=# This is a basic rsync configuration file
-			=# It exports a single module without user authentification.
-			=
-			=motd file = /home/rsync/welcome.msg
-			=use chroot = yes
-			=
-			=[localhost]
-			=	path = /home/rsync
-			=	comment = Default rsync module
-			=	read only = yes
-			=	list = yes
-			=	uid = rsyncd
-			=	gid = rsyncd
-			=
-			</content>
-     		 </textdump>		
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&rsync-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="rsync" version="&rsync-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&rsync-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>rsyncd</param>
+      </execute>
+      <execute command="grep -q ^rsyncd /etc/passwd || useradd">
+        <param>-c rsyncd</param>
+        <param>-d /home/rsync</param>
+        <param>-g rsyncd</param>
+        <param>-s /bin/false</param>
+        <param>rsyncd</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&rsync-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <textdump base="/etc">
+        <file>/etc/rsyncd.conf</file>
+        <content>
+	  =# This is a basic rsync configuration file
+	  =# It exports a single module without user authentication.
+	  =
+	  =motd file = /home/rsync/welcome.msg
+	  =use chroot = yes
+	  =
+	  =[localhost]
+	  =    path = /home/rsync
+	  =    comment = Default rsync module
+	  =    read only = yes
+	  =    list = yes
+	  =    uid = rsyncd
+	  =    gid = rsyncd
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&rsync-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/samba.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/samba.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,129 +10,105 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="samba" version="&samba-version;">
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&samba-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching.">
-		<stageinfo>
-			<base>&build_dir;/&samba-directory;/source</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&samba-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&samba-maintainer-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&samba-directory;/source</base>
-		</stageinfo>
-
-		<mkdir>
-			<option>parents</option>
-			<name>/var/cache/samba</name>
-		</mkdir>
-
-		<configure>
-			<param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--localstatedir=/var</param>
-			<param>--with-piddir=/var/run</param>
-			<param>--with-fhs</param>
-			<param>--with-smbmount</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-			<source>nsswitch/libnss_win{s,bind.so}</source>
-			<destination>/lib</destination>
-		</copy>
-
-		<permissions mode="0755">
-			<name>/lib/nsswitch/libnss_win{s,bind.so}</name>
-		</permissions>
-
-		<link base="/lib">
-			<option>force</option>
-			<target>libnss_winbind.so</target>
-			<name>libnss_winbind.so.2</name>
-		</link>
-
-		<link base="/lib">
-			<option>force</option>
-			<target>libnss_wins.so</target>
-			<name>libnss_wins.so.2</name>
-		</link>
-
-		<copy base="&build_dir;/&samba-directory;">
-			<source>examples/smb.conf.default</source>
-			<destination>/etc/samba</destination>
-		</copy>
-	
-		<textdump mode="append">
-			<file>/etc/services</file>
-			<content>
-			=swat 901/tcp
-			</content>
-		</textdump>
-
-		<textdump mode="append">
-			<file>/etc/inetd.conf</file>
-			<content>
-			=swat stream tcp nowait.400 root /usr/sbin/swat swat
-			</content>
-		</textdump>
-
-		<textdump mode="append">
-			<file>/etc/xinetd.conf</file>
-			<content>
-			={
-			=    port            = 901
-			=    socket_type     = stream
-			=    wait            = no
-			=    only_from       = 127.0.0.1
-			=    user            = root
-			=    server          = /usr/sbin/swat
-			=    log_on_failure  += USERID
-			=}
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&samba-directory;</base>	
-		</stageinfo>
-
-		<make>
-			<param>install-samba</param>
-			<param>install-winbind</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&samba-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="samba" version="&samba-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&samba-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching.">
+      <stageinfo>
+        <base>&build_dir;/&samba-directory;/source</base>
+      </stageinfo>
+      <patch base="&build_dir;/&samba-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&samba-maintainer-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&samba-directory;/source</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/cache/samba</name>
+      </mkdir>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--localstatedir=/var</param>
+        <param>--with-piddir=/var/run</param>
+        <param>--with-fhs</param>
+        <param>--with-smbmount</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>nsswitch/libnss_win{s,bind.so}</source>
+        <destination>/lib</destination>
+      </copy>
+      <permissions mode="0755">
+        <name>/lib/nsswitch/libnss_win{s,bind.so}</name>
+      </permissions>
+      <link base="/lib">
+        <option>force</option>
+        <target>libnss_winbind.so</target>
+        <name>libnss_winbind.so.2</name>
+      </link>
+      <link base="/lib">
+        <option>force</option>
+        <target>libnss_wins.so</target>
+        <name>libnss_wins.so.2</name>
+      </link>
+      <copy base="&build_dir;/&samba-directory;">
+        <source>examples/smb.conf.default</source>
+        <destination>/etc/samba</destination>
+      </copy>
+      <textdump mode="append">
+        <file>/etc/services</file>
+        <content>=swat		901/tcp</content>
+      </textdump>
+      <textdump mode="append">
+        <file>/etc/inetd.conf</file>
+        <content>=swat stream tcp nowait.400 root /usr/sbin/swat swat</content>
+      </textdump>
+      <textdump mode="append">
+        <file>/etc/xinetd.conf</file>
+        <content>
+	  =service swat
+	  ={
+	  =    port            = 901
+	  =    socket_type     = stream
+	  =    wait            = no
+	  =    only_from       = 127.0.0.1
+	  =    user            = root
+	  =    server          = /usr/sbin/swat
+	  =    log_on_failure  += USERID
+	  =}
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&samba-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-samba</param>
+        <param>install-winbind</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&samba-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/xinetd.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/xinetd.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter22/xinetd.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch22.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,64 +10,50 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="xinetd" version="&xinetd-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&xinetd-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&xinetd-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-		</configure>
-
-		<make />
-
-		<make>
-		        <param>install</param>
-		</make>
-
-		<copy>
-			<source>xinetd/sample.conf</source>
-			<destination>/etc/xinetd.conf</destination>
-		</copy>
-
-		<search_replace>
-			<file>/etc/xinetd.conf</file>
-			<find>/etc</find>
-			<replace>/sbin</replace>
-		</search_replace>		
-
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-xinetd</param>
-		</make>
-	</stage>
-		
-	<stage name="Cleanup">
-		<remove>&build_dir;/&xinetd-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="xinetd" version="&xinetd-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&xinetd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&xinetd-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>xinetd/sample.conf</source>
+        <destination>/etc/xinetd.conf</destination>
+      </copy>
+      <search_replace>
+        <file>/etc/xinetd.conf</file>
+        <find>/etc</find>
+        <replace>/sbin</replace>
+      </search_replace>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-xinetd</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xinetd-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/db.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter23/db.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch23.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,58 +10,46 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="db" version="&db-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&db-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&db-directory;/build_unix</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&db-directory;">
-			<param>-N</param>
-			<param>-p0</param>
-			<param>-i &packages_dir;/&db-patch1;</param>
-		</patch>
-
-		<patch base="&build_dir;/&db-directory;">
-			<param>-N</param>
-			<param>-p0</param>
-			<param>-i &packages_dir;/&db-patch2;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&db-directory;/build_unix</base>
-		</stageinfo>
-
-		<configure command="../dist/configure">
-			<param>--prefix=/usr</param>
-			<param>--enable-compat185</param>
-			<param>--enable-cxx</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>docdir=/usr/share/doc/db-&db-version;</param>
-			<param>install</param>
-		</make>
-
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&db-directory;</remove>
-	</stage>
-
-</package>
+  <package name="db" version="&db-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&db-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&db-directory;/build_unix</base>
+      </stageinfo>
+      <patch base="&build_dir;/&db-directory;">
+        <param>-N</param>
+        <param>-p0</param>
+        <param>-i &packages_dir;/&db-patch1;</param>
+      </patch>
+      <patch base="&build_dir;/&db-directory;">
+        <param>-N</param>
+        <param>-p0</param>
+        <param>-i &packages_dir;/&db-patch2;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&db-directory;/build_unix</base>
+      </stageinfo>
+      <configure command="../dist/configure">
+        <param>--prefix=/usr</param>
+        <param>--enable-compat185</param>
+        <param>--enable-cxx</param>
+      </configure>
+      <make />
+      <make>
+        <param>docdir=/usr/share/doc/db-&db-version;</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&db-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/db3.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db3.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter23/db3.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch23.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,56 +10,43 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="db3" version="&db3-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&db3-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&db3-directory;/build_unix</base>
-		</stageinfo>
-
-		<configure command="../dist/configure">
-			<param>--prefix=/opt/db-3.3</param>
-			<param>--enable-compat185</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>docdir=/opt/db-3.3/Berkeley-DB</param>
-			<param>install</param>
-		</make>
-
-
-		<remove>/opt/db-3.3/lib/libdb.so</remove>
-
-		<execute command="cd /opt/db-3.3/lib/ &real-amp;&real-amp; for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done" />
-		<execute command="sed 's/^DB185/DB/' /opt/db-3.3/include/db_185.h > /opt/db-3.3/include/db_185.h.new" />
-
-		<move>
-		        <source>/opt/db-3.3/include/db_185.h.new</source>
-			<destination>/opt/db-3.3/include/db_185.h</destination>
-		</move>
-
-		<link>
-			<option>no-dereference</option>
-			<option>force</option>
-			<target>/opt/db-3.3/include</target>
-			<name>/usr/include/db3</name>
-		</link>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&db3-directory;</remove>
-	</stage>
-
-</package>
+  <package name="db3" version="&db3-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&db3-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&db3-directory;/build_unix</base>
+      </stageinfo>
+      <configure command="../dist/configure">
+        <param>--prefix=/opt/db-3.3</param>
+        <param>--enable-compat185</param>
+      </configure>
+      <make />
+      <make>
+        <param>docdir=/opt/db-3.3/Berkeley-DB</param>
+        <param>install</param>
+      </make>
+      <remove>/opt/db-3.3/lib/libdb.so</remove>
+      <execute command="cd /opt/db-3.3/lib/ &real-amp;&real-amp; for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done" />
+      <execute command="sed 's/^DB185/DB/' /opt/db-3.3/include/db_185.h > /opt/db-3.3/include/db_185.h.new" />
+      <move>
+        <source>/opt/db-3.3/include/db_185.h.new</source>
+        <destination>/opt/db-3.3/include/db_185.h</destination>
+      </move>
+      <link>
+        <option>no-dereference</option>
+        <option>force</option>
+        <target>/opt/db-3.3/include</target>
+        <name>/usr/include/db3</name>
+      </link>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&db3-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/mysql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/mysql.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter23/mysql.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch23.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,121 +10,102 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="mysql" version="&mysql-version;">
-
-        <packageinfo>
-	        <utilizes><name>readline</name></utilizes>
-	        <utilizes><name>openssl</name></utilizes>
-		<utilizes><name>tcpwrappers</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&mysql-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>mysql</param>
-		</execute>
-
-		<execute command="grep -q ^mysql /etc/passwd || useradd">
-			<param>-c mysql</param>
-			<param>-d /dev/null</param>
-			<param>-g mysql</param>
-			<param>-s /bin/false</param>
-			<param>mysql</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&mysql-directory;</base>
-		</stageinfo>
-
-		<configure>
-                        <param>--prefix=/usr</param>
-                        <param>--sysconfdir=/etc</param>
-                        <param>--libexecdir=/usr/sbin</param>
-                        <param>--localstatedir=/var/lib/mysql</param>
-                        <param>--enable-thread-safe-client</param>
-			<param>--enable-local-infile</param>
-			<param>--enable-assembler</param>
-                        <param>--without-debug</param>
-                        <param>--without-bench</param>
-		</configure>
-
-		<make>
-			<param>testdir=/usr/lib/mysql/mysql-test</param>
-		</make>
-
-		<make>
-			<param>testdir=/usr/lib/mysql/mysql-test</param>
-			<param>install</param>
-		</make>
-
-		<execute command="cd /usr/lib &real-amp;&real-amp; 
-			ln -sf mysql/libmysqlclient{,_r}.so* ." />
-
-		<!-- CONFIGURATION -->
-
-		<copy>
-		        <source>/usr/share/mysql/my-medium.cnf</source>
-			<destination>/etc/my.cnf</destination>
-		</copy>
-
-		<execute command="mysql_install_db" />
-
-		<ownership user="mysql" group="mysql">
-		    <option>recursive</option>
-		    <name>/var/lib/mysql</name>
-		</ownership>
-
-		<!--
-
-		<execute command="safe_mysqld 2>&real-amp;1 >/dev/null &real-amp;" />
-
-		<textdump>
-		        <file>/tmp/mysql.script</file>
-			<content>
-			=UPDATE user SET password=password(&mysql-password;) WHERE user='root';
-			=FLUSH PRIVILEGES;
-			=EXIT;
-			</content>
-		</textdump>
-
-		<execute command="mysql -uroot mysql < /tmp/mysql.script" />
-
-		<remove>/tmp/mysql.script</remove>
-
-		<execute command="kill `pidof -x safe_mysqld mysqld`" />
-		-->
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-	
-		<make>
-			<param>install-mysql</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&mysql-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="mysql" version="&mysql-version;">
+    <packageinfo>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>tcpwrappers</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&mysql-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>mysql</param>
+      </execute>
+      <execute command="grep -q ^mysql /etc/passwd || useradd">
+        <param>-c mysql</param>
+        <param>-d /dev/null</param>
+        <param>-g mysql</param>
+        <param>-s /bin/false</param>
+        <param>mysql</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&mysql-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--libexecdir=/usr/sbin</param>
+        <param>--localstatedir=/var/lib/mysql</param>
+        <param>--enable-thread-safe-client</param>
+        <param>--enable-local-infile</param>
+        <param>--enable-assembler</param>
+        <param>--without-debug</param>
+        <param>--without-bench</param>
+      </configure>
+      <make>
+        <param>testdir=/usr/lib/mysql/mysql-test</param>
+      </make>
+      <make>
+        <param>testdir=/usr/lib/mysql/mysql-test</param>
+        <param>install</param>
+      </make>
+      <execute command="cd /usr/lib &real-amp;&real-amp; 
+                              ln -sf mysql/libmysqlclient{,_r}.so* ." />
+      <!-- CONFIGURATION -->
+      <copy>
+        <source>/usr/share/mysql/my-medium.cnf</source>
+        <destination>/etc/my.cnf</destination>
+      </copy>
+      <execute command="mysql_install_db" />
+      <ownership user="mysql" group="mysql">
+        <option>recursive</option>
+        <name>/var/lib/mysql</name>
+      </ownership>
+      <!--
+      <execute command="safe_mysqld 2>&real-amp;1 >/dev/null &real-amp;" />
+      <textdump>
+	<file>/tmp/mysql.script</file>
+	<content>
+	  =UPDATE user SET password=password(&mysql-password;) WHERE user='root';
+	  =FLUSH PRIVILEGES;
+	  =EXIT;
+	</content>
+      </textdump>
+      <execute command="mysql -uroot mysql < /tmp/mysql.script" />
+      <remove>/tmp/mysql.script</remove>
+      <execute command="kill `pidof -x safe_mysqld mysqld`" />
+      -->
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-mysql</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&mysql-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/postgresql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/postgresql.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter23/postgresql.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch23.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,78 +10,62 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="postgresql" version="&postgresql-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&postgresql-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user">
-		<execute command="grep -q ^postgres /etc/passwd || useradd">
-			<param>-d /var/pgsql/data</param>
-			<param>postgres</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&postgresql-directory;</base>
-		</stageinfo>
-
-		<configure>
-                        <param>--prefix=/usr</param>
-		</configure>
-
-		<make/>
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<mkdir>
-		        <option>parents</option>
-			<name>/var/pgsql/data</name>
-		</mkdir>
-
-		<ownership user="postgres">
-		        <name>/var/pgsql/data</name>
-		</ownership>
-	</stage>
-
-	<stage name="Initializing database">
-		<stageinfo>
-			<user>postgres</user>
-		</stageinfo>
-
-		<execute command="initdb">
-			<param>-D /var/pgsql/data</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-postgresql</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&postgresql-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="postgresql" version="&postgresql-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&postgresql-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user">
+      <execute command="grep -q ^postgres /etc/passwd || useradd">
+        <param>-d /var/pgsql/data</param>
+        <param>postgres</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&postgresql-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/pgsql/data</name>
+      </mkdir>
+      <ownership user="postgres">
+        <name>/var/pgsql/data</name>
+      </ownership>
+    </stage>
+    <stage name="Initializing database">
+      <stageinfo>
+        <user>postgres</user>
+      </stageinfo>
+      <execute command="initdb">
+        <param>-D /var/pgsql/data</param>
+      </execute>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-postgresql</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&postgresql-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter24/apache.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/apache.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter24/apache.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch24.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,99 +10,92 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="apache" version="&apache-version;">
-
-	<packageinfo>
-		<utilizes><name>db</name></utilizes>
-		<utilizes><name>gdbm</name></utilizes>
-		<utilizes><name>openssl</name></utilizes>
-		<utilizes><name>openldap</name></utilizes>
-		<utilizes><name>expat</name></utilizes>
-	</packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&apache-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>apache</param>
-		</execute>
-
-		<execute command="grep -q ^apache /etc/passwd || useradd">
-			<param>-c apache</param>
-			<param>-d /dev/null</param>
-			<param>-g apache</param>
-			<param>-s /bin/false</param>
-			<param>apache</param>
-		</execute>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&apache-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&apache-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&apache-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--enable-layout=LFS</param>
-			<param>--enable-mods-shared=all</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-apache</param>
-		</make>
-		
-		<search_replace base="/etc/apache">
-			<file>httpd.conf</file>
-			<find>User nobody</find>
-			<replace>User apache</replace>
-		</search_replace>
-
-		<search_replace base="/etc/apache">
-			<file>httpd.conf</file>
-			<find>Group #-1</find>
-			<replace>Group apache</replace>
-		</search_replace>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&apache-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="apache" version="&apache-version;">
+    <packageinfo>
+      <utilizes>
+        <name>db</name>
+      </utilizes>
+      <utilizes>
+        <name>gdbm</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>openldap</name>
+      </utilizes>
+      <utilizes>
+        <name>expat</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&apache-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>apache</param>
+      </execute>
+      <execute command="grep -q ^apache /etc/passwd || useradd">
+        <param>-c apache</param>
+        <param>-d /dev/null</param>
+        <param>-g apache</param>
+        <param>-s /bin/false</param>
+        <param>apache</param>
+      </execute>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&apache-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&apache-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&apache-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--enable-layout=LFS</param>
+        <param>--enable-mods-shared=all</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-apache</param>
+      </make>
+      <search_replace base="/etc/apache">
+        <file>httpd.conf</file>
+        <find>User nobody</find>
+        <replace>User apache</replace>
+      </search_replace>
+      <search_replace base="/etc/apache">
+        <file>httpd.conf</file>
+        <find>Group #-1</find>
+        <replace>Group apache</replace>
+      </search_replace>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&apache-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter24/php.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/php.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter24/php.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch24.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,93 +10,110 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="php" version="&php-version;">
-
-        <packageinfo>
-                <requires><name>mysql</name></requires>
-                <requires><name>apache</name></requires>
-		
-		<utilizes><name>openssl</name></utilizes>
-                <utilizes><name>bc</name></utilizes>
-                <utilizes><name>curl</name></utilizes>
-                <utilizes><name>db</name></utilizes>
-                <utilizes><name>libjpeg</name></utilizes>
-                <utilizes><name>libpng</name></utilizes>
-		<utilizes><name>freetype</name></utilizes>
-                <utilizes><name>gdbm</name></utilizes>
-                <utilizes><name>sendmail</name></utilizes>
-                <utilizes><name>pcre</name></utilizes>
-                <utilizes><name>postgesql</name></utilizes>
-                <utilizes><name>readline</name></utilizes>
-                <utilizes><name>libtiff</name></utilizes>
-                <utilizes><name>readline</name></utilizes>
-                <utilizes><name>expat</name></utilizes>
-                <utilizes><name>gmp</name></utilizes>
-        </packageinfo>
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&php-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&php-directory;</base>
-		</stageinfo>
-
-		<configure>
-		        <param>--prefix=/usr</param>
-			<param>--sysconfdir=/etc</param>
-			<param>--with-apxs2</param>
-			<param>--with-config-file-path=/etc</param>
-			<param>--with-zlib</param>
-			<param>--with-bz2</param>
-			<param>--enable-ftp</param>
-			<param>--with-gettext</param>
-			<param>--with-iconv</param>
-			<param>--with-mysql=/usr</param>
-			<param>--with-ncurses</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<copy>
-		        <source>php.ini-recommended</source>
-			<destination>/etc/php.ini</destination>
-		</copy>
-
-	</stage>
-
-
-	<stage name="Configuring">
-
-	<!-- remove line if already inserted -->
-		<search_replace base="/etc/apache">
-			<file>httpd.conf</file>
-			<find>AddType application/x-httpd-php .php</find>
-			<replace></replace>
-		</search_replace>
-	
-		<textdump mode="append" base="/etc/apache">
-	        	<file>httpd.conf</file>
-			<content>
-                	=AddType application/x-httpd-php .php
-			</content>
-		</textdump>
-	</stage>
-
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&php-directory;</remove>
-	</stage>
-
-</package>
+  <package name="php" version="&php-version;">
+    <packageinfo>
+      <requires>
+        <name>mysql</name>
+      </requires>
+      <requires>
+        <name>apache</name>
+      </requires>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>bc</name>
+      </utilizes>
+      <utilizes>
+        <name>curl</name>
+      </utilizes>
+      <utilizes>
+        <name>db</name>
+      </utilizes>
+      <utilizes>
+        <name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+        <name>libpng</name>
+      </utilizes>
+      <utilizes>
+        <name>freetype</name>
+      </utilizes>
+      <utilizes>
+        <name>gdbm</name>
+      </utilizes>
+      <utilizes>
+        <name>sendmail</name>
+      </utilizes>
+      <utilizes>
+        <name>pcre</name>
+      </utilizes>
+      <utilizes>
+        <name>postgesql</name>
+      </utilizes>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+      <utilizes>
+        <name>libtiff</name>
+      </utilizes>
+      <utilizes>
+        <name>readline</name>
+      </utilizes>
+      <utilizes>
+        <name>expat</name>
+      </utilizes>
+      <utilizes>
+        <name>gmp</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&php-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&php-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--with-apxs2</param>
+        <param>--with-config-file-path=/etc</param>
+        <param>--with-zlib</param>
+        <param>--with-bz2</param>
+        <param>--enable-ftp</param>
+        <param>--with-gettext</param>
+        <param>--with-iconv</param>
+        <param>--with-mysql=/usr</param>
+        <param>--with-ncurses</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>php.ini-recommended</source>
+        <destination>/etc/php.ini</destination>
+      </copy>
+    </stage>
+    <stage name="Configuring">
+      <!-- remove line if already inserted -->
+      <search_replace base="/etc/apache">
+        <file>httpd.conf</file>
+        <find>AddType application/x-httpd-php .php</find>
+        <replace></replace>
+      </search_replace>
+      <textdump mode="append" base="/etc/apache">
+        <file>httpd.conf</file>
+        <content>=AddType application/x-httpd-php .php</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&php-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter24/proftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2004-07-18 23:40:54 UTC (rev 1465)
+++ profiles/BLFS/trunk/chapter24/proftpd.xml	2004-07-19 00:06:47 UTC (rev 1466)
@@ -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/ch24.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,126 +10,113 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="proftpd" version="&proftpd-version;">
-
-        <stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&proftpd-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Creating user and group">
-		<execute command="groupadd">
-			<param>-f</param>
-			<param>proftpd</param>
-		</execute>
-
-		<execute command="grep -q ^proftpd /etc/passwd || useradd">
-			<param>-c proftpd</param>
-			<param>-d /home/ftp</param>
-			<param>-g proftpd</param>
-			<param>-s /bin/false</param>
-			<param>proftpd</param>
-		</execute>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&proftpd-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<prefix>install_user=proftpd</prefix>
-			<prefix>install_group=proftpd</prefix>                 
-		        <param>--prefix=/usr</param>
-                        <param>--sysconfdir=/etc</param>
-                        <param>--localstatedir=/var</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing bootscript and configuration">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-proftpd</param>
-		</make>
-
-		<textdump base="/etc">
-			<file>proftpd.conf</file>
-			<content>
-			=# This is a basic ProFTPD configuration file
-			=# It establishes a single server and a single anonymous login.
-			=
-			=ServerName			"ProFTPD Default Installation"
-			=ServerType			standalone
-			=DefaultServer			on
-			=
-			=# Port 21 is the standard FTP port.
-			=Port				21
-			=# Umask 022 is a good standard umask to prevent new dirs and files
-			=# from being group and world writable.
-			=Umask				022
-			=
-			=# To prevent DoS attacks, set the maximum number of child processes
-			=# to 30.  If you need to allow more than 30 concurrent connections
-			=# at once, simply increase this value.  Note that this ONLY works
-			=# in standalone mode, in inetd mode you should use an inetd server
-			=# that allows you to limit maximum number of processes per service
-			=# (such as xinetd)
-			=MaxInstances			30
-			=
-			=# Set the user and group that the server normally runs at.
-			=User				proftpd
-			=Group				proftpd
-			=
-			=# Normally, we want files to be overwriteable.
-			=<Directory /*>
-			=  AllowOverwrite		on
-			=</Directory>
-			=
-			=# A basic anonymous configuration, no upload directories.
-			=<Anonymous ~proftpd>
-			=  User				proftpd
-			=  Group				proftpd
-			=  # We want clients to be able to login with "anonymous" as well as "proftpd"
-			=  UserAlias			anonymous proftpd
-			=
-			=  # Limit the maximum number of anonymous logins
-			=  MaxClients			10
-			=
-			=  # We want 'welcome.msg' displayed at login, and '.message' displayed
-			=  # in each newly chdired directory.
-			=  DisplayLogin			welcome.msg
-			=  DisplayFirstChdir		.message
-			=
-			=  # Limit WRITE everywhere in the anonymous chroot
-			=  <Limit WRITE>
-			=    DenyAll
-			=  </Limit>
-			=</Anonymous>
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&proftpd-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-</package>
+  <package name="proftpd" version="&proftpd-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&proftpd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="groupadd">
+        <param>-f</param>
+        <param>proftpd</param>
+      </execute>
+      <execute command="grep -q ^proftpd /etc/passwd || useradd">
+        <param>-c proftpd</param>
+        <param>-d /home/ftp</param>
+        <param>-g proftpd</param>
+        <param>-s /bin/false</param>
+        <param>proftpd</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&proftpd-directory;</base>
+      </stageinfo>
+      <configure>
+        <prefix>install_user=proftpd</prefix>
+        <prefix>install_group=proftpd</prefix>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+        <param>--localstatedir=/var</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-proftpd</param>
+      </make>
+      <textdump base="/etc">
+        <file>proftpd.conf</file>
+        <content>
+	  =# This is a basic ProFTPD configuration file
+	  =# It establishes a single server and a single anonymous login.
+	  =
+	  =ServerName                      "ProFTPD Default Installation"
+	  =ServerType                      standalone
+	  =DefaultServer                   on
+	  =
+	  =# Port 21 is the standard FTP port.
+	  =Port                            21
+	  =# Umask 022 is a good standard umask to prevent new dirs and files
+	  =# from being group and world writable.
+	  =Umask                           022
+	  =
+	  =# To prevent DoS attacks, set the maximum number of child processes
+	  =# to 30.  If you need to allow more than 30 concurrent connections
+	  =# at once, simply increase this value.  Note that this ONLY works
+	  =# in standalone mode, in inetd mode you should use an inetd server
+	  =# that allows you to limit maximum number of processes per service
+	  =# (such as xinetd)
+	  =MaxInstances                    30
+	  =
+	  =# Set the user and group that the server normally runs at.
+	  =User                            proftpd
+	  =Group                           proftpd
+	  =
+	  =# Normally, we want files to be overwritable.
+	  =<Directory /*>
+	  =  AllowOverwrite                on
+	  =</Directory>
+	  =
+	  =# A basic anonymous configuration, no upload directories.
+	  =<Anonymous ~proftpd>
+	  =  User                          proftpd
+	  =  Group                         proftpd
+	  =  # We want clients to be able to login with "anonymous" as well as "proftpd"
+	  =  UserAlias                     anonymous proftpd
+	  =
+	  =  # Limit the maximum number of anonymous logins
+	  =  MaxClients                    10
+	  =
+  	  =  # We want 'welcome.msg' displayed at login, and '.message' displayed
+	  =  # in each newly chdired directory.
+	  =  DisplayLogin                  welcome.msg
+	  =  DisplayFirstChdir             .message
+	  =
+	  =  # Limit WRITE everywhere in the anonymous chroot
+	  =  <Limit WRITE>
+	  =    DenyAll
+	  =  </Limit>
+	  =</Anonymous>
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&proftpd-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list