r1928 - in profiles/BLFS/trunk: . chapter08 chapter11 chapter18 chapter21 chapter22 chapter24 config_standard/etc config_standard/etc/xinetd.d config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Jul 7 15:04:22 PDT 2005


Author: thomasp
Date: 2005-07-07 16:04:18 -0600 (Thu, 07 Jul 2005)
New Revision: 1928

Added:
   profiles/BLFS/trunk/chapter18/samba.xml
   profiles/BLFS/trunk/chapter21/apache.xml
   profiles/BLFS/trunk/chapter21/bind.xml
   profiles/BLFS/trunk/chapter21/nfs-utils.xml
   profiles/BLFS/trunk/chapter21/openssh.xml
   profiles/BLFS/trunk/chapter21/proftpd.xml
   profiles/BLFS/trunk/chapter21/samba.xml
   profiles/BLFS/trunk/chapter21/vsftpd.xml
   profiles/BLFS/trunk/chapter21/xinetd.xml
   profiles/BLFS/trunk/chapter22/courier.xml
   profiles/BLFS/trunk/chapter22/exim.xml
   profiles/BLFS/trunk/chapter22/postfix.xml
   profiles/BLFS/trunk/chapter22/qpopper.xml
   profiles/BLFS/trunk/chapter22/sendmail.xml
   profiles/BLFS/trunk/chapter24/dhcp.xml
   profiles/BLFS/trunk/chapter24/leafnode.xml
   profiles/BLFS/trunk/chapter24/openldap.xml
   profiles/BLFS/trunk/chapter24/rsync.xml
   profiles/BLFS/trunk/config_standard/etc/xinetd.d/
   profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat
   profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat_tunnel
Removed:
   profiles/BLFS/trunk/chapter18/nfs-utils.xml
   profiles/BLFS/trunk/chapter21/courier.xml
   profiles/BLFS/trunk/chapter21/exim.xml
   profiles/BLFS/trunk/chapter21/postfix.xml
   profiles/BLFS/trunk/chapter21/qpopper.xml
   profiles/BLFS/trunk/chapter21/sendmail.xml
   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/chapter24/apache.xml
   profiles/BLFS/trunk/chapter24/proftpd.xml
   profiles/BLFS/trunk/chapter24/vsftpd.xml
Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter08/aspell.xml
   profiles/BLFS/trunk/chapter11/pkgconfig.xml
   profiles/BLFS/trunk/chapter18/openssh.xml
   profiles/BLFS/trunk/config_standard/packages/ch10.ent
   profiles/BLFS/trunk/config_standard/packages/ch11.ent
   profiles/BLFS/trunk/config_standard/packages/ch18.ent
   profiles/BLFS/trunk/config_standard/packages/ch19.ent
   profiles/BLFS/trunk/config_standard/packages/ch20.ent
   profiles/BLFS/trunk/config_standard/packages/ch21.ent
   profiles/BLFS/trunk/config_standard/packages/ch22.ent
   profiles/BLFS/trunk/config_standard/packages/ch24.ent
   profiles/BLFS/trunk/wget/chapter10.urls
   profiles/BLFS/trunk/wget/chapter18.urls
   profiles/BLFS/trunk/wget/chapter19.urls
   profiles/BLFS/trunk/wget/chapter20.urls
   profiles/BLFS/trunk/wget/chapter21.urls
   profiles/BLFS/trunk/wget/chapter22.urls
   profiles/BLFS/trunk/wget/chapter24.urls
Log:
* Added install of wrapper scripts for aspell
* Reorganized server sections to match book
* Package upgrades:
 - imagemagick-6.2.3-3
 - pkgconfig-0.18
 - ncftp-3.1.9
 - openssh-4.1p1
 - rsync-2.6.5
 - CVS-1.11.20
 - subversion-1.1.4
 - whois-4.7.5
 - ethereal-0.10.11
 - nail-11.22
 - pine-4.63
 - apache-2.0.54
 - bind-9.3.1
 - nfs-utils-1.0.7
 - samba-3.0.14a (added new client only install also)
 - vsftpd-2.0.3



Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/BLFS.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -191,19 +191,19 @@
       <xi:include href="chapter17/w3m.xml" />
     </stage>
     <stage name="Chapter 18 (Basic Networking Programs)">
+      <xi:include href="chapter18/cvs.xml" />
+      <xi:include href="chapter18/inetutils.xml" />
       <xi:include href="chapter18/ncftp.xml" />
+      <xi:include href="chapter18/ncpfs.xml" />
+      <xi:include href="chapter18/net-tools.xml" />
+      <xi:include href="chapter18/ntp.xml" />
       <xi:include href="chapter18/openssh.xml" />
+      <xi:include href="chapter18/portmap.xml" />
       <xi:include href="chapter18/rsync.xml" />
-      <xi:include href="chapter18/cvs.xml" />
+      <xi:include href="chapter18/samba.xml" />
       <xi:include href="chapter18/subversion.xml" />
+      <xi:include href="chapter18/tcpwrappers.xml" />
       <xi:include href="chapter18/wget.xml" />
-      <xi:include href="chapter18/tcpwrappers.xml" />
-      <xi:include href="chapter18/portmap.xml" />
-      <xi:include href="chapter18/inetutils.xml" />
-      <xi:include href="chapter18/nfs-utils.xml" />
-      <xi:include href="chapter18/ncpfs.xml" />
-      <xi:include href="chapter18/ntp.xml" />
-      <xi:include href="chapter18/net-tools.xml" />
     </stage>
     <stage name="Chapter 19 (Basic Networking Utilities)">
       <xi:include href="chapter19/traceroute.xml" />
@@ -220,32 +220,33 @@
       <xi:include href="chapter20/pine.xml" />
       <xi:include href="chapter20/slrn.xml" />
     </stage>
-    <stage name="Chapter 21 (Mail Server Software)">
-      <xi:include href="chapter21/postfix.xml" />
-      <xi:include href="chapter21/sendmail.xml" />
-      <xi:include href="chapter21/exim.xml" />
-      <xi:include href="chapter21/qpopper.xml" />
-      <xi:include href="chapter21/courier.xml" />
+    <stage name="Chapter 21 (Major Servers)">
+      <xi:include href="chapter21/apache.xml" />
+      <xi:include href="chapter21/bind.xml" />
+      <xi:include href="chapter21/nfs-utils.xml" />
+      <xi:include href="chapter21/openssh.xml" />
+      <xi:include href="chapter21/proftpd.xml" />
+      <xi:include href="chapter21/samba.xml" />
+      <xi:include href="chapter21/vsftpd.xml" />
+      <xi:include href="chapter21/xinetd.xml" />
     </stage>
-    <stage name="Chapter 22 (Other Server Software)">
-      <xi:include href="chapter22/bind.xml" />
-      <xi:include href="chapter22/dhcp.xml" />
-      <xi:include href="chapter22/leafnode.xml" />
-      <xi:include href="chapter22/openssh.xml" />
-      <xi:include href="chapter22/rsync.xml" />
-      <xi:include href="chapter22/openldap.xml" />
-      <xi:include href="chapter22/samba.xml" />
-      <xi:include href="chapter22/xinetd.xml" />
+    <stage name="Chapter 22 (Mail Server Software)">
+      <xi:include href="chapter22/courier.xml" />
+      <xi:include href="chapter22/exim.xml" />
+      <xi:include href="chapter22/postfix.xml" />
+      <xi:include href="chapter22/qpopper.xml" />
+      <xi:include href="chapter22/sendmail.xml" />
     </stage>
     <stage name="Chapter 23 (Databases)">
       <xi:include href="chapter23/db.xml" />
       <xi:include href="chapter23/mysql.xml" />
       <xi:include href="chapter23/postgresql.xml" />
     </stage>
-    <stage name="Chapter 24 (Web serving)">
-      <xi:include href="chapter24/apache.xml" />
-      <xi:include href="chapter24/proftpd.xml" />
-      <xi:include href="chapter24/vsftpd.xml" />
+    <stage name="Chapter 24 (Other Server Software)">
+      <xi:include href="chapter24/dhcp.xml" />
+      <xi:include href="chapter24/leafnode.xml" />
+      <xi:include href="chapter24/openldap.xml" />
+      <xi:include href="chapter24/rsync.xml" />
     </stage>
     <stage name="Chapter 25 (X Window Environment)">
       <xi:include href="chapter25/xorg.xml" />

Modified: profiles/BLFS/trunk/chapter08/aspell.xml
===================================================================
--- profiles/BLFS/trunk/chapter08/aspell.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter08/aspell.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -35,6 +35,15 @@
       <make>
         <param>install</param>
       </make>
+      <copy>
+	<source>scripts/ispell</source>
+	<source>scripts/spell</source>
+	<destination>/usr/bin</destination>
+      </copy>
+      <permissions mode="755" base="/usr/bin">
+	<name>ispell</name>
+	<name>spell</name>
+      </permissions>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&aspell-directory;</remove>
@@ -43,6 +52,9 @@
   <package name="aspell-dictionary" version="&aspell-dict-version;">
     <packageinfo>
       <requires>
+	<name>aspell</name>
+      </requires>
+      <requires>
         <name>which</name>
       </requires>
     </packageinfo>

Modified: profiles/BLFS/trunk/chapter11/pkgconfig.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/pkgconfig.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter11/pkgconfig.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -23,6 +23,11 @@
       <stageinfo>
         <base>&build_dir;/&pkgconfig-directory;</base>
       </stageinfo>
+      <execute command="sed">
+	<param>-i</param>
+	<param>'s:pkg_failed=yes]):&\nelse:'</param>
+	<param>pkg.m4</param>
+      </execute>
       <configure>
         <param>--prefix=/usr</param>
       </configure>

Deleted: profiles/BLFS/trunk/chapter18/nfs-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/nfs-utils.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter18/nfs-utils.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="nfs-utils" version="&nfs-utils-version;">
-    <packageinfo>
-      <requires>
-        <name>portmap</name>
-      </requires>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&nfs-utils-md5;</digest>
-	<archive>&packages_dir;/&nfs-utils-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group nogroup > /dev/null || groupadd">
-        <param>-g 65534</param>
-        <param>nogroup</param>
-      </execute>
-      <execute command="getent passwd nobody > /dev/null || useradd">
-        <param>-c nobody</param>
-        <param>-d /home</param>
-        <param>-g nogroup</param>
-        <param>-s /bin/bash</param>
-        <param>-u 65534</param>
-        <param>nobody</param>
-      </execute>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&nfs-utils-directory;</base>
-      </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-        <param>--sysconfdir=/etc</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-nfs-server</param>
-      </make>
-      <copy>
-        <source>&blfs-config;/etc/sysconfig/nfs-server</source>
-        <destination>/etc/sysconfig/nfs-server</destination>
-      </copy>
-      <make>
-        <param>install-nfs-client</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&nfs-utils-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Modified: profiles/BLFS/trunk/chapter18/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/openssh.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter18/openssh.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -35,8 +35,14 @@
 	<name>net-tools</name>
       </utilizes>
       <utilizes>
+	<name>sysstat</name>
+      </utilizes>
+      <utilizes>
       	<name>opensc</name>
       </utilizes>
+      <utilizes>
+	<name>libedit</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -64,6 +70,7 @@
         <param>--sysconfdir=/etc/ssh</param>
         <param>--libexecdir=/usr/sbin</param>
         <param>--with-md5-passwords</param>
+	<param>--with-privsep-path=/var/lib/sshd</param>
       </configure>
       <make />
       <make>

Added: profiles/BLFS/trunk/chapter18/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/samba.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter18/samba.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+  <package name="samba" version="&samba-version;">
+    <packageinfo>
+      <utilizes>
+	<name>popt</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>cups</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>libxml2</name>
+      </utilizes>
+      <utilizes>
+	<name>mysql</name>
+      </utilizes>
+      <utilizes>
+	<name>postgresql</name>
+      </utilizes>
+      <utilizes>
+	<name>python</name>
+      </utilizes>
+      <utilizes>
+	<name>xinetd</name>
+      </utilizes>
+      <utilizes>
+	<name>valgrind</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&samba-md5;</digest>
+	<archive>&packages_dir;/&samba-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </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>
+      <move>
+	<source>/usr/lib/samba/libsmbclient.so</source>
+	<destination>/usr/lib</destination>
+      </move>
+      <link>
+	<option>force</option>
+	<target>../libsmbclient.so</target>
+	<name>/usr/lib/samba</name>
+      </link>
+      <permissions mode="644">
+	<name>/usr/include/libsmbclient.h</name>
+	<name>/usr/lib/samba/libsmbclient.a</name>
+      </permissions>
+      <copy>
+        <source>nsswitch/libnss_wins.so</source>
+	<source>nsswitch/libnss_winbind.so</source>
+        <destination>/lib</destination>
+      </copy>
+      <permissions mode="0755" base="/lib">
+        <name>libnss_wins.so</name>
+	<name>libnss_windbind.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>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&samba-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter21/apache.xml (from rev 1877, profiles/BLFS/trunk/chapter24/apache.xml)
===================================================================
--- profiles/BLFS/trunk/chapter24/apache.xml	2005-05-01 23:38:49 UTC (rev 1877)
+++ profiles/BLFS/trunk/chapter21/apache.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<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>
+      <utilizes>
+	<name>doxygen</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&apache-md5;</digest>
+	<archive>&packages_dir;/&apache-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group apache > /dev/null || groupadd">
+      	<param>-g 25</param>
+        <param>apache</param>
+      </execute>
+      <execute command="getent passwd apache > /dev/null || useradd">
+        <param>-c "Apache Server"</param>
+        <param>-d /dev/null</param>
+        <param>-g apache</param>
+        <param>-s /bin/false</param>
+	<param>-u 25</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=FHS</param>
+        <param>--enable-mods-shared=all</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <ownership user="root" group="root">
+	<name>/usr/sbin/apxs</name>
+	<name>/usr/sbin/apachectl</name>
+	<name>/usr/sbin/dbmmanage</name>
+	<name>/usr/sbin/envvars-std</name>
+	<name>/usr/sbin/envvars</name>
+	<name>/usr/include/apache/*</name>
+	<name>/usr/lib/apache/httpd.exp</name>
+	<name>/usr/share/man/man1/dbmmanage.1</name>
+	<name>/usr/share/man/man1/htdigest.1</name>
+	<name>/usr/share/man/man1/htpasswd.1</name>
+	<name>/usr/share/man/man8/ab.8</name>
+	<name>/usr/share/man/man8/apachectl.8</name>
+	<name>/usr/share/man/man8/apxs.8</name>
+	<name>/usr/share/man/man8/httpd.8</name>
+	<name>/usr/share/man/man8/logresolve.8</name>
+	<name>/usr/share/man/man8/rotatelogs.8</name>
+	<name>/usr/share/man/man8/suexec.8</name>
+      </ownership>
+      <ownership user="apache" group="apache">
+	<option>recursive</option>
+	<name>/srv/www</name>
+      </ownership>
+    </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>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&apache-directory;</remove>
+    </stage>
+  </package>
+</alfs>
+

Copied: profiles/BLFS/trunk/chapter21/bind.xml (from rev 1876, profiles/BLFS/trunk/chapter22/bind.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter21/bind.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY % package_entities_extra SYSTEM "../config/packages/ch43.ent">
+%package_entities_extra;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="bind" version="&bind-version;">
+    <packageinfo>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+      	<name>net-tools</name>
+      </utilizes>
+      <utilizes>
+	<name>Net-DNS</name>
+      </utilizes>
+      <utilizes>
+	<name>openjade</name>
+      </utilizes>
+      <utilizes>
+	<name>jadetex</name>
+      </utilizes>
+      <utilizes>
+	<name>docbook-dsssl</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&bind-md5;</digest>
+	<archive>&packages_dir;/&bind-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group named > /dev/null || groupadd">
+      	<param>-g 20</param>
+        <param>named</param>
+      </execute>
+      <execute command="getent passwd named > /dev/null || useradd">
+        <param>-c "BIND Owner"</param>
+        <param>-m</param>
+        <param>-g named</param>
+        <param>-s /bin/false</param>
+	<param>-u 20</param>
+        <param>named</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&bind-directory;</base>
+      </stageinfo>
+      <search_replace>
+        <file>configure</file>
+        <find>dsssl-stylesheets</find>
+        <replace>dsssl-stylesheets-&docbook-dsssl-version;</replace>
+      </search_replace>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+	<param>--enable-threads</param>
+	<param>--with-libtool</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="755" base="/usr/lib">
+	<name>libbind9.so.*</name>
+	<name>libisc.so.*</name>
+	<name>libisccc.so.*</name>
+	<name>libisccfg.so.*</name>
+	<name>liblwres.so.*</name>
+	<name>libdns.so.*</name>
+      </permissions>
+      <move base="/usr/share/man">
+	<source>man8/named.conf</source>
+	<destination>man5</destination>
+      </move>
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/share/doc/bind-&bind-version;</name>
+      </mkdir>
+      <mkdir base="/usr/share/doc/bind-&bind-version;">
+	<option>parents</option>
+	<name>arm</name>
+	<name>draft</name>
+	<name>misc</name>
+	<name>rfc</name>
+      </mkdir>
+      <copy base="&build_dir;/&bind-directory;/doc">
+	<source>arm/*.html</source>
+	<destination>/usr/share/doc/bind-&bind-version;/arm</destination>
+      </copy>
+      <copy base="&build_dir;/&bind-directory;/doc">
+	<source>draft/*.txt</source>
+	<destination>/usr/share/doc/bind-&bind-version;/draft</destination>
+      </copy>
+      <copy base="&build_dir;/&bind-directory;/doc">
+	<source>rfc/*</source>
+	<destination>/usr/share/doc/bind-&bind-version;/rfc</destination>
+      </copy>
+      <copy base="&build_dir;/&bind-directory;/doc">
+	<source>misc/dnssec</source>
+	<source>misc/ipv6</source>
+	<source>misc/migrat*</source>
+	<source>misc/options</source>
+	<source>misc/rfc-compliance</source>
+	<source>misc/roadmap</source>
+	<source>misc/sdb</source>
+	<destination>/usr/share/doc/bind-&bind-version;/misc</destination>
+      </copy>
+    </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">
+      <copy base="&blfs-config;">
+	<source>home/named/etc/named.conf</source>
+	<destination>/home/named/etc</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>etc/rndc.conf</source>
+	<destination>/etc</destination>
+      </copy>
+      <execute command="rndc-confgen">
+	<param>-a -b 512</param>
+	<param>-c key.tmp</param>
+      </execute>
+      <execute command="sed">
+	<param>-i -s "s, at rndc-key@,$(cat key.tmp | grep -m 1 "secret" | cut -d '"' -f 2),"</param>
+	<param>/home/named/etc/named.conf</param>
+	<param>/etc/rndc.conf</param>
+      </execute>
+      <copy base="&blfs-config;">
+	<source>home/named/etc/namedb/pz/127.0.0</source>
+	<destination>/home/named/etc/namedb/pz</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>home/named/etc/namedb/root.hints</source>
+	<destination>/home/named/etc/namedb</destination>
+      </copy>
+      <copy base="/etc">
+        <source>resolv.conf</source>
+        <destination>resolv.conf.bak</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>etc/resolv.conf</source>
+	<destination>/etc/resolv.conf</destination>
+      </copy>
+      <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>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&bind-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter21/courier.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/courier.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter21/courier.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-]>
-<alfs>
-  <package name="courier" version="&courier-version;">
-    <packageinfo>
-      <requires>
-        <name>gdbm</name>
-      </requires>
-      <utilizes>
-	<name>mysql</name>
-      </utilizes>
-      <utilizes>
-	<name>postresql</name>
-      </utilizes>
-      <utilizes>
-	<name>linuxpam</name>
-      </utilizes>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-	<name>libfam</name>
-      </utilizes>
-      <utilizes>
-	<name>openldap</name>
-      </utilizes>
-      <utilizes>
-	<name>apache</name>
-      </utilizes>
-      <utilizes>
-	<name>aspell</name>
-      </utilizes>
-      <utilizes>
-	<name>ispell</name>
-      </utilizes>
-      <utilizes>
-	<name>gnupg</name>
-      </utilizes>
-      <utilizes>
-	<name>expect</name>
-      </utilizes>
-      <utilizes>
-	<name>&ghostscript-impl;</name>
-      </utilizes>
-      <utilizes>
-	<name>netbpm</name>
-      </utilizes>
-      <utilizes>
-	<name>mgetty+sendfax</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking.">
-      <unpack>
-        <digest>&courier-md5;</digest>
-	<archive>&packages_dir;/&courier-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Creating user and group">
-      <execute command="getent group courier > /dev/null || groupadd">
-        <param>-f</param>
-        <param>courier</param>
-      </execute>
-      <execute command="getent passwd courier > /dev/null || useradd">
-        <param>-c 'Courier Mail Server'</param>
-        <param>-d /dev/null</param>
-        <param>-g courier</param>
-        <param>-s /bin/false</param>
-        <param>courier</param>
-      </execute>
-      <execute command="getent passwd bin > /dev/null || useradd">
-        <param>-c bin</param>
-        <param>-d /dev/null</param>
-        <param>-g bin</param>
-        <param>-u 1</param>
-        <param>bin</param>
-      </execute>
-    </stage>
-    <stage name="Installing.">
-      <stageinfo>
-        <base>&build_dir;/&courier-directory;</base>
-      </stageinfo>
-      <mkdir>
-        <option>parents</option>
-        <name>/var/run/courier</name>
-      </mkdir>
-      <ownership user="courier" group="courier">
-        <name>/var/run/courier</name>
-      </ownership>
-      <mkdir>
-        <option>parents</option>
-        <name>/var/lock/subsys</name>
-      </mkdir>
-      <ownership user="root" group="root">
-        <name>/var/lock/subsys</name>
-      </ownership>
-      <configure>
-        <param>--prefix=/usr</param>
-        <param>--libexecdir=/usr/lib/courier</param>
-        <param>--datadir=/usr/share/courier</param>
-        <param>--sysconfdir=/etc/courier</param>
-        <param>--localstatedir=/var/lib/courier</param>
-        <param>--with-piddir=/var/run/courier</param>
-        <param>--disable-root-check</param>
-        <param>--with-mailuser=courier</param>
-        <param>--with-mailgroup=courier</param>
-        <param>--with-paranoid-smtpext</param>
-        <param>--disable-autorenamesent</param>
-        <param>--enable-workarounds-for-imap-client-bugs</param>
-        <param>--with-db=gdbm</param>
-        <param>--with-ispell=/usr/bin/aspell</param>
-        <param>--enable-mimetypes</param>
-      </configure>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <make>
-        <param>install-configure</param>
-      </make>
-    </stage>
-    <stage name="Cleanup.">
-      <remove>&build_dir;/&courier-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Deleted: profiles/BLFS/trunk/chapter21/exim.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/exim.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter21/exim.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="exim" version="&exim-version;">
-    <packageinfo>
-      <requires>
-        <name>db</name>
-      </requires>
-      <utilizes>
-	<name>&ximpl;</name>
-      </utilizes>
-      <utilizes>
-	<name>openldap</name>
-      </utilizes>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-	<name>cyrus-sasl</name>
-      </utilizes>
-      <utilizes>
-	<name>mysql</name>
-      </utilizes>
-      <utilizes>
-	<name>postgresql</name>
-      </utilizes>
-      <utilizes>
-	<name>tcpwrappers</name>
-      </utilizes>
-      <utilizes>
-	<name>linuxpam</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking.">
-      <unpack>
-        <digest>&exim-md5;</digest>
-	<archive>&packages_dir;/&exim-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group exim > /dev/null || groupadd">
-        <param>exim</param>
-      </execute>
-      <execute command="getent passwd exim > /dev/null || useradd">
-        <param>-c exim</param>
-        <param>-d /dev/null</param>
-        <param>-g exim</param>
-        <param>-s /bin/false</param>
-        <param>exim</param>
-      </execute>
-    </stage>
-    <stage name="Patching">
-      <stageinfo>
-	<base>&build_dir;/&exim-directory;</base>
-      </stageinfo>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&exim-db43-patch;</param>
-      </patch>
-    </stage>
-    <stage name="Installing.">
-      <stageinfo>
-        <base>&build_dir;/&exim-directory;</base>
-      </stageinfo>
-      <copy>
-        <source>src/EDITME</source>
-	<destination>Local/Makefile</destination>
-      </copy>
-      <textdump mode="append">
-        <file>Local/Makefile</file>
-	<content>
-	=BIN_DIRECTORY=/usr/sbin
-	=CONFIGURE_FILE=/etc/exim.conf
-	=EXIM_USER=exim
-	=EXIM_MONITOR=
-	</content>
-      </textdump>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <copy>
-        <source>doc/exim.8</source>
-        <destination>/usr/share/man/man8</destination>
-      </copy>
-      <mkdir>
-	<option>parents</option>
-	<name>/usr/share/doc/exim-&exim-version;</name>
-      </mkdir>
-      <copy>
-	<source>doc/*</source>
-	<destination>/usr/share/doc/exim-&exim-version;</destination>
-      </copy>
-      <link>
-        <option>force</option>
-        <target>exim</target>
-        <name>/usr/sbin/sendmail</name>
-      </link>
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-exim</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup.">
-      <remove>&build_dir;/&exim-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter21/nfs-utils.xml (from rev 1876, profiles/BLFS/trunk/chapter18/nfs-utils.xml)
===================================================================
--- profiles/BLFS/trunk/chapter18/nfs-utils.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter21/nfs-utils.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="nfs-utils" version="&nfs-utils-version;">
+    <packageinfo>
+      <requires>
+        <name>portmap</name>
+      </requires>
+      <utilizes>
+	<name>libevent</name>
+      </utilizes>
+      <utilizes>
+	<name>libnsfidmap</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&nfs-utils-md5;</digest>
+	<archive>&packages_dir;/&nfs-utils-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group nogroup > /dev/null || groupadd">
+        <param>-g 99</param>
+        <param>nogroup</param>
+      </execute>
+      <execute command="getent passwd nobody > /dev/null || useradd">
+        <param>-c "Unprivileged Nobody"</param>
+        <param>-d /dev/null</param>
+        <param>-g nogroup</param>
+        <param>-s /bin/false</param>
+        <param>-u 99</param>
+        <param>nobody</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&nfs-utils-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--sysconfdir=/etc</param>
+	<param>--disable-nfsv4</param>
+	<param>--disable-gss</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-nfs-server</param>
+      </make>
+      <copy>
+        <source>&blfs-config;/etc/sysconfig/nfs-server</source>
+        <destination>/etc/sysconfig/nfs-server</destination>
+      </copy>
+      <make>
+        <param>install-nfs-client</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&nfs-utils-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter21/openssh.xml (from rev 1870, profiles/BLFS/trunk/chapter22/openssh.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2005-04-28 19:56:25 UTC (rev 1870)
+++ profiles/BLFS/trunk/chapter21/openssh.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <stage name="OpenSSH Server">
+  <package name="openssh-server" version="&openssh-version;">
+    <packageinfo>
+      <requires>
+	<name>openssh</name>
+      </requires>
+    </packageinfo>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <mkdir>
+        <option>parents</option>
+        <name>/var/lib/sshd</name>
+      </mkdir>
+      <permissions mode="700">
+      	<name>/var/lib/sshd</name>
+      </permissions>
+      <ownership user="root" group="sys">
+        <name>/var/lib/sshd</name>
+      </ownership>
+      <execute command="getent group sshd > /dev/null || groupadd">
+	<param>-g 50</param>
+        <param>sshd</param>
+      </execute>
+      <execute command="getent passwd sshd > /dev/null || useradd">
+        <param>-c 'sshd PrivSep'</param>
+        <param>-d /var/lib/sshd</param>
+        <param>-g sshd</param>
+        <param>-s /bin/false</param>
+	<param>-u 50</param>
+        <param>sshd</param>
+      </execute>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-sshd</param>
+      </make>
+      <textdump mode="append">
+	<file>/etc/ssh/sshd_config</file>
+	<content>
+	  =PermitRootLogin no
+	</content>
+      </textdump>
+    </stage>
+    &bootscripts-clean;
+  </package>
+  </stage>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter21/postfix.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter21/postfix.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-<!ENTITY % files SYSTEM  "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="postfix" version="&postfix-version;">
-    <packageinfo>
-      <requires>
-        <name>db</name>
-      </requires>
-      <utilizes>
-	<name>pcre</name>
-      </utilizes>
-      <utilizes>
-	<name>mysql</name>
-      </utilizes>
-      <utilizes>
-	<name>postgresql</name>
-      </utilizes>
-      <utilizes>
-	<name>openldap</name>
-      </utilizes>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-	<name>cyrus-sasl</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&postfix-md5;</digest>
-	<archive>&packages_dir;/&postfix-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group postfix > /dev/null || groupadd">
-        <param>postfix</param>
-      </execute>
-      <execute command="getent group postdrop > /dev/null || groupadd">
-        <param>postdrop</param>
-      </execute>
-      <execute command="getent group nogroup > /dev/null || groupadd">
-        <param>-g 65534</param>
-        <param>nogroup</param>
-      </execute>
-      <execute command="getent passwd postfix > /dev/null || useradd">
-        <param>-c postfix</param>
-        <param>-d /dev/null</param>
-        <param>-g postfix</param>
-        <param>-s /bin/false</param>
-        <param>postfix</param>
-      </execute>
-      <execute command="getent passwd nobody > /dev/null || useradd">
-        <param>-c nobody</param>
-        <param>-d /home</param>
-        <param>-g nogroup</param>
-        <param>-s /bin/bash</param>
-        <param>-u 65534</param>
-        <param>nobody</param>
-      </execute>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&postfix-directory;</base>
-      </stageinfo>
-      <ownership user="postfix" group="postfix">
-        <name>/var/mail</name>
-      </ownership>
-      <make />
-      <execute command="sh">
-        <param>postfix-install</param>
-        <param>daemon_directory=/usr/sbin</param>
-        <param>manpage_directory=/usr/share/man</param>
-        <param>sample_directory=/usr/share/doc/postfix</param>
-        <param>-non-interactive</param>
-      </execute>
-      <mkdir>
-        <option>parents</option>
-        <name>/usr/share/doc/postfix</name>
-      </mkdir>
-      <copy>
-        <option>recursive</option>
-        <option>force</option>
-        <source>html/*</source>
-        <destination>/usr/share/doc/postfix</destination>
-      </copy>
-      <copy>
-      	<source>&blfs-config;/etc/aliases</source>
-	<destination>/etc</destination>
-      </copy>
-      <search_replace base="/etc/postfix">
-        <file>main.cf</file>
-        <find>#myhostname = host.domain.tld</find>
-        <replace>myhostname = &hostname;</replace>
-      </search_replace>
-      <execute command="/usr/bin/newaliases" />
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-postfix</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&postfix-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter21/proftpd.xml (from rev 1877, profiles/BLFS/trunk/chapter24/proftpd.xml)
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2005-05-01 23:38:49 UTC (rev 1877)
+++ profiles/BLFS/trunk/chapter21/proftpd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="proftpd" version="&proftpd-version;">
+    <packageinfo>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&proftpd-md5;</digest>
+	<archive>&packages_dir;/&proftpd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group proftpd > /dev/null || groupadd">
+      	<param>-g 46</param>
+        <param>proftpd</param>
+      </execute>
+      <execute command="getent passwd proftpd > /dev/null || useradd">
+        <param>-c proftpd</param>
+        <param>-d /home/ftp</param>
+        <param>-g proftpd</param>
+        <param>-s /usr/lib/proftpd/proftpdshell</param>
+	<param>-u 46</param>
+        <param>proftpd</param>
+      </execute>
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/lib/proftpd</name>
+      </mkdir>
+      <ownership user="proftpd" group="proftpd">
+	<name>/usr/lib/proftpd</name>
+      </ownership>
+      <permissions mode="775">
+	<name>/usr/lib/proftpd</name>
+      </permissions>
+      <link>
+	<option>force</option>
+	<target>/bin/false</target>
+	<name>/usr/lib/proftpd/proftpdshell</name>
+      </link>
+      <textdump mode="append">
+	<file>/etc/shells</file>
+	<content>
+	  =/usr/lib/proftpd/proftpdshell
+	</content>
+      </textdump>
+    </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/run</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>
+      <copy base="&blfs-config;/etc">
+	<source>proftpd.conf</source>
+	<destination>/etc</destination>
+      </copy>
+      </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&proftpd-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter21/qpopper.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/qpopper.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter21/qpopper.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-]>
-<alfs>
-  <package name="qpopper" version="&qpopper-version;">
-    <packageinfo>
-      <requires>
-        <name>&mta-impl;</name>
-      </requires>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-	<name>gdbm</name>
-      </utilizes>
-      <utilizes>
-	<name>linuxpam</name>
-      </utilizes>
-      <utilizes>
-	<name>&krb-impl;</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&qpopper-md5;</digest>
-	<archive>&packages_dir;/&qpopper-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&qpopper-directory;</base>
-      </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-      </configure>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <textdump mode="append">
-        <file>/etc/inetd.conf</file>
-        <content>=pop stream tcp nowait root /usr/sbin/popper popper</content>
-      </textdump>
-      <execute command="killall inetd || inetd" />
-      <textdump mode="append">
-        <file>/etc/syslog.conf</file>
-        <content>=local0.notice;local0.debug /var/log/POP.log</content>
-      </textdump>
-      <execute command="/etc/rc.d/init.d/sysklogd restart" />
-      <textdump mode="append">
-        <file>/etc/xinetd.conf</file>
-        <content>
-	  = service pop
-	  = {
-	  =   port = 110
-	  =   socket_type = stream
-	  =   protocol = tcp
-	  =   wait = no
-	  =   user = root
-	  =   server = /usr/sbin/popper
-	  = }
-	</content>
-      </textdump>
-    </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&qpopper-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter21/samba.xml (from rev 1886, profiles/BLFS/trunk/chapter22/samba.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/samba.xml	2005-05-02 00:43:23 UTC (rev 1886)
+++ profiles/BLFS/trunk/chapter21/samba.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <stage name="Samba Server">
+    <package name="samba-server" version="&samba-version;">
+      <packageinfo>
+	<requires>
+	  <name>samba</name>
+	</requires>
+	<requires>
+	  <name>stunnel</name>
+	</requires>
+      </packageinfo>
+      &bootscripts-get;
+      <stage name="Configuration">
+	<!-- SWAT configuration with stunnel (default) -->
+	<textdump mode="append">
+	  <file>/etc/services</file>
+	  <content>
+	    =swat		901/tcp
+	    =swat_tunnel	902/tcp
+	  </content>
+	</textdump>
+	<textdump mode="append">
+	  <file>/etc/inetd.conf</file>
+	  <content>
+	    =swat_tunnel stream tcp nowait.400 root /usr/sbin/swat swat
+	  </content>
+	</textdump>
+	<copy base="&blfs-config;/etc/xinetd.d">
+	  <source>swat_tunnel</source>
+	  <destination>/etc/xinetd.d</destination>
+	</copy>
+	<textdump mode="append">
+	  <file>/etc/stunnel/stunnel.conf</file>
+	  <content>
+	    =[swat]
+	    =accept = 901
+	    =connect = 902
+	  </content>
+	</textdump>
+	<execute command="/etc/rc.d/init.d/stunnel restart" />
+	<!-- SWAT configuration without stunnel (not default) -->
+	<!--
+	<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>
+	<copy base="&blfs-config;/etc/xinetd.d">
+	  <source>swat</source>
+	  <destination>/etc/xinetd.d</destination>
+	</copy>
+	-->
+      </stage>
+      <stage name="Creating user and group">
+	<execute command="getent group nogroup > /dev/null || groupadd">
+	  <param>-g 99</param>
+	  <param>nogroup</param>
+	</execute>
+	<execute command="genent passwd nobody > /dev/null || useradd">
+	  <param>-c "Unprivileged Nobody"</param>
+	  <param>-d /dev/null</param>
+	  <param>-g nogroup</param>
+	  <param>-s /bin/false</param>
+	  <param>-u 99</param>
+	  <param>nobody</param>
+	</execute>
+      </stage>
+      <stage name="Installing bootscripts">
+	<stageinfo>
+	  <base>&build_dir;/&blfs-bootscripts-directory;</base>
+	</stageinfo>
+	<make>
+	  <param>install-samba</param>
+	  <param>install-winbind</param>
+	</make>
+      </stage>
+      &bootscripts-clean;
+    </package>
+  </stage>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter21/sendmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter21/sendmail.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-<!ENTITY % files SYSTEM  "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="sendmail" version="&sendmail-version;">
-    <packageinfo>
-      <requires>
-        <name>db</name>
-      </requires>
-      <requires>
-        <name>procmail</name>
-      </requires>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-	<name>openldap</name>
-      </utilizes>
-      <utilizes>
-	<name>tcpwrappers</name>
-      </utilizes>
-      <utilizes>
-	<name>pcre</name>
-      </utilizes>
-      <utilizes>
-	<name>cyrus-sasl</name>
-      </utilizes>
-      <utilizes>
-	<name>nph</name>
-      </utilizes>
-      <utilizes>
-	<name>&ghostscript-impl;</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking.">
-      <unpack>
-        <digest>&sendmail-md5;</digest>
-	<archive>&packages_dir;/&sendmail-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group smmsp > /dev/null || groupadd">
-        <param>smmsp</param>
-      </execute>
-      <execute command="getent group mail > /dev/null || groupadd">
-        <param>mail</param>
-      </execute>
-      <execute command="getent passwd smmsp > /dev/null || useradd">
-        <param>-g smmsp</param>
-        <param>-G mail</param>
-        <param>-s /bin/false</param>
-        <param>smmsp</param>
-      </execute>
-    <permissions mode="1777">
-      <name>/var/mail</name>
-    </permissions>
-    <mkdir>
-      <name>/var/spool/mqueue</name>
-    </mkdir>
-    </stage>
-    <stage name="Installing.">
-      <stageinfo>
-        <base>&build_dir;/&sendmail-directory;</base>
-      </stageinfo>
-      <textdump>
-        <file>devtools/Site/site.config.m4</file>
-        <content>
-	  =define(`confMANGRP',`root')
-	  =define(`confMANOWN',`root')
-	  =define(`confSBINGRP',`root')
-	  =define(`confUBINGRP',`root')
-	  =define(`confUBINOWN',`root')
-	</content>
-      </textdump>
-      <execute base="&build_dir;/&sendmail-directory;/sendmail" command="sh Build" />
-      <copy base="&build_dir;/&sendmail-directory;/cf/cf">
-        <source>generic-linux.mc</source>
-        <destination>sendmail.mc</destination>
-      </copy>
-      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build">
-        <param>sendmail.cf</param>
-      </execute>
-      <mkdir>
-        <option>parents</option>
-        <name>/etc/mail</name>
-      </mkdir>
-      <permissions mode="755">
-        <name>/etc/mail</name>
-      </permissions>
-      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build install-cf" />
-      <execute command="sh Build install" />
-      <copy>
-        <option>recursive</option>
-        <source>cf/*</source>
-        <destination>/etc/mail</destination>
-      </copy>
-      <copy>
-        <source>cf/cf/submit.mc</source>
-        <source>cf/cf/sendmail.mc</source>
-        <destination>/etc/mail</destination>
-      </copy>
-      <copy>
-      	<source>sendmail/sendmail.8</source>
-	<source>editmap/editmap.8</source>
-	<source>mailstats/mailstats.8</source>
-	<source>makemap/makemap.8</source>
-	<source>praliases/praliases.8</source>
-	<source>smrsh/smrsh.8</source>
-	<destination>/usr/share/man/man8</destination>
-      </copy>
-      <copy>
-	<source>sendmail/aliases.5</source>
-	<destination>/usr/share/man/man5</destination>
-      </copy>
-      <copy>
-	<source>sendmail/mailq.1</source>
-	<source>sendmail/newaliases.1</source>
-	<source>vacation/vacation.1</source>
-	<destination>/usr/share/man/man1</destination>
-      </copy>
-      <search_replace base="&build_dir;/&sendmail-directory;/doc/op">
-	<file>Makefile</file>
-	<find>groff</find>
-	<replace>GROFF_NO_SGR=1 groff</replace>
-      </search_replace>
-      <make>
-	<param>op.txt</param>
-      </make>
-      <mkdir> 
-	<option>parents</option>
-	<name>/usr/share/doc/sendmail/&sendmail-version;</name>
-      </mkdir>
-      <copy>
-	<source>op.ps</source>
-	<source>op.txt</source>
-	<destination>/usr/share/doc/sendmail/&sendmail-version;</destination>
-      </copy>
-      <execute command="echo `hostname` > /etc/mail/local-host-names" />
-      <copy>
-	<source>&blfs-config;/etc/mail/aliases</source>
-	<destination>/etc/mail</destination>
-      </copy>
-      <execute command="newaliases -v" />
-      <execute base="/etc/mail" command="m4 m4/cf.m4 sendmail.mc > sendmail.cf" />
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-sendmail</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup.">
-      <remove>&build_dir;/&sendmail-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter21/vsftpd.xml (from rev 1877, profiles/BLFS/trunk/chapter24/vsftpd.xml)
===================================================================
--- profiles/BLFS/trunk/chapter24/vsftpd.xml	2005-05-01 23:38:49 UTC (rev 1877)
+++ profiles/BLFS/trunk/chapter21/vsftpd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="vsftpd" version="&vsftpd-version;">
+    <packageinfo>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>tcpwrappers</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+	<digest>&vsftpd-md5;</digest>
+	<archive>&packages_dir;/&vsftpd-package;</archive>
+	<destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get; 
+    <stage name="Creating user and group">
+      <mkdir>
+	<option>parents</option>
+	<name>/var/ftp/empty</name>
+	<name>/home/ftp</name>
+      </mkdir>
+      <execute command="getent group vsftpd > /dev/null || groupadd">
+	<param>-g 47</param>
+	<param>vsftpd</param>
+      </execute>
+      <execute command="getent passwd vsftpd > /dev/null || useradd">
+	<param>-c "vsFTPD User"</param>
+	<param>-d /dev/null</param>
+	<param>-g vsftpd</param>
+	<param>-s /bin/false</param>
+	<param>-u 47</param>
+	<param>vsftpd</param>
+      </execute>
+      <execute command="getent group ftp > /dev/null || groupadd">
+	<param>-g 45</param>
+	<param>ftp</param>
+      </execute>
+      <execute command="getent passwd ftp > /dev/null || useradd">
+	<param>-c anonymous_user</param>
+	<param>-d /home/ftp</param>
+	<param>-g ftp</param>
+	<param>-s /bin/false</param>
+	<param>-u 45</param>
+	<param>ftp</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+	<base>&build_dir;/&vsftpd-directory;</base>
+      </stageinfo>
+      <make />
+      <copy>
+	<source>vsftpd</source>
+	<destination>/usr/sbin</destination>
+      </copy>
+      <permissions mode="755">
+	<name>/usr/sbin/vsftpd</name>
+      </permissions>
+      <copy>
+	<source>vsftpd.8</source>
+	<destination>/usr/share/man/man8</destination>
+      </copy>
+      <copy>
+	<source>vsftpd.conf.5</source>
+	<destination>/usr/share/man/man5</destination>
+      </copy>
+      <copy>
+	<source>vsftpd.conf</source>
+	<destination>/etc</destination>
+      </copy>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+	<base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+	<param>install-vsftpd</param>
+      </make>
+      <textdump mode="append" base="/etc">
+	<file>vsftpd.conf</file>
+	<content>
+	  =background=YES 
+	  =listen=YES 
+	  =nopriv_user=vsftpd 
+	  =secure_chroot_dir=/var/ftp/empty
+	</content>
+      </textdump>
+    </stage>
+    &bootscripts-clean; 
+    <stage name="Cleanup">
+      <remove>&build_dir;/&vsftpd-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter21/xinetd.xml (from rev 1876, profiles/BLFS/trunk/chapter22/xinetd.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/xinetd.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter21/xinetd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch21.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="xinetd" version="&xinetd-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&xinetd-md5;</digest>
+	<archive>&packages_dir;/&xinetd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <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>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&xinetd-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter22/bind.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/bind.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY % package_entities_extra SYSTEM "../config/packages/ch43.ent">
-%package_entities_extra;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="bind" version="&bind-version;">
-    <packageinfo>
-      <utilizes>
-	<name>openssl</name>
-      </utilizes>
-      <utilizes>
-      	<name>net-tools</name>
-      </utilizes>
-      <utilizes>
-	<name>Net-DNS</name>
-      </utilizes>
-      <utilizes>
-	<name>openjade</name>
-      </utilizes>
-      <utilizes>
-	<name>jadetex</name>
-      </utilizes>
-      <utilizes>
-	<name>docbook-dsssl</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&bind-md5;</digest>
-	<archive>&packages_dir;/&bind-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group named > /dev/null || groupadd">
-        <param>named</param>
-      </execute>
-      <execute command="getent passwd named > /dev/null || useradd">
-        <param>-c "BIND Owner"</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>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&bind-patch;</param>
-      </patch>
-      <search_replace>
-        <file>configure</file>
-        <find>dsssl-stylesheets</find>
-        <replace>dsssl-stylesheets-&docbook-dsssl-version;</replace>
-      </search_replace>
-      <configure>
-        <param>--prefix=/usr</param>
-        <param>--sysconfdir=/etc</param>
-	<param>--enable-threads</param>
-	<param>--with-libtool</param>
-      </configure>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <permissions mode="755" base="/usr/lib">
-	<name>libbind9.so.*</name>
-	<name>libisc.so.*</name>
-	<name>libisccc.so.*</name>
-	<name>libisccfg.so.*</name>
-	<name>liblwres.so.*</name>
-	<name>libdns.so.20.0.0</name>
-      </permissions>
-      <move base="/usr/share/man">
-	<source>man8/named.conf</source>
-	<destination>man5</destination>
-      </move>
-      <mkdir>
-	<option>parents</option>
-	<name>/usr/share/doc/bind-&bind-version;</name>
-      </mkdir>
-      <mkdir base="/usr/share/doc/bind-&bind-version;">
-	<option>parents</option>
-	<name>arm</name>
-	<name>draft</name>
-	<name>misc</name>
-	<name>rfc</name>
-      </mkdir>
-      <copy base="&build_dir;/&bind-directory;/doc">
-	<source>arm/*.html</source>
-	<destination>/usr/share/doc/bind-&bind-version;/arm</destination>
-      </copy>
-      <copy base="&build_dir;/&bind-directory;/doc">
-	<source>draft/*.txt</source>
-	<destination>/usr/share/doc/bind-&bind-version;/draft</destination>
-      </copy>
-      <copy base="&build_dir;/&bind-directory;/doc">
-	<source>rfc/*</source>
-	<destination>/usr/share/doc/bind-&bind-version;/rfc</destination>
-      </copy>
-      <copy base="&build_dir;/&bind-directory;/doc">
-	<source>misc/dnssec</source>
-	<source>misc/ipv6</source>
-	<source>misc/migrat*</source>
-	<source>misc/options</source>
-	<source>misc/rfc-compliance</source>
-	<source>misc/roadmap</source>
-	<source>misc/sdb</source>
-	<destination>/usr/share/doc/bind-&bind-version;/misc</destination>
-      </copy>
-    </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">
-      <copy base="&blfs-config;">
-	<source>home/named/etc/named.conf</source>
-	<destination>/home/named/etc</destination>
-      </copy>
-      <copy base="&blfs-config;">
-	<source>etc/rndc.conf</source>
-	<destination>/etc</destination>
-      </copy>
-      <execute command="rndc-confgen">
-	<param>-a -b 512</param>
-	<param>-c key.tmp</param>
-      </execute>
-      <execute command="sed">
-	<param>-i -s "s, at rndc-key@,$(cat key.tmp | grep -m 1 "secret" | cut -d '"' -f 2),"</param>
-	<param>/home/named/etc/named.conf</param>
-	<param>/etc/rndc.conf</param>
-      </execute>
-      <copy base="&blfs-config;">
-	<source>home/named/etc/namedb/pz/127.0.0</source>
-	<destination>/home/named/etc/namedb/pz</destination>
-      </copy>
-      <copy base="&blfs-config;">
-	<source>home/named/etc/namedb/root.hints</source>
-	<destination>/home/named/etc/namedb</destination>
-      </copy>
-      <copy base="/etc">
-        <source>resolv.conf</source>
-        <destination>resolv.conf.bak</destination>
-      </copy>
-      <copy base="&blfs-config;">
-	<source>etc/resolv.conf</source>
-	<destination>/etc/resolv.conf</destination>
-      </copy>
-      <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>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&bind-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter22/courier.xml (from rev 1876, profiles/BLFS/trunk/chapter21/courier.xml)
===================================================================
--- profiles/BLFS/trunk/chapter21/courier.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter22/courier.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+  <package name="courier" version="&courier-version;">
+    <packageinfo>
+      <requires>
+        <name>gdbm</name>
+      </requires>
+      <utilizes>
+	<name>mysql</name>
+      </utilizes>
+      <utilizes>
+	<name>postresql</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>libfam</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>apache</name>
+      </utilizes>
+      <utilizes>
+	<name>aspell</name>
+      </utilizes>
+      <utilizes>
+	<name>ispell</name>
+      </utilizes>
+      <utilizes>
+	<name>gnupg</name>
+      </utilizes>
+      <utilizes>
+	<name>expect</name>
+      </utilizes>
+      <utilizes>
+	<name>&ghostscript-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>netbpm</name>
+      </utilizes>
+      <utilizes>
+	<name>mgetty+sendfax</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&courier-md5;</digest>
+	<archive>&packages_dir;/&courier-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="getent group courier > /dev/null || groupadd">
+        <param>-f</param>
+        <param>courier</param>
+      </execute>
+      <execute command="getent passwd courier > /dev/null || useradd">
+        <param>-c 'Courier Mail Server'</param>
+        <param>-d /dev/null</param>
+        <param>-g courier</param>
+        <param>-s /bin/false</param>
+        <param>courier</param>
+      </execute>
+      <execute command="getent passwd bin > /dev/null || useradd">
+        <param>-c bin</param>
+        <param>-d /dev/null</param>
+        <param>-g bin</param>
+        <param>-u 1</param>
+        <param>bin</param>
+      </execute>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&courier-directory;</base>
+      </stageinfo>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/run/courier</name>
+      </mkdir>
+      <ownership user="courier" group="courier">
+        <name>/var/run/courier</name>
+      </ownership>
+      <mkdir>
+        <option>parents</option>
+        <name>/var/lock/subsys</name>
+      </mkdir>
+      <ownership user="root" group="root">
+        <name>/var/lock/subsys</name>
+      </ownership>
+      <configure>
+        <param>--prefix=/usr</param>
+        <param>--libexecdir=/usr/lib/courier</param>
+        <param>--datadir=/usr/share/courier</param>
+        <param>--sysconfdir=/etc/courier</param>
+        <param>--localstatedir=/var/lib/courier</param>
+        <param>--with-piddir=/var/run/courier</param>
+        <param>--disable-root-check</param>
+        <param>--with-mailuser=courier</param>
+        <param>--with-mailgroup=courier</param>
+        <param>--with-paranoid-smtpext</param>
+        <param>--disable-autorenamesent</param>
+        <param>--enable-workarounds-for-imap-client-bugs</param>
+        <param>--with-db=gdbm</param>
+        <param>--with-ispell=/usr/bin/aspell</param>
+        <param>--enable-mimetypes</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <make>
+        <param>install-configure</param>
+      </make>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&courier-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter22/dhcp.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/dhcp.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="dhcp" version="&dhcp-version;">
-    <stage name="Unpacking.">
-      <unpack>
-        <digest>&dhcp-md5;</digest>
-	<archive>&packages_dir;/&dhcp-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Patching.">
-      <stageinfo>
-	<base>&build_dir;/&dhcp-directory;</base>
-      </stageinfo>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&dhcp-iproute2-patch;</param>
-      </patch>
-    </stage>
-    <stage name="Installing.">
-      <stageinfo>
-        <base>&build_dir;/&dhcp-directory;</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>
-      <copy base="&blfs-config;/etc">
-      	<source>dhcpcd.conf</source>
-	<destination>/etc</destination>
-      </copy>
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-dhcp</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup.">
-      <remove>&build_dir;/&dhcp-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter22/exim.xml (from rev 1876, profiles/BLFS/trunk/chapter21/exim.xml)
===================================================================
--- profiles/BLFS/trunk/chapter21/exim.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter22/exim.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="exim" version="&exim-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <utilizes>
+	<name>&ximpl;</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>cyrus-sasl</name>
+      </utilizes>
+      <utilizes>
+	<name>mysql</name>
+      </utilizes>
+      <utilizes>
+	<name>postgresql</name>
+      </utilizes>
+      <utilizes>
+	<name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&exim-md5;</digest>
+	<archive>&packages_dir;/&exim-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group exim > /dev/null || groupadd">
+        <param>exim</param>
+      </execute>
+      <execute command="getent passwd exim > /dev/null || useradd">
+        <param>-c exim</param>
+        <param>-d /dev/null</param>
+        <param>-g exim</param>
+        <param>-s /bin/false</param>
+        <param>exim</param>
+      </execute>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&exim-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&exim-db43-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&exim-directory;</base>
+      </stageinfo>
+      <copy>
+        <source>src/EDITME</source>
+	<destination>Local/Makefile</destination>
+      </copy>
+      <textdump mode="append">
+        <file>Local/Makefile</file>
+	<content>
+	=BIN_DIRECTORY=/usr/sbin
+	=CONFIGURE_FILE=/etc/exim.conf
+	=EXIM_USER=exim
+	=EXIM_MONITOR=
+	</content>
+      </textdump>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <copy>
+        <source>doc/exim.8</source>
+        <destination>/usr/share/man/man8</destination>
+      </copy>
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/share/doc/exim-&exim-version;</name>
+      </mkdir>
+      <copy>
+	<source>doc/*</source>
+	<destination>/usr/share/doc/exim-&exim-version;</destination>
+      </copy>
+      <link>
+        <option>force</option>
+        <target>exim</target>
+        <name>/usr/sbin/sendmail</name>
+      </link>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-exim</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&exim-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter22/leafnode.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/leafnode.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/leafnode.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-]>
-<alfs>
-  <package name="leafnode" version="&leafnode-version;">
-    <packageinfo>
-      <requires>
-        <name>pcre</name>
-      </requires>
-      <requires>
-	<name>tcpwrappers</name>
-      </requires>
-      <utilizes>
-        <name>xinetd</name>
-      </utilizes>
-      <utilizes>
-	<name>fcron</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&leafnode-md5;</digest>
-	<archive>&packages_dir;/&leafnode-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Creating user and group">
-      <execute command="getent group news > /dev/null || groupadd">
-        <param>news</param>
-      </execute>
-      <execute command="getent passwd news > /dev/null || 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/leafnode</param>
-	<param>--with-lockfile=/var/lock/leafnode/fetchnews.lck</param>
-      </configure>
-      <make />
-      <make>
-	<param>install</param>
-      </make>
-      &ldconfig;
-      <copy>
-	<source>/etc/leafnode/config.example</source>
-	<destination>/etc/leafnode/config</destination>
-      </copy>
-      <copy base="&blfs-config;">
-	<source>etc/nntpserver</source>
-	<destination>/etc</destination>
-      </copy>
-      <textdump mode="append" base="/etc/sysconfig">
-	<file>createfiles</file>
-	<content>
-	  =/var/lock/leafnode   dir   2775    news    news
-	</content>
-      </textdump>
-      <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>
-    </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&leafnode-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Deleted: profiles/BLFS/trunk/chapter22/openldap.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openldap.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/openldap.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="openldap" version="&openldap-version;">
-    <packageinfo>
-      <requires>
-        <name>db</name>
-      </requires>
-      <utilizes>
-	<name>cyrus-sasl</name>
-      </utilizes>
-      <utilizes>
-        <name>openssl</name>
-      </utilizes>
-      <utilizes>
-        <name>gdbm</name>
-      </utilizes>
-      <utilizes>
-        <name>tcpwrappers</name>
-      </utilizes>
-      <utilizes>
-        <name>&krb-impl;</name>
-      </utilizes>
-      <utilizes>
-        <name>pth</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&openldap-md5;</digest>
-	<archive>&packages_dir;/&openldap-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <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=/srv/ldap</param>
-        <param>--enable-ldbm</param>
-        <param>--disable-debug</param>
-      </configure>
-      <make>
-        <param>depend</param>
-      </make>
-      <make />
-      <make>
-        <param>test</param>
-      </make>
-      <make>
-        <param>install</param>
-      </make>
-      <permissions mode="755">
-	<name>/usr/lib/libl*-2.2.so.7.0.13</name>
-      </permissions>
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-openldap1</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&openldap-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Deleted: profiles/BLFS/trunk/chapter22/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/openssh.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <stage name="OpenSSH Server">
-  <package name="openssh-server" version="&openssh-version;">
-    <packageinfo>
-      <requires>
-	<name>openssh</name>
-      </requires>
-    </packageinfo>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <mkdir>
-        <option>parents</option>
-        <name>/var/empty</name>
-      </mkdir>
-      <ownership user="root" group="sys">
-        <name>/var/empty</name>
-      </ownership>
-      <execute command="getent group sshd > /dev/null || groupadd">
-        <param>sshd</param>
-      </execute>
-      <execute command="getent passwd sshd > /dev/null || 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="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-sshd</param>
-      </make>
-      <textdump mode="append">
-	<file>/etc/ssh/sshd_config</file>
-	<content>
-	  =PermitRootLogin no
-	</content>
-      </textdump>
-    </stage>
-    &bootscripts-clean;
-  </package>
-  </stage>
-</alfs>

Copied: profiles/BLFS/trunk/chapter22/postfix.xml (from rev 1876, profiles/BLFS/trunk/chapter21/postfix.xml)
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter22/postfix.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<!ENTITY % files SYSTEM  "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="postfix" version="&postfix-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <utilizes>
+	<name>pcre</name>
+      </utilizes>
+      <utilizes>
+	<name>mysql</name>
+      </utilizes>
+      <utilizes>
+	<name>postgresql</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>cyrus-sasl</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&postfix-md5;</digest>
+	<archive>&packages_dir;/&postfix-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group postfix > /dev/null || groupadd">
+        <param>postfix</param>
+      </execute>
+      <execute command="getent group postdrop > /dev/null || groupadd">
+        <param>postdrop</param>
+      </execute>
+      <execute command="getent group nogroup > /dev/null || groupadd">
+        <param>-g 65534</param>
+        <param>nogroup</param>
+      </execute>
+      <execute command="getent passwd postfix > /dev/null || useradd">
+        <param>-c postfix</param>
+        <param>-d /dev/null</param>
+        <param>-g postfix</param>
+        <param>-s /bin/false</param>
+        <param>postfix</param>
+      </execute>
+      <execute command="getent passwd nobody > /dev/null || useradd">
+        <param>-c nobody</param>
+        <param>-d /home</param>
+        <param>-g nogroup</param>
+        <param>-s /bin/bash</param>
+        <param>-u 65534</param>
+        <param>nobody</param>
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&postfix-directory;</base>
+      </stageinfo>
+      <ownership user="postfix" group="postfix">
+        <name>/var/mail</name>
+      </ownership>
+      <make />
+      <execute command="sh">
+        <param>postfix-install</param>
+        <param>daemon_directory=/usr/sbin</param>
+        <param>manpage_directory=/usr/share/man</param>
+        <param>sample_directory=/usr/share/doc/postfix</param>
+        <param>-non-interactive</param>
+      </execute>
+      <mkdir>
+        <option>parents</option>
+        <name>/usr/share/doc/postfix</name>
+      </mkdir>
+      <copy>
+        <option>recursive</option>
+        <option>force</option>
+        <source>html/*</source>
+        <destination>/usr/share/doc/postfix</destination>
+      </copy>
+      <copy>
+      	<source>&blfs-config;/etc/aliases</source>
+	<destination>/etc</destination>
+      </copy>
+      <search_replace base="/etc/postfix">
+        <file>main.cf</file>
+        <find>#myhostname = host.domain.tld</find>
+        <replace>myhostname = &hostname;</replace>
+      </search_replace>
+      <execute command="/usr/bin/newaliases" />
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-postfix</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&postfix-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter22/qpopper.xml (from rev 1876, profiles/BLFS/trunk/chapter21/qpopper.xml)
===================================================================
--- profiles/BLFS/trunk/chapter21/qpopper.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter22/qpopper.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+  <package name="qpopper" version="&qpopper-version;">
+    <packageinfo>
+      <requires>
+        <name>&mta-impl;</name>
+      </requires>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>gdbm</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&qpopper-md5;</digest>
+	<archive>&packages_dir;/&qpopper-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&qpopper-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+      <textdump mode="append">
+        <file>/etc/inetd.conf</file>
+        <content>=pop stream tcp nowait root /usr/sbin/popper popper</content>
+      </textdump>
+      <execute command="killall inetd || inetd" />
+      <textdump mode="append">
+        <file>/etc/syslog.conf</file>
+        <content>=local0.notice;local0.debug /var/log/POP.log</content>
+      </textdump>
+      <execute command="/etc/rc.d/init.d/sysklogd restart" />
+      <textdump mode="append">
+        <file>/etc/xinetd.conf</file>
+        <content>
+	  = service pop
+	  = {
+	  =   port = 110
+	  =   socket_type = stream
+	  =   protocol = tcp
+	  =   wait = no
+	  =   user = root
+	  =   server = /usr/sbin/popper
+	  = }
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&qpopper-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter22/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/rsync.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/rsync.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
-<!ENTITY % config_entities SYSTEM  "../config/config.ent">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <stage name="Rsync Server">
-  <package name="rsync-server" version="&rsync-version;">
-    <packageinfo>
-      <requires>
-	<name>rsync</name>
-      </requires>
-    </packageinfo>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group rsyncd > /dev/null || groupadd">
-        <param>rsyncd</param>
-      </execute>
-      <execute command="getent passwd rsyncd > /dev/null || 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 bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-rsyncd</param>
-      </make>
-      <copy base="&blfs-config;/etc">
-	<source>rsyncd.conf</source>
-	<destination>/etc</destination>
-      </copy>
-    </stage>    
-    &bootscripts-clean;
-  </package>
-  </stage>
-</alfs>

Deleted: profiles/BLFS/trunk/chapter22/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/samba.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/samba.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="samba" version="&samba-version;">
-    <packageinfo>
-      <utilizes>
-	<name>popt</name>
-      </utilizes>
-      <utilizes>
-	<name>linuxpam</name>
-      </utilizes>
-      <utilizes>
-	<name>openldap</name>
-      </utilizes>
-      <utilizes>
-	<name>cups</name>
-      </utilizes>
-      <utilizes>
-	<name>&krb-impl;</name>
-      </utilizes>
-      <utilizes>
-	<name>libxml2</name>
-      </utilizes>
-      <utilizes>
-	<name>mysql</name>
-      </utilizes>
-      <utilizes>
-	<name>postgresql</name>
-      </utilizes>
-      <utilizes>
-	<name>python</name>
-      </utilizes>
-      <utilizes>
-	<name>xinetd</name>
-      </utilizes>
-      <utilizes>
-	<name>valgrind</name>
-      </utilizes>
-      <utilizes>
-	<name>stunnel</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking.">
-      <unpack>
-        <digest>&samba-md5;</digest>
-	<archive>&packages_dir;/&samba-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <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>
-      <move>
-	<source>/usr/lib/samba/libsmbclient.so</source>
-	<destination>/usr/lib</destination>
-      </move>
-      <link>
-	<option>force</option>
-	<target>../libsmbclient.so</target>
-	<name>/usr/lib/samba</name>
-      </link>
-      <permissions mode="644">
-	<name>/usr/include/libsmbclient.h</name>
-	<name>/usr/lib/samba/libsmbclient.a</name>
-      </permissions>
-      <copy>
-        <source>nsswitch/libnss_wins.so</source>
-	<source>nsswitch/libnss_winbind.so</source>
-        <destination>/lib</destination>
-      </copy>
-      <permissions mode="0755" base="/lib">
-        <name>libnss_wins.so</name>
-	<name>libnss_windbind.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
-	=swat_tunnel	902/tcp
-	</content>
-      </textdump>
-      <textdump mode="append">
-        <file>/etc/inetd.conf</file>
-        <content>=swat_tunnel stream tcp nowait.400 root /usr/sbin/swat swat</content>
-      </textdump>
-      <textdump mode="append">
-        <file>/etc/xinetd.conf</file>
-        <content>
-	  =service swat_tunnel
-	  ={
-	  =    port            = 902
-	  =    socket_type     = stream
-	  =    wait            = no
-	  =    only_from       = 127.0.0.1
-	  =    user            = root
-	  =    server          = /usr/sbin/swat
-	  =    log_on_failure  += USERID
-	  =}
-	</content>
-      </textdump>
-      <textdump mode="append">
-	<file>/etc/stunnel/stunnel.conf</file>
-	<content>
-	  =[swat]
-	  =accept = 901
-	  =connect = 902
-	</content>
-      </textdump>
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-samba</param>
-        <param>install-winbind</param>
-      </make>
-    </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup.">
-      <remove>&build_dir;/&samba-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter22/sendmail.xml (from rev 1876, profiles/BLFS/trunk/chapter21/sendmail.xml)
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter22/sendmail.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<!ENTITY % files SYSTEM  "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="sendmail" version="&sendmail-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <requires>
+        <name>procmail</name>
+      </requires>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+	<name>pcre</name>
+      </utilizes>
+      <utilizes>
+	<name>cyrus-sasl</name>
+      </utilizes>
+      <utilizes>
+	<name>nph</name>
+      </utilizes>
+      <utilizes>
+	<name>&ghostscript-impl;</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&sendmail-md5;</digest>
+	<archive>&packages_dir;/&sendmail-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Creating user and group">
+      <execute command="getent group smmsp > /dev/null || groupadd">
+        <param>smmsp</param>
+      </execute>
+      <execute command="getent group mail > /dev/null || groupadd">
+        <param>mail</param>
+      </execute>
+      <execute command="getent passwd smmsp > /dev/null || useradd">
+        <param>-g smmsp</param>
+        <param>-G mail</param>
+        <param>-s /bin/false</param>
+        <param>smmsp</param>
+      </execute>
+    <permissions mode="1777">
+      <name>/var/mail</name>
+    </permissions>
+    <mkdir>
+      <name>/var/spool/mqueue</name>
+    </mkdir>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&sendmail-directory;</base>
+      </stageinfo>
+      <textdump>
+        <file>devtools/Site/site.config.m4</file>
+        <content>
+	  =define(`confMANGRP',`root')
+	  =define(`confMANOWN',`root')
+	  =define(`confSBINGRP',`root')
+	  =define(`confUBINGRP',`root')
+	  =define(`confUBINOWN',`root')
+	</content>
+      </textdump>
+      <execute base="&build_dir;/&sendmail-directory;/sendmail" command="sh Build" />
+      <copy base="&build_dir;/&sendmail-directory;/cf/cf">
+        <source>generic-linux.mc</source>
+        <destination>sendmail.mc</destination>
+      </copy>
+      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build">
+        <param>sendmail.cf</param>
+      </execute>
+      <mkdir>
+        <option>parents</option>
+        <name>/etc/mail</name>
+      </mkdir>
+      <permissions mode="755">
+        <name>/etc/mail</name>
+      </permissions>
+      <execute base="&build_dir;/&sendmail-directory;/cf/cf" command="sh Build install-cf" />
+      <execute command="sh Build install" />
+      <copy>
+        <option>recursive</option>
+        <source>cf/*</source>
+        <destination>/etc/mail</destination>
+      </copy>
+      <copy>
+        <source>cf/cf/submit.mc</source>
+        <source>cf/cf/sendmail.mc</source>
+        <destination>/etc/mail</destination>
+      </copy>
+      <copy>
+      	<source>sendmail/sendmail.8</source>
+	<source>editmap/editmap.8</source>
+	<source>mailstats/mailstats.8</source>
+	<source>makemap/makemap.8</source>
+	<source>praliases/praliases.8</source>
+	<source>smrsh/smrsh.8</source>
+	<destination>/usr/share/man/man8</destination>
+      </copy>
+      <copy>
+	<source>sendmail/aliases.5</source>
+	<destination>/usr/share/man/man5</destination>
+      </copy>
+      <copy>
+	<source>sendmail/mailq.1</source>
+	<source>sendmail/newaliases.1</source>
+	<source>vacation/vacation.1</source>
+	<destination>/usr/share/man/man1</destination>
+      </copy>
+      <search_replace base="&build_dir;/&sendmail-directory;/doc/op">
+	<file>Makefile</file>
+	<find>groff</find>
+	<replace>GROFF_NO_SGR=1 groff</replace>
+      </search_replace>
+      <make>
+	<param>op.txt</param>
+      </make>
+      <mkdir> 
+	<option>parents</option>
+	<name>/usr/share/doc/sendmail/&sendmail-version;</name>
+      </mkdir>
+      <copy>
+	<source>op.ps</source>
+	<source>op.txt</source>
+	<destination>/usr/share/doc/sendmail/&sendmail-version;</destination>
+      </copy>
+      <execute command="echo `hostname` > /etc/mail/local-host-names" />
+      <copy>
+	<source>&blfs-config;/etc/mail/aliases</source>
+	<destination>/etc/mail</destination>
+      </copy>
+      <execute command="newaliases -v" />
+      <execute base="/etc/mail" command="m4 m4/cf.m4 sendmail.mc > sendmail.cf" />
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-sendmail</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&sendmail-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter22/xinetd.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/xinetd.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter22/xinetd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="xinetd" version="&xinetd-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&xinetd-md5;</digest>
-	<archive>&packages_dir;/&xinetd-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <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>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&xinetd-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Deleted: profiles/BLFS/trunk/chapter24/apache.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/apache.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter24/apache.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<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>
-      <utilizes>
-	<name>doxygen</name>
-      </utilizes>
-    </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&apache-md5;</digest>
-	<archive>&packages_dir;/&apache-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group apache > /dev/null || groupadd">
-        <param>apache</param>
-      </execute>
-      <execute command="getent passwd apache > /dev/null || 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=FHS</param>
-        <param>--enable-mods-shared=all</param>
-      </configure>
-      <make />
-      <make>
-        <param>install</param>
-      </make>
-      <ownership user="root" group="root">
-	<name>/usr/sbin/apxs</name>
-	<name>/usr/sbin/apachectl</name>
-	<name>/usr/sbin/dbmmanage</name>
-	<name>/usr/sbin/envvars-std</name>
-	<name>/usr/sbin/envvars</name>
-	<name>/usr/include/apache/*</name>
-	<name>/usr/lib/apache/httpd.exp</name>
-	<name>/usr/share/man/man1/dbmmanage.1</name>
-	<name>/usr/share/man/man1/htdigest.1</name>
-	<name>/usr/share/man/man1/htpasswd.1</name>
-	<name>/usr/share/man/man8/ab.8</name>
-	<name>/usr/share/man/man8/apachectl.8</name>
-	<name>/usr/share/man/man8/apxs.8</name>
-	<name>/usr/share/man/man8/httpd.8</name>
-	<name>/usr/share/man/man8/logresolve.8</name>
-	<name>/usr/share/man/man8/rotatelogs.8</name>
-	<name>/usr/share/man/man8/suexec.8</name>
-      </ownership>
-      <ownership user="apache" group="apache">
-	<option>recursive</option>
-	<name>/srv/www</name>
-      </ownership>
-    </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>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&apache-directory;</remove>
-    </stage>
-  </package>
-</alfs>
-

Copied: profiles/BLFS/trunk/chapter24/dhcp.xml (from rev 1876, profiles/BLFS/trunk/chapter22/dhcp.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter24/dhcp.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="dhcp" version="&dhcp-version;">
+    <stage name="Unpacking.">
+      <unpack>
+        <digest>&dhcp-md5;</digest>
+	<archive>&packages_dir;/&dhcp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <stage name="Patching.">
+      <stageinfo>
+	<base>&build_dir;/&dhcp-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&dhcp-iproute2-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&dhcp-directory;</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>
+      <copy base="&blfs-config;/etc">
+      	<source>dhcpcd.conf</source>
+	<destination>/etc</destination>
+      </copy>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-dhcp</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&dhcp-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter24/leafnode.xml (from rev 1876, profiles/BLFS/trunk/chapter22/leafnode.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/leafnode.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter24/leafnode.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<!ENTITY % files SYSTEM "../config/files.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+%files;
+
+]>
+<alfs>
+  <package name="leafnode" version="&leafnode-version;">
+    <packageinfo>
+      <requires>
+        <name>pcre</name>
+      </requires>
+      <requires>
+	<name>tcpwrappers</name>
+      </requires>
+      <utilizes>
+        <name>xinetd</name>
+      </utilizes>
+      <utilizes>
+	<name>fcron</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&leafnode-md5;</digest>
+	<archive>&packages_dir;/&leafnode-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Creating user and group">
+      <execute command="getent group news > /dev/null || groupadd">
+        <param>news</param>
+      </execute>
+      <execute command="getent passwd news > /dev/null || 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/leafnode</param>
+	<param>--with-lockfile=/var/lock/leafnode/fetchnews.lck</param>
+      </configure>
+      <make />
+      <make>
+	<param>install</param>
+      </make>
+      &ldconfig;
+      <copy>
+	<source>/etc/leafnode/config.example</source>
+	<destination>/etc/leafnode/config</destination>
+      </copy>
+      <copy base="&blfs-config;">
+	<source>etc/nntpserver</source>
+	<destination>/etc</destination>
+      </copy>
+      <textdump mode="append" base="/etc/sysconfig">
+	<file>createfiles</file>
+	<content>
+	  =/var/lock/leafnode   dir   2775    news    news
+	</content>
+      </textdump>
+      <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>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&leafnode-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Copied: profiles/BLFS/trunk/chapter24/openldap.xml (from rev 1876, profiles/BLFS/trunk/chapter22/openldap.xml)
===================================================================
--- profiles/BLFS/trunk/chapter22/openldap.xml	2005-05-01 23:19:25 UTC (rev 1876)
+++ profiles/BLFS/trunk/chapter24/openldap.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
+]>
+<alfs>
+  <package name="openldap" version="&openldap-version;">
+    <packageinfo>
+      <requires>
+        <name>db</name>
+      </requires>
+      <utilizes>
+	<name>cyrus-sasl</name>
+      </utilizes>
+      <utilizes>
+        <name>openssl</name>
+      </utilizes>
+      <utilizes>
+        <name>gdbm</name>
+      </utilizes>
+      <utilizes>
+        <name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+        <name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+        <name>pth</name>
+      </utilizes>
+    </packageinfo>
+    <stage name="Unpacking">
+      <unpack>
+        <digest>&openldap-md5;</digest>
+	<archive>&packages_dir;/&openldap-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    &bootscripts-get;
+    <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=/srv/ldap</param>
+        <param>--enable-ldbm</param>
+        <param>--disable-debug</param>
+      </configure>
+      <make>
+        <param>depend</param>
+      </make>
+      <make />
+      <make>
+        <param>test</param>
+      </make>
+      <make>
+        <param>install</param>
+      </make>
+      <permissions mode="755">
+	<name>/usr/lib/libl*-2.2.so.7.0.13</name>
+      </permissions>
+    </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-openldap1</param>
+      </make>
+    </stage>
+    &bootscripts-clean;
+    <stage name="Cleanup">
+      <remove>&build_dir;/&openldap-directory;</remove>
+    </stage>
+  </package>
+</alfs>

Deleted: profiles/BLFS/trunk/chapter24/proftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter24/proftpd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-<!ENTITY % files SYSTEM "../config/files.ent">
-
-%general_entities;
-%package_entities;
-%config_entities;
-%files;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-  <package name="proftpd" version="&proftpd-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&proftpd-md5;</digest>
-	<archive>&packages_dir;/&proftpd-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group proftpd > /dev/null || groupadd">
-        <param>proftpd</param>
-      </execute>
-      <execute command="getent passwd proftpd > /dev/null || useradd">
-        <param>-c proftpd</param>
-        <param>-d /home/ftp</param>
-        <param>-g proftpd</param>
-        <param>-s /usr/lib/proftpd/proftpdshell</param>
-        <param>proftpd</param>
-      </execute>
-      <mkdir>
-	<option>parents</option>
-	<name>/usr/lib/proftpd</name>
-      </mkdir>
-      <ownership user="proftpd" group="proftpd">
-	<name>/usr/lib/proftpd</name>
-      </ownership>
-      <permissions mode="775">
-	<name>/usr/lib/proftpd</name>
-      </permissions>
-      <link>
-	<option>force</option>
-	<target>/bin/false</target>
-	<name>/usr/lib/proftpd/proftpdshell</name>
-      </link>
-      <textdump mode="append">
-	<file>/etc/shells</file>
-	<content>
-	  =/usr/lib/proftpd/proftpdshell
-	</content>
-      </textdump>
-    </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/run</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>
-      <copy base="&blfs-config;/etc">
-	<source>proftpd.conf</source>
-	<destination>/etc</destination>
-      </copy>
-      </stage>
-    &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&proftpd-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Copied: profiles/BLFS/trunk/chapter24/rsync.xml (from rev 1870, profiles/BLFS/trunk/chapter22/rsync.xml)

Deleted: profiles/BLFS/trunk/chapter24/vsftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/vsftpd.xml	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/chapter24/vsftpd.xml	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!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">
-
-%general_entities;
-%package_entities;
-%config_entities;
-
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
-]>
-<alfs>
-<package name="vsftpd" version="&vsftpd-version;">
-  <packageinfo>
-    <utilizes>
-      <name>linuxpam</name>
-    </utilizes>
-    <utilizes>
-      <name>openssl</name>
-    </utilizes>
-    <utilizes>
-      <name>tcpwrappers</name>
-    </utilizes>
-  </packageinfo>
-  <stage name="Unpacking.">
-    <unpack>
-      <digest>&vsftpd-md5;</digest>
-      <archive>&packages_dir;/&vsftpd-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
-  </stage>
-  &bootscripts-get;
-  <stage name="Creating user and group">
-    <mkdir>
-      <option>parents</option>
-      <name>/var/ftp/empty</name>
-      <name>/home/ftp</name>
-    </mkdir>
-    <execute command="getent group vsftpd > /dev/null || groupadd">
-      <param>vsftpd</param>
-    </execute>
-    <execute command="getent passwd vsftpd > /dev/null || useradd">
-      <param>-d /dev/null</param>
-      <param>-g vsftpd</param>
-      <param>-s /bin/false</param>
-      <param>vsftpd</param>
-    </execute>
-    <execute command="getent group ftp > /dev/null || groupadd">
-      <param>ftp</param>
-    </execute>
-    <execute command="getent passwd ftp > /dev/null || useradd">
-      <param>-c anonymous_user</param>
-      <param>-d /home/ftp</param>
-      <param>-g ftp</param>
-      <param>-s /bin/false</param>
-      <param>ftp</param>
-    </execute>
-  </stage>
-  <stage name="Installing.">
-    <stageinfo>
-      <base>&build_dir;/&vsftpd-directory;</base>
-    </stageinfo>
-    <make />
-    <copy>
-      <source>vsftpd</source>
-      <destination>/usr/sbin</destination>
-    </copy>
-    <permissions mode="755">
-      <name>/usr/sbin/vsftpd</name>
-    </permissions>
-    <copy>
-      <source>vsftpd.8</source>
-      <destination>/usr/share/man/man8</destination>
-    </copy>
-    <copy>
-      <source>vsftpd.conf.5</source>
-      <destination>/usr/share/man/man5</destination>
-    </copy>
-    <copy>
-      <source>vsftpd.conf</source>
-      <destination>/etc</destination>
-    </copy>
-  </stage>
-  <stage name="Installing bootscript and configuration">
-    <stageinfo>
-      <base>&build_dir;/&blfs-bootscripts-directory;</base>
-    </stageinfo>
-    <make>
-      <param>install-vsftpd</param>
-    </make>
-    <textdump mode="append" base="/etc">
-      <file>vsftpd.conf</file>
-      <content>
-	=background=YES
-	=listen=YES
-	=nopriv_user=vsftpd
-	=secure_chroot_dir=/var/ftp/empty
-      </content>
-    </textdump>
-  </stage>
-  &bootscripts-clean;
-  <stage name="Cleanup.">
-    <remove>&build_dir;/&vsftpd-directory;</remove>
-  </stage>
-</package>
-</alfs>

Added: profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,14 @@
+# Begin /etc/xinetd.d/swat
+
+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
+}
+
+# End /etc/xinetd.d/swat

Added: profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat_tunnel
===================================================================
--- profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat_tunnel	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/etc/xinetd.d/swat_tunnel	2005-07-07 22:04:18 UTC (rev 1928)
@@ -0,0 +1,14 @@
+# Begin /etc/xinetd.d/swat_tunnel
+
+service swat_tunnel
+{
+    port            = 902
+    socket_type     = stream
+    wait            = no
+    only_from       = 127.0.0.1
+    user            = root
+    server          = /usr/sbin/swat
+    log_on_failure  += USERID
+}
+
+# End /etc/xinetd.d/swat_tunnel

Modified: profiles/BLFS/trunk/config_standard/packages/ch10.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch10.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch10.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -27,9 +27,9 @@
 <!ENTITY compface-errno-patch     "compface-&compface-version;-errno-2.patch">
 <!ENTITY compface-errno-patch-md5 "283ed8d53d77dc81045391fbac8a40f6">
 
-<!ENTITY imagemagick-version   "6.2.3-0">
+<!ENTITY imagemagick-version   "6.2.3-3">
 <!ENTITY imagemagick-package   "ImageMagick-&imagemagick-version;.tar.bz2">
-<!ENTITY imagemagick-md5       "9230da1e57f8d0712229942e4ec6d65a">
+<!ENTITY imagemagick-md5       "39222a764f5649f16ff0c934aef8d85a">
 <!ENTITY imagemagick-directory "ImageMagick-&imagemagick-version;">
 
 <!ENTITY hd2u-version   "1.0.0">

Modified: profiles/BLFS/trunk/config_standard/packages/ch11.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch11.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch11.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -45,9 +45,9 @@
 <!ENTITY pciutils-md5       "2b3b2147b7bc91f362be55cb49fa1c4e">
 <!ENTITY pciutils-directory "pciutils-&pciutils-version;">
 
-<!ENTITY pkgconfig-version   "0.17.2">
+<!ENTITY pkgconfig-version   "0.18">
 <!ENTITY pkgconfig-package   "pkgconfig-&pkgconfig-version;.tar.bz2">
-<!ENTITY pkgconfig-md5       "eab15aecff99e98bcc5d01331452e583">
+<!ENTITY pkgconfig-md5       "cae72bbadff5cd9fe1d085cf8b7c3e6e">
 <!ENTITY pkgconfig-directory "pkgconfig-&pkgconfig-version;">
 
 <!ENTITY cpio-version   "2.6">

Modified: profiles/BLFS/trunk/config_standard/packages/ch18.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch18.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch18.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,90 +1,79 @@
 <!--************* packages for chapter 18 *************-->
 
-<!ENTITY ncftp-version   "3.1.7">
-<!ENTITY ncftp-package   "ncftp-&ncftp-version;-src.tar.bz2">
-<!ENTITY ncftp-md5       "2a310a3c9ca126e6b409d0d1d1ccda75">
-<!ENTITY ncftp-directory "ncftp-&ncftp-version;">
-
-<!ENTITY openssh-version   "3.9p1">
-<!ENTITY openssh-package   "openssh-&openssh-version;.tar.bz2">
-<!ENTITY openssh-md5       "0b5ddd31831922fcc3ceb0b516a5954d">
-<!ENTITY openssh-directory "openssh-&openssh-version;">
-
-<!ENTITY rsync-version   "2.6.3">
-<!ENTITY rsync-package   "rsync-&rsync-version;.tar.bz2">
-<!ENTITY rsync-md5       "d46b35fe36917b153b73fd9ebf5b13d1">
-<!ENTITY rsync-directory "rsync-&rsync-version;">
-
-<!ENTITY cvs-version    "1.11.18">
+<!ENTITY cvs-version    "1.11.20">
 <!ENTITY cvs-package    "cvs-&cvs-version;.tar.bz2">
-<!ENTITY cvs-md5        "1dd5c16064906617e4358738bfe59b66">
+<!ENTITY cvs-md5        "9e215c0ee3bb7dfb76515d7cd81a3742">
 <!ENTITY cvs-directory  "cvs-&cvs-version;">
 
 <!ENTITY cvs-zlib-patch     "cvs-&cvs-version;-zlib-1.patch">
-<!ENTITY cvs-zlib-patch-md5 "85feeaee0a114477b981ceebd1266eff">
 
-<!ENTITY subversion-version   "1.1.3">
-<!ENTITY subversion-package   "subversion-&subversion-version;.tar.bz2">
-<!ENTITY subversion-md5       "a09c2b2fa1a09566c024547954a48478">
-<!ENTITY subversion-directory "subversion-&subversion-version;">
-
-<!ENTITY wget-version   "1.9.1">
-<!ENTITY wget-package   "wget-&wget-version;.tar.bz2">
-<!ENTITY wget-md5       "029d073ccb178c1b7e53169d1d6e931f">
-<!ENTITY wget-directory "wget-&wget-version;">
-
-<!ENTITY tcpwrappers-version   "7.6">
-<!ENTITY tcpwrappers-package   "tcp_wrappers_&tcpwrappers-version;.tar.bz2">
-<!ENTITY tcpwrappers-md5       "e2a8c9aca179839415652acc74bff9a2">
-<!ENTITY tcpwrappers-directory "tcp_wrappers_&tcpwrappers-version;">
-
-<!ENTITY tcpwrappers-shared-libs-plus-plus-patch     "tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch">
-<!ENTITY tcpwrappers-shared-libs-plus-plus-patch-md5 "b6ca69285ad3b4d482c2311561913595">
-
-<!ENTITY portmap-version   "5beta">
-<!ENTITY portmap-package   "portmap_&portmap-version;.tar.bz2">
-<!ENTITY portmap-md5       "820f5b5fb295ccdcd3ca6e44bb770064">
-<!ENTITY portmap-directory "portmap_&portmap-version;">
-
-<!ENTITY portmap-compilation-fixes-patch     "portmap-&portmap-version;-compilation_fixes-3.patch">
-<!ENTITY portmap-compilation-fixes-patch-md5 "0bb19fa28ad800b79f71fecb7b818cc5">
-
-<!ENTITY portmap-glibc-errno-fix-patch     "portmap-&portmap-version;-glibc_errno_fix-1.patch">
-<!ENTITY portmap-glibc-errno-fix-patch-md5 "3b869c9eae0c2631ab4cfd3a366d734f">
-
 <!ENTITY inetutils-version   "1.4.2">
 <!ENTITY inetutils-package   "inetutils-&inetutils-version;.tar.bz2">
 <!ENTITY inetutils-md5       "3ab421642bd6f5284a6ccf4811ad2c51">
 <!ENTITY inetutils-directory "inetutils-&inetutils-version;">
 
 <!ENTITY inetutils-kernel-header-patch     "inetutils-&inetutils-version;-kernel_headers-1.patch">
-<!ENTITY inetutils-kernel-header-patch-md5 "b08f0251cf0af2a1b247b5105dcb91d0">
 
-<!ENTITY nfs-utils-version   "1.0.6">
-<!ENTITY nfs-utils-package   "nfs-utils-&nfs-utils-version;.tar.bz2">
-<!ENTITY nfs-utils-md5       "ae62f9560c579a98f1b2854f8e7a0319">
-<!ENTITY nfs-utils-directory "nfs-utils-&nfs-utils-version;">
+<!ENTITY ncftp-version   "3.1.9">
+<!ENTITY ncftp-package   "ncftp-&ncftp-version;-src.tar.bz2">
+<!ENTITY ncftp-md5       "66cf8dacec848eb11a70632fe9f21807">
+<!ENTITY ncftp-directory "ncftp-&ncftp-version;">
 
 <!ENTITY ncpfs-version   "2.2.4">
 <!ENTITY ncpfs-package   "ncpfs-&ncpfs-version;.tar.bz2">
 <!ENTITY ncpfs-md5       "e25281d2c17849200a97d35dda301192">
 <!ENTITY ncpfs-directory "ncpfs-&ncpfs-version;">
 
-<!ENTITY ntp-version   "4.2.0">
-<!ENTITY ntp-package   "ntp-&ntp-version;.tar.bz2">
-<!ENTITY ntp-md5       "1d2d62ae16c2b1047cb097eaff59aba6">
-<!ENTITY ntp-directory "ntp-&ntp-version;">
-
 <!ENTITY net-tools-version   "1.60">
 <!ENTITY net-tools-package   "net-tools-&net-tools-version;.tar.bz2">
 <!ENTITY net-tools-md5       "888774accab40217dde927e21979c165">
 <!ENTITY net-tools-directory "net-tools-&net-tools-version;">
 
 <!ENTITY net-tools-gcc34-patch     "net-tools-&net-tools-version;-gcc34-3.patch">
-<!ENTITY net-tools-gcc34-patch-md5 "a04ba0082f541ed3c476348ccf6ea109">
-
 <!ENTITY net-tools-kernel-header-patch     "net-tools-&net-tools-version;-kernel_headers-2.patch">
-<!ENTITY net-tools-kernel-header-patch-md5 "cae72d8027364811072529320035893e">
-
 <!ENTITY net-tools-mii-ioctl-patch     "net-tools-&net-tools-version;-mii_ioctl-1.patch">
-<!ENTITY net-tools-mii-ioctl-patch-md5 "7de67d26122785defd46bf2ed9b5b82b">
+
+<!ENTITY ntp-version   "4.2.0">
+<!ENTITY ntp-package   "ntp-&ntp-version;.tar.bz2">
+<!ENTITY ntp-md5       "1d2d62ae16c2b1047cb097eaff59aba6">
+<!ENTITY ntp-directory "ntp-&ntp-version;">
+
+<!ENTITY openssh-version   "4.1p1">
+<!ENTITY openssh-package   "openssh-&openssh-version;.tar.bz2">
+<!ENTITY openssh-md5       "663a0b43d1154cbed14cd15a86becbe6">
+<!ENTITY openssh-directory "openssh-&openssh-version;">
+
+<!ENTITY portmap-version   "5beta">
+<!ENTITY portmap-package   "portmap_&portmap-version;.tar.bz2">
+<!ENTITY portmap-md5       "820f5b5fb295ccdcd3ca6e44bb770064">
+<!ENTITY portmap-directory "portmap_&portmap-version;">
+
+<!ENTITY portmap-compilation-fixes-patch     "portmap-&portmap-version;-compilation_fixes-3.patch">
+<!ENTITY portmap-glibc-errno-fix-patch     "portmap-&portmap-version;-glibc_errno_fix-1.patch">
+
+<!ENTITY rsync-version   "2.6.5">
+<!ENTITY rsync-package   "rsync-&rsync-version;.tar.bz2">
+<!ENTITY rsync-md5       "9b5aef3ce42cc0d847400136b8f3f8e9">
+<!ENTITY rsync-directory "rsync-&rsync-version;">
+
+<!ENTITY samba-version   "3.0.14a">
+<!ENTITY samba-package   "samba-&samba-version;.tar.bz2">
+<!ENTITY samba-md5       "bc1975c9d4c47a9eb8a4bd4778463ef5">
+<!ENTITY samba-directory "samba-&samba-version;">
+
+<!ENTITY subversion-version   "1.1.4">
+<!ENTITY subversion-package   "subversion-&subversion-version;.tar.bz2">
+<!ENTITY subversion-md5       "6e557ae65b6b8d7577cc7704ede85a23">
+<!ENTITY subversion-directory "subversion-&subversion-version;">
+
+<!ENTITY tcpwrappers-version   "7.6">
+<!ENTITY tcpwrappers-package   "tcp_wrappers_&tcpwrappers-version;.tar.bz2">
+<!ENTITY tcpwrappers-md5       "e2a8c9aca179839415652acc74bff9a2">
+<!ENTITY tcpwrappers-directory "tcp_wrappers_&tcpwrappers-version;">
+
+<!ENTITY tcpwrappers-shared-libs-plus-plus-patch     "tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch">
+
+<!ENTITY wget-version   "1.9.1">
+<!ENTITY wget-package   "wget-&wget-version;.tar.bz2">
+<!ENTITY wget-md5       "029d073ccb178c1b7e53169d1d6e931f">
+<!ENTITY wget-directory "wget-&wget-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch19.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch19.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch19.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -10,17 +10,17 @@
 <!ENTITY nmap-md5       "1b54c0608b36f6b3ac92d7d1b910738f">
 <!ENTITY nmap-directory "nmap-&nmap-version;">
 
-<!ENTITY whois-version   "4.6.26">
-<!ENTITY whois-package   "whois_&whois-version;.tar.bz2">
-<!ENTITY whois-md5       "73256313dc558bde79268e2c4d8b87d6">
+<!ENTITY whois-version   "4.7.5">
+<!ENTITY whois-package   "whois-&whois-version;.tar.bz2">
+<!ENTITY whois-md5       "fe13c1440d725193998493ce57dfbb32">
 <!ENTITY whois-directory "whois-&whois-version;">
 
-<!ENTITY bind-utils-version   "9.3.0">
+<!ENTITY bind-utils-version   "9.3.1">
 <!ENTITY bind-utils-package   "bind-&bind-utils-version;.tar.bz2">
-<!ENTITY bind-utils-md5       "dad42a60a5004067499f266247ae59c7">
+<!ENTITY bind-utils-md5       "d3f97c1002c66fbbe1e10ec1fbe01be9">
 <!ENTITY bind-utils-directory "bind-&bind-utils-version;">
 
-<!ENTITY ethereal-version   "0.10.9">
+<!ENTITY ethereal-version   "0.10.11">
 <!ENTITY ethereal-package   "ethereal-&ethereal-version;.tar.bz2">
-<!ENTITY ethereal-md5       "f8b7a2c2dcf273e7fd755f972167dacb">
+<!ENTITY ethereal-md5       "03aa7fe2cbef9aa0654637cdc60e0458">
 <!ENTITY ethereal-directory "ethereal-&ethereal-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch20.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch20.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch20.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,8 +1,8 @@
 <!--************* packages for chapter 20 *************-->
 
-<!ENTITY nail-version   "11.20">
+<!ENTITY nail-version   "11.22">
 <!ENTITY nail-package   "nail-&nail-version;.tar.bz2">
-<!ENTITY nail-md5       "f08dab4fb6a069bc6876b0b58116716b">
+<!ENTITY nail-md5       "caad4c4cd02c7fbf0d9e7fec50ff3b21">
 <!ENTITY nail-directory "nail-&nail-version;">
 
 <!ENTITY procmail-version   "3.22">
@@ -20,13 +20,12 @@
 <!ENTITY mutt-md5       "43151a057573dcdb83301986820d8065">
 <!ENTITY mutt-directory "mutt-1.4.2.1">
 
-<!ENTITY pine-version   "4.60">
+<!ENTITY pine-version   "4.63">
 <!ENTITY pine-package   "pine&pine-version;.tar.bz2">
-<!ENTITY pine-md5       "aece91c8a857605994829ffa91d98c9f">
+<!ENTITY pine-md5       "e881f439f38039b310d22554ab08feb4">
 <!ENTITY pine-directory "pine&pine-version;">
 
-<!ENTITY pine-patch     "pine-&pine-version;-fhs-3.patch">
-<!ENTITY pine-patch-md5 "0c5401f2476963d63efa60296494c3de">
+<!ENTITY pine-patch     "pine-&pine-version;-fhs-1.patch">
 
 <!ENTITY slrn-version   "0.9.8.1">
 <!ENTITY slrn-package   "slrn-&slrn-version;.tar.bz2">

Modified: profiles/BLFS/trunk/config_standard/packages/ch21.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch21.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch21.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,29 +1,34 @@
 <!--************* packages for chapter 21 *************-->
 
-<!ENTITY postfix-version   "2.1.5">
-<!ENTITY postfix-package   "postfix-&postfix-version;.tar.bz2">
-<!ENTITY postfix-md5       "feaf838fa5f26dd429933a250e51050e">
-<!ENTITY postfix-directory "postfix-&postfix-version;">
+<!ENTITY apache-version   "2.0.54">
+<!ENTITY apache-package   "httpd-&apache-version;.tar.bz2">
+<!ENTITY apache-md5       "4ae8a38c6b5db9046616ce10a0d551a2 ">
+<!ENTITY apache-directory "httpd-&apache-version;">
 
-<!ENTITY sendmail-version   "8.13.3">
-<!ENTITY sendmail-package   "sendmail.&sendmail-version;.tar.bz2">
-<!ENTITY sendmail-md5       "cc9bf828c2bf9df923a219e3ca1f4780">
-<!ENTITY sendmail-directory "sendmail-&sendmail-version;">
+<!ENTITY apache-patch     "httpd-&apache-version;-config-1.patch">
 
-<!ENTITY exim-version   "4.43">
-<!ENTITY exim-package   "exim-&exim-version;.tar.bz2">
-<!ENTITY exim-md5       "f8f646d4920660cb5579becd9265a3bf">
-<!ENTITY exim-directory "exim-&exim-version;">
+<!ENTITY bind-version   "9.3.1">
+<!ENTITY bind-package   "bind-&bind-version;.tar.bz2">
+<!ENTITY bind-md5       "d3f97c1002c66fbbe1e10ec1fbe01be9">
+<!ENTITY bind-directory "bind-&bind-version;">
 
-<!ENTITY exim-db43-patch     "exim-&exim-version;-db43-1.patch">
-<!ENTITY exim-db43-patch-md5 "235bb8a20977b45da2b8b73f4756612c">
+<!ENTITY nfs-utils-version   "1.0.7">
+<!ENTITY nfs-utils-package   "nfs-utils-&nfs-utils-version;.tar.bz2">
+<!ENTITY nfs-utils-md5       "3cf5381963e404e056e50dc508fdf153">
+<!ENTITY nfs-utils-directory "nfs-utils-&nfs-utils-version;">
 
-<!ENTITY qpopper-version   "4.0.5">
-<!ENTITY qpopper-package   "qpopper&qpopper-version;.tar.bz2">
-<!ENTITY qpopper-md5       "e4f8814376a156c650c7ec546bd3a847">
-<!ENTITY qpopper-directory "qpopper&qpopper-version;">
+<!ENTITY proftpd-version   "1.2.10">
+<!ENTITY proftpd-package   "proftpd-&proftpd-version;.tar.bz2">
+<!ENTITY proftpd-md5       "5feb4a7348e12faefc25e34fd92efdd6">
+<!ENTITY proftpd-directory "proftpd-&proftpd-version;">
 
-<!ENTITY courier-version   "0.47">
-<!ENTITY courier-package   "courier-&courier-version;.tar.bz2">
-<!ENTITY courier-md5       "639bb3b236914e3b86f287ce3f55264e">
-<!ENTITY courier-directory "courier-&courier-version;">
+<!ENTITY vsftpd-version   "2.0.3">
+<!ENTITY vsftpd-package   "vsftpd-&vsftpd-version;.tar.bz2">
+<!ENTITY vsftpd-md5       "10063454d1c90aa87a3aa508019cea4a">
+<!ENTITY vsftpd-directory "vsftpd-&vsftpd-version;">
+
+<!ENTITY xinetd-version   "2.3.13">
+<!ENTITY xinetd-package   "xinetd-&xinetd-version;.tar.bz2">
+<!ENTITY xinetd-md5       "10743b19a0b007c14092ab610918ec9c">
+<!ENTITY xinetd-directory "xinetd-&xinetd-version;">
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch22.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,37 +1,35 @@
 <!--************* packages for chapter 22 *************-->
 
-<!ENTITY bind-version   "9.3.0">
-<!ENTITY bind-package   "bind-&bind-version;.tar.bz2">
-<!ENTITY bind-md5       "dad42a60a5004067499f266247ae59c7">
-<!ENTITY bind-directory "bind-&bind-version;">
+<!ENTITY courier-version   "0.47">
+<!ENTITY courier-package   "courier-&courier-version;.tar.bz2">
+<!ENTITY courier-md5       "639bb3b236914e3b86f287ce3f55264e">
+<!ENTITY courier-directory "courier-&courier-version;">
 
-<!ENTITY bind-patch     "bind-&bind-version;-patch1">
-<!ENTITY bind-patch-md5 "90733dadf1487e035a8b94951e55fbb7">
+<!ENTITY exim-version   "4.43">
+<!ENTITY exim-package   "exim-&exim-version;.tar.bz2">
+<!ENTITY exim-md5       "f8f646d4920660cb5579becd9265a3bf">
+<!ENTITY exim-directory "exim-&exim-version;">
 
-<!ENTITY dhcp-version   "3.0.2">
-<!ENTITY dhcp-package   "dhcp-&dhcp-version;.tar.bz2">
-<!ENTITY dhcp-md5       "93392daf448d4c147859f5f0f5a06fe9">
-<!ENTITY dhcp-directory "dhcp-&dhcp-version;">
+<!ENTITY exim-db43-patch     "exim-&exim-version;-db43-1.patch">
 
-<!ENTITY dhcp-iproute2-patch     "dhcp-&dhcp-version;-iproute2-2.patch">
-<!ENTITY dhcp-iproute2-patch-md5 "214a97722db618276425878d1f54323e">
+<!ENTITY postfix-version   "2.1.5">
+<!ENTITY postfix-package   "postfix-&postfix-version;.tar.bz2">
+<!ENTITY postfix-md5       "feaf838fa5f26dd429933a250e51050e">
+<!ENTITY postfix-directory "postfix-&postfix-version;">
 
-<!ENTITY leafnode-version   "1.10.8">
-<!ENTITY leafnode-package   "leafnode-&leafnode-version;.rel.tar.bz2">
-<!ENTITY leafnode-md5       "1d8d27673780ba49fcb69883c2cabdec">
-<!ENTITY leafnode-directory "leafnode-&leafnode-version;.rel">
+<!ENTITY qpopper-version   "4.0.5">
+<!ENTITY qpopper-package   "qpopper&qpopper-version;.tar.bz2">
+<!ENTITY qpopper-md5       "e4f8814376a156c650c7ec546bd3a847">
+<!ENTITY qpopper-directory "qpopper&qpopper-version;">
 
-<!ENTITY openldap-version   "2.2.20">
-<!ENTITY openldap-package   "openldap-&openldap-version;.tar.bz2">
-<!ENTITY openldap-md5       "72a9847cb579e3b62fc8689d728101c3">
-<!ENTITY openldap-directory "openldap-&openldap-version;">
+<!ENTITY sendmail-version   "8.13.3">
+<!ENTITY sendmail-package   "sendmail.&sendmail-version;.tar.bz2">
+<!ENTITY sendmail-md5       "cc9bf828c2bf9df923a219e3ca1f4780">
+<!ENTITY sendmail-directory "sendmail-&sendmail-version;">
 
-<!ENTITY samba-version   "3.0.11">
-<!ENTITY samba-package   "samba-&samba-version;.tar.bz2">
-<!ENTITY samba-md5       "d5b253f59951868f444b318e45335cb0">
-<!ENTITY samba-directory "samba-&samba-version;">
 
-<!ENTITY xinetd-version   "2.3.13">
-<!ENTITY xinetd-package   "xinetd-&xinetd-version;.tar.bz2">
-<!ENTITY xinetd-md5       "10743b19a0b007c14092ab610918ec9c">
-<!ENTITY xinetd-directory "xinetd-&xinetd-version;">
+
+
+
+
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch24.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch24.ent	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/config_standard/packages/ch24.ent	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,19 +1,20 @@
 <!--************* packages for chapter 24 **************-->
 
-<!ENTITY apache-version   "2.0.53">
-<!ENTITY apache-package   "httpd-&apache-version;.tar.bz2">
-<!ENTITY apache-md5       "94f3a793fb1665365724943206cce23f">
-<!ENTITY apache-directory "httpd-&apache-version;">
+<!ENTITY dhcp-version   "3.0.2">
+<!ENTITY dhcp-package   "dhcp-&dhcp-version;.tar.bz2">
+<!ENTITY dhcp-md5       "93392daf448d4c147859f5f0f5a06fe9">
+<!ENTITY dhcp-directory "dhcp-&dhcp-version;">
 
-<!ENTITY apache-patch     "httpd-&apache-version;-config-1.patch">
-<!ENTITY apache-patch-md5 "a294b404bcb22ae19060331bd12674ee">
+<!ENTITY dhcp-iproute2-patch     "dhcp-&dhcp-version;-iproute2-2.patch">
+<!ENTITY dhcp-iproute2-patch-md5 "214a97722db618276425878d1f54323e">
 
-<!ENTITY proftpd-version   "1.2.10">
-<!ENTITY proftpd-package   "proftpd-&proftpd-version;.tar.bz2">
-<!ENTITY proftpd-md5       "5feb4a7348e12faefc25e34fd92efdd6">
-<!ENTITY proftpd-directory "proftpd-&proftpd-version;">
+<!ENTITY leafnode-version   "1.10.8">
+<!ENTITY leafnode-package   "leafnode-&leafnode-version;.rel.tar.bz2">
+<!ENTITY leafnode-md5       "1d8d27673780ba49fcb69883c2cabdec">
+<!ENTITY leafnode-directory "leafnode-&leafnode-version;.rel">
 
-<!ENTITY vsftpd-version   "2.0.1">
-<!ENTITY vsftpd-package   "vsftpd-&vsftpd-version;.tar.bz2">
-<!ENTITY vsftpd-md5       "a2f365398da34fd0dbce671ceccb2af9">
-<!ENTITY vsftpd-directory "vsftpd-&vsftpd-version;">
+<!ENTITY openldap-version   "2.2.20">
+<!ENTITY openldap-package   "openldap-&openldap-version;.tar.bz2">
+<!ENTITY openldap-md5       "72a9847cb579e3b62fc8689d728101c3">
+<!ENTITY openldap-directory "openldap-&openldap-version;">
+

Modified: profiles/BLFS/trunk/wget/chapter10.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter10.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter10.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -8,7 +8,7 @@
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/compface-1.4.tar.bz2
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/compface-1.4-errno-2.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/ImageMagick-6.2.3-0.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/ImageMagick-6.2.3-3.tar.bz2
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/hd2u-1.0.0.tar.bz2
 

Modified: profiles/BLFS/trunk/wget/chapter18.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter18.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter18.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,29 +1,33 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/ncftp-3.1.7-src.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cvs-1.11.20.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/cvs-1.11.20-zlib-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/cvs-1.11.18.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/cvs-1.11.18-zlib-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/inetutils-1.4.2.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/I-K/inetutils-1.4.2-kernel_headers-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/subversion-1.1.3.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/ncftp-3.1.9-src.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/W-Z/wget-1.9.1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/ncpfs-2.2.4.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/T-V/tcp_wrappers_7.6.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/T-V/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/net-tools-1.60.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/net-tools-1.60-gcc34-3.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/net-tools-1.60-kernel_headers-2.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/net-tools-1.60-mii_ioctl-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/portmap_5beta.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/portmap-5beta-compilation_fixes-3.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/portmap-5beta-glibc_errno_fix-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/ntp-4.2.0.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/inetutils-1.4.2.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/I-K/inetutils-1.4.2-kernel_headers-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/openssh-4.1p1.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/nfs-utils-1.0.6.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/portmap_5beta.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/portmap-5beta-compilation_fixes-3.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/portmap-5beta-glibc_errno_fix-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/ncpfs-2.2.4.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/rsync-2.6.5.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/ntp-4.2.0.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/samba-3.0.14a.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/net-tools-1.60.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/net-tools-1.60-gcc34-3.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/net-tools-1.60-kernel_headers-2.patch
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/net-tools-1.60-mii_ioctl-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/subversion-1.1.4.tar.bz2
+
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/T-V/tcp_wrappers_7.6.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/T-V/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/W-Z/wget-1.9.1.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter19.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter19.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter19.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,10 +1,9 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/T-V/traceroute-1.4a12.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/T-V/traceroute-1.4a12.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/nmap-3.75.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/nmap-3.75.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/W-Z/whois_4.6.26.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/W-Z/whois-4.7.5.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/bind-9.3.0.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/bind-9.3.0-patch1
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/bind-9.3.1.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/ethereal-0.10.9.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/D-E/ethereal-0.10.11.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter20.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter20.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter20.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,12 +1,12 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/nail-11.20.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/nail-11.22.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/procmail-3.22.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/procmail-3.22.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/fetchmail-6.2.5.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/fetchmail-6.2.5.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/mutt-1.4.2.1i.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/mutt-1.4.2.1i.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/pine4.60.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/pine-4.60-fhs-3.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/pine4.63.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/pine-4.63-fhs-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/slrn-0.9.8.1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/slrn-0.9.8.1.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter21.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter21.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter21.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,11 +1,12 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/postfix-2.1.5.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/postfix-2.1.5-pfixtls-0.8.18-2.1.3-0.9.7d.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/httpd-2.0.54.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/httpd-2.0.54-config-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/sendmail.8.13.3.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/bind-9.3.1.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/exim-4.43.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/exim-4.43-db43-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/nfs-utils-1.0.7.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/qpopper4.0.5.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/proftpd-1.2.10.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/courier-0.47.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/T-V/vsftpd-2.0.3.tar.bz2
+
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/W-Z/xinetd-2.3.13.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter22.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter22.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter22.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,18 +1,11 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/bind-9.3.0.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/A-C/bind-9.3.0-patch1
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/A-C/courier-0.47.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/dhcp-3.0.2.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/dhcp-3.0.2-iproute2-2.patch
-ftp://ftp.lfs-matrix.net/pub/blfs/blfs-packages/conglomeration/dhcp/dhcp-3.0.2-iproute2-2.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/D-E/exim-4.43.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/D-E/exim-4.43-db43-1.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/L/leafnode-1.10.8.rel.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/postfix-2.1.5.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/postfix-2.1.5-pfixtls-0.8.18-2.1.3-0.9.7d.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/openssh-3.9p1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/qpopper4.0.5.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/rsync-2.6.3.tar.bz2
-
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/openldap-2.2.20.tar.bz2
-
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/Q-S/samba-3.0.11.tar.bz2
-
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/W-Z/xinetd-2.3.13.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/Q-S/sendmail.8.13.3.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter24.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter24.urls	2005-07-05 18:29:53 UTC (rev 1927)
+++ profiles/BLFS/trunk/wget/chapter24.urls	2005-07-07 22:04:18 UTC (rev 1928)
@@ -1,6 +1,6 @@
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/httpd-2.0.53.tar.bz2
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/httpd-2.0.53-config-1.patch
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/D-E/dhcp-3.0.2.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/D-E/dhcp-3.0.2-iproute2-2.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/M-P/proftpd-1.2.10.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/leafnode-1.10.8.rel.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/T-V/vsftpd-2.0.1.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/M-P/openldap-2.2.20.tar.bz2




More information about the alfs-log mailing list