r1636 - in profiles/BLFS/trunk: . chapter14 chapter16 chapter17 chapter18 chapter19 chapter20 chapter21 chapter22 chapter23 chapter24 config_standard config_standard/named config_standard/packages misc wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Dec 7 10:09:46 PST 2004


Author: thomasp
Date: 2004-12-07 11:09:44 -0700 (Tue, 07 Dec 2004)
New Revision: 1636

Added:
   profiles/BLFS/trunk/chapter18/net-tools.xml
   profiles/BLFS/trunk/chapter18/subversion.xml
   profiles/BLFS/trunk/chapter19/ethereal.xml
   profiles/BLFS/trunk/chapter24/vsftpd.xml
   profiles/BLFS/trunk/config_standard/named/
   profiles/BLFS/trunk/config_standard/named/root.hints
Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter14/dhclient.xml
   profiles/BLFS/trunk/chapter14/dhcpcd.xml
   profiles/BLFS/trunk/chapter16/curl.xml
   profiles/BLFS/trunk/chapter16/libsoup.xml
   profiles/BLFS/trunk/chapter16/wvstreams.xml
   profiles/BLFS/trunk/chapter17/links.xml
   profiles/BLFS/trunk/chapter17/lynx.xml
   profiles/BLFS/trunk/chapter17/w3m.xml
   profiles/BLFS/trunk/chapter18/cvs.xml
   profiles/BLFS/trunk/chapter18/inetutils.xml
   profiles/BLFS/trunk/chapter18/ncpfs.xml
   profiles/BLFS/trunk/chapter18/nfs-utils.xml
   profiles/BLFS/trunk/chapter18/ntp.xml
   profiles/BLFS/trunk/chapter18/tcpwrappers.xml
   profiles/BLFS/trunk/chapter19/bind-utils.xml
   profiles/BLFS/trunk/chapter19/whois.xml
   profiles/BLFS/trunk/chapter20/fetchmail.xml
   profiles/BLFS/trunk/chapter20/nail.xml
   profiles/BLFS/trunk/chapter20/procmail.xml
   profiles/BLFS/trunk/chapter20/slrn.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/chapter23/db.xml
   profiles/BLFS/trunk/chapter23/db3.xml
   profiles/BLFS/trunk/chapter23/mysql.xml
   profiles/BLFS/trunk/chapter23/postgresql.xml
   profiles/BLFS/trunk/chapter24/apache.xml
   profiles/BLFS/trunk/chapter24/php.xml
   profiles/BLFS/trunk/chapter24/proftpd.xml
   profiles/BLFS/trunk/config_standard/config.ent
   profiles/BLFS/trunk/config_standard/packages/ch16.ent
   profiles/BLFS/trunk/config_standard/packages/ch17.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/ch23.ent
   profiles/BLFS/trunk/config_standard/packages/ch24.ent
   profiles/BLFS/trunk/misc/template.xml
   profiles/BLFS/trunk/wget/chapter11.urls
   profiles/BLFS/trunk/wget/chapter13.urls
   profiles/BLFS/trunk/wget/chapter16.urls
   profiles/BLFS/trunk/wget/chapter17.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/chapter23.urls
   profiles/BLFS/trunk/wget/chapter24.urls
Log:
svn-20041205 chaps 16-24

Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/BLFS.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -185,6 +185,7 @@
     <stage name="Chapter 18 (Basic Networking Programs)">
       <xi:include href="chapter18/ncftp.xml" />
       <xi:include href="chapter18/cvs.xml" />
+      <xi:include href="chapter18/subversion.xml" />
       <xi:include href="chapter18/wget.xml" />
       <xi:include href="chapter18/tcpwrappers.xml" />
       <xi:include href="chapter18/portmap.xml" />
@@ -192,12 +193,14 @@
       <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" />
       <xi:include href="chapter19/nmap.xml" />
       <xi:include href="chapter19/whois.xml" />
       <xi:include href="chapter19/bind-utils.xml" />
+      <xi:include href="chapter19/ethereal.xml" />
     </stage>
     <stage name="Chapter 20 (Mail/News Clients)">
       <xi:include href="chapter20/nail.xml" />
@@ -234,6 +237,7 @@
       <xi:include href="chapter24/apache.xml" />
       <xi:include href="chapter24/php.xml" />
       <xi:include href="chapter24/proftpd.xml" />
+      <xi:include href="chapter24/vsftpd.xml" />
     </stage>
     <stage name="Chapter 25 (X Window Environment)">
       <xi:include href="chapter25/xorg.xml" />

Modified: profiles/BLFS/trunk/chapter14/dhclient.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhclient.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter14/dhclient.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -48,8 +48,8 @@
         <content>
 	  =ONBOOT=yes
 	  =SERVICE=dhclient"
-	  =DHCP_START="-q &dhclient-start-params;"
-	  =DHCP_STOP="-q -r &dhclient-stop-params;"
+	  =DHCP_START="&dhclient-start-params;"
+	  =DHCP_STOP="&dhclient-stop-params;"
 	</content>
       </textdump>
       <textdump>
@@ -60,7 +60,8 @@
 	  =interface "eth0" {
 	  = prepend domain-name-servers 127.0.0.1;
 	  = request subnet-mask, broadcast-address, time-offset, routers,
-	  = domain-name, domain-name-servers, host-name; =require subnet-mask, domain-name-servers;
+	  =	    domain-name, domain-name-servers, host-name; 
+	  = require subnet-mask, domain-name-servers;
 	  =}
 	  =# end dhclient.conf
 	</content>

Modified: profiles/BLFS/trunk/chapter14/dhcpcd.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhcpcd.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter14/dhcpcd.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -56,12 +56,19 @@
     </stage>
     <stage name="Configuring dhcpcd">
       <textdump>
-        <file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
+        <file>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</file>
         <content>
 	  =ONBOOT=yes
+	  =SERVICE=dhcpcd
 	  =DHCP_START="&dhcpcd-start-params;"
 	  =DHCP_STOP="&dhcpcd-stop-params;"
-	  =SERVICE=dhcpcd</content>
+	  =# Set PRINTIP="yes" to have the script print the DHCP assigned IP address.
+	  =PRINTIP="no"
+
+	  =# Set PRINTALL="yes" to print the DHCP assigned values for IP, SM, DG, and 1st NS.
+	  =# This requires PRINTIP="yes"
+	  =PRINTALL="no"
+	</content>
       </textdump>
     </stage>
     &bootscripts-clean;

Modified: profiles/BLFS/trunk/chapter16/curl.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/curl.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter16/curl.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -14,6 +14,9 @@
   <package name="curl" version="&curl-version;">
     <packageinfo>
       <utilizes>
+	<name>pkgconfig</name>
+      </utilizes>
+      <utilizes>
         <name>openssl</name>
       </utilizes>
       <utilizes>

Modified: profiles/BLFS/trunk/chapter16/libsoup.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/libsoup.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter16/libsoup.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -16,15 +16,12 @@
       <requires>
         <name>glib2</name>
       </requires>
+      <requires>
+	<name>libxml2</name>
+      </requires>
       <utilizes>
         <name>gtk-doc</name>
       </utilizes>
-      <utilizes>
-        <name>openssl</name>
-      </utilizes>
-      <utilizes>
-        <name>gnutls</name>
-      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -38,7 +35,6 @@
       </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
-        <param>--libexecdir=/usr/sbin</param>
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter16/wvstreams.xml
===================================================================
--- profiles/BLFS/trunk/chapter16/wvstreams.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter16/wvstreams.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -16,6 +16,33 @@
       <requires>
         <name>openssl</name>
       </requires>
+      <utilizes>
+	<name>libfam</name>
+      </utilizes>
+      <utilizes>
+	<name>db</name>
+      </utilizes>
+      <utilizes>
+	<name>gdbm</name>
+      </utilizes>
+      <utilizes>
+	<name>libogg</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>tcl</name>
+      </utilizes>
+      <utilizes>
+	<name>qt</name>
+      </utilizes>
+      <utilizes>
+	<name>speex</name>
+      </utilizes>
+      <utilizes>
+	<name>libvorbis</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -30,26 +57,22 @@
       <patch>
         <param>-N</param>
         <param>-p1</param>
-        <param>-i &packages_dir;/&wvstreams-wvcrypto-patch;</param>
+        <param>-i &packages_dir;/&wvstreams-tcl-patch;</param>
       </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&wvstreams-wvresolver-patch;</param>
-      </patch>
     </stage>
     <stage name="Installing">
     <stageinfo>
       <base>&build_dir;/&wvstreams-directory;</base>
     </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+    </configure>
+    <make />
     <make>
-      <param>PREFIX=/usr</param>
-      <param>LDFLAGS="-lcrypt"</param>
+      <param>install</param>
     </make>
-    <make>
-      <param>PREFIX=/usr</param>
-      <param>install</param>
-    </make>&ldconfig;</stage>
+    &ldconfig;
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&wvstreams-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter17/links.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/links.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter17/links.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -29,9 +29,6 @@
         <name>libtiff</name>
       </utilizes>
       <utilizes>
-        <name>svgalib</name>
-      </utilizes>
-      <utilizes>
         <name>&ximpl;</name>
       </utilizes>
     </packageinfo>

Modified: profiles/BLFS/trunk/chapter17/lynx.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/lynx.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter17/lynx.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,14 +17,17 @@
         <name>openssl</name>
       </utilizes>
       <utilizes>
-        <name>gnutls</name>
+        <name>&mta-impl;</name>
       </utilizes>
       <utilizes>
-        <name>mta</name>
+        <name>zip</name>
       </utilizes>
       <utilizes>
-        <name>zip</name>
+	<name>unzip</name>
       </utilizes>
+      <utilizes>
+	<name>slang</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -40,6 +43,7 @@
         <param>--prefix=/usr</param>
         <param>--libdir=/etc</param>
         <param>--with-zlib</param>
+	<param>--with-bzlib</param>
       </configure>
       <make />
       <make>
@@ -55,6 +59,10 @@
         <param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
         <param>install-help</param>
       </make>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>/usr/share/doc/lynx-&lynx-version;/lynx_doc</name>
+      </ownership>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&lynx-directory;</remove>

Modified: profiles/BLFS/trunk/chapter17/w3m.xml
===================================================================
--- profiles/BLFS/trunk/chapter17/w3m.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter17/w3m.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,6 +17,9 @@
         <name>gc</name>
       </requires>
       <utilizes>
+	<name>pkgconfig</name>
+      </utilizes>
+      <utilizes>
         <name>gpm</name>
       </utilizes>
       <utilizes>

Modified: profiles/BLFS/trunk/chapter18/cvs.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/cvs.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/cvs.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -12,12 +12,39 @@
 ]>
 <alfs>
   <package name="cvs" version="&cvs-version;">
+    <packageinfo>
+      <utilizes>
+	<name>gdbm</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>&ghostscript-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>&mta-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>vim</name>
+      </utilizes>
+    </packageinfo>      
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&cvs-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&cvs-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&cvs-zlib-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&cvs-directory;</base>

Modified: profiles/BLFS/trunk/chapter18/inetutils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/inetutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/inetutils.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -19,6 +19,9 @@
       <utilizes>
         <name>tcpwrappers</name>
       </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -26,18 +29,29 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&inetutils-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&inetutils-kernel-header-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&inetutils-directory;</base>
       </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
-        <param>--disable-syslogd</param>
-        <param>--libexecdir=/usr/sbin</param>
+	<param>--libexecdir=/usr/sbin</param>
+	<param>--sysconfdir=/etc</param>
+	<param>--localstatedir=/var</param>
+	<param>--mandir=/usr/share/man</param>
         <param>--infodir=/usr/share/info</param>
-        <param>--sysconfdir=/etc</param>
-        <param>--localstatedir=/var</param>
-        <param>--mandir=/usr/share/man</param>
+	<param>--disable-logger</param>
+	<param>--disable-syslogd</param>
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter18/ncpfs.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,7 +17,7 @@
   <package name="ncpfs" version="&ncpfs-version;">
     <packageinfo>
       <utilizes>
-        <name>linux-pam</name>
+        <name>linuxpam</name>
       </utilizes>
       <utilizes>
         <name>php</name>
@@ -53,15 +53,14 @@
         <base>&build_dir;/&blfs-bootscripts-directory;</base>
       </stageinfo>
       <make>
-        <param>make install-service-ipx</param>
+        <param>install-service-ipx</param>
       </make>
-      <textdump base="/etc/sysconfig/network-devices/">
-        <file>ifconfig.ipx0</file>
+      <textdump>
+        <file>/etc/sysconfig/network-devices/ifconfig.eth0/ipx</file>
         <content>
-	  =ONBOOT=yes
-	  =SERVICE=ipx
-	  =IPXDEV=eth0
-	  =FRAME=802.2
+	  =ONBOOT="yes"
+	  =SERVICE="ipx"
+	  =FRAME="802.2"
 	</content>
       </textdump>
     </stage>

Added: profiles/BLFS/trunk/chapter18/net-tools.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/net-tools.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/net-tools.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -0,0 +1,78 @@
+<?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="net-tools" version="&net-tools-version;">
+  <stage name="Unpacking.">
+    <unpack>
+      <archive>&packages_dir;/&net-tools-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  <stage name="Patching.">
+    <stageinfo>
+      <base>&build_dir;/&net-tools-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&net-tools-gcc34-patch;</param>
+    </patch>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&net-tools-kernel-header-patch;</param>
+    </patch>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&net-tools-mii-ioctl-patch;</param>
+    </patch>
+  </stage>
+  <stage name="Installing.">
+    <stageinfo>
+      <base>&build_dir;/&net-tools-directory;</base>
+    </stageinfo>
+    <make>
+      <prefix>yes "" |</prefix>
+      <param>config</param>
+    </make>
+    <search_replace>
+      <file>config.h</file>
+      <find>HAVE_IP_TOOLS 0</find>
+      <replace>HAVE_IP_TOOLS 1</replace>
+    </search_replace>
+    <search_replace>
+      <file>config.h</file>
+      <find>HAVE_MII 0</find>
+      <replace>HAVE_MII 1</replace>
+    </search_replace>
+    <search_replace>
+      <file>config.make</file>
+      <find>HAVE_IP_TOOLS=0</find>
+      <replace>HAVE_IP_TOOLS=1</replace>
+    </search_replace>
+    <search_replace>
+      <file>config.make</file>
+      <find>HAVE_MII=0</find>
+      <replace>HAVE_MII=1</replace>
+    </search_replace>   
+    <make />
+    <make>
+      <param>update</param>
+    </make>
+  </stage>
+  <stage name="Cleanup.">
+    <remove>&build_dir;/&net-tools-directory;</remove>
+  </stage>
+</package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter18/nfs-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -28,11 +28,11 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
+      <execute command="getent group nogroup > /dev/null || groupadd">
         <param>-g 65534</param>
         <param>nogroup</param>
       </execute>
-      <execute command="useradd">
+      <execute command="getent passwd nobody > /dev/null || useradd">
         <param>-c nobody</param>
         <param>-d /home</param>
         <param>-g nogroup</param>
@@ -61,6 +61,15 @@
       <make>
         <param>install-nfs-server</param>
       </make>
+      <textdump base="/etc/sysconfig">
+	<file>nfs-server</file>
+	<content>
+	  =PORT="2049"
+	  =PROCESSES="8"
+	  =QUOTAS="no"
+	  =KILLDELAY="10"
+	</content>
+      </textdump>
       <make>
         <param>install-nfs-client</param>
       </make>

Modified: profiles/BLFS/trunk/chapter18/ntp.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ntp.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/ntp.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -46,9 +46,21 @@
       <textdump base="/etc">
         <file>ntp.conf</file>
         <content>
-	  =server time-a.nist.gov prefer
-	  =server time-b.nist.gov
-	  =server tick.usno.navy.mil
+	  =# Africa
+	  =server tock.nml.csir.co.za
+	  =
+	  =# Asia
+	  =server ntp.shim.org
+	  =
+	  =# Australia
+	  =server ntp.saard.net
+	  =
+	  =# Europe
+	  =server ntp.tuxfamily.net
+	  =
+	  =# North America
+	  =server clock.psu.edu
+	  =
 	  =driftfile /var/cache/ntp.drift
 	</content>
       </textdump>

Added: profiles/BLFS/trunk/chapter18/subversion.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/subversion.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/subversion.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -0,0 +1,75 @@
+<?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="subversion" version="&subversion-version;">
+  <packageinfo>
+    <requires>
+      <name>libxml2</name>
+    </requires>
+    <utilizes>
+      <name>expat</name>
+    </utilizes>
+    <utilizes>
+      <name>pkgconfig</name>
+    </utilizes>
+    <utilizes>
+      <name>db</name>
+    </utilizes>
+    <utilizes>
+      <name>gdbm</name>
+    </utilizes>
+    <utilizes>
+      <name>python</name>
+    </utilizes>
+    <utilizes>
+      <name>apache</name>
+    </utilizes>
+    <utilizes>
+      <name>j2sdk</name>
+    </utilizes>
+    <utilizes>
+      <name>openssl</name>
+    </utilizes>
+    <utilizes>
+      <name>openssh</name>
+    </utilizes>
+    <utilizes>
+      <name>&krb-impl;</name>
+    </utilizes>
+    <utilizes>
+      <name>xinetd</name>
+    </utilizes>
+  </packageinfo>
+  <stage name="Unpacking.">
+    <unpack>
+      <archive>&packages_dir;/&subversion-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  <stage name="Installing.">
+    <stageinfo>
+      <base>&build_dir;/&subversion-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>
+  </stage>
+  <stage name="Cleanup.">
+    <remove>&build_dir;/&subversion-directory;</remove>
+  </stage>
+</package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter18/tcpwrappers.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -27,6 +27,11 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</param>
       </patch>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&tcpwrappers-gcc34-patch;</param>
+      </patch>
     </stage>
     <stage name="Installing">
       <stageinfo>

Modified: profiles/BLFS/trunk/chapter19/bind-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/bind-utils.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter19/bind-utils.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -32,6 +32,15 @@
         <param>-C lib/isc</param>
       </make>
       <make>
+	<param>-C lib/bind9</param>
+      </make>
+      <make>
+	<param>-C lib/isccfg</param>
+      </make>
+      <make>
+	<param>-C lib/lwres</param>
+      </make>
+      <make>
         <param>-C bin/dig</param>
       </make>
       <make>

Added: profiles/BLFS/trunk/chapter19/ethereal.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/ethereal.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter19/ethereal.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -0,0 +1,69 @@
+<?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/ch19.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+
+%general_entities;
+%package_entities;
+%config_entities;
+
+]>
+<alfs>
+<package name="ethereal" version="&ethereal-version;">
+  <packageinfo>
+    <utilizes>
+      <name>libpcap</name>
+    </utilizes>
+    <utilizes>	
+      <name>pkgconfig</name>
+    </utilizes>
+    <utilizes>
+      <name>gtk+2</name>
+    </utilizes>
+    <utilizes>
+      <name>glib2</name>
+    </utilizes>
+    <utilizes>
+      <name>openssl</name>
+    </utilizes>
+    <utilizes>
+      <name>&krb-impl;</name>
+    </utilizes>
+    <utilizes>
+      <name>python</name>
+    </utilizes>
+    <utilizes>
+      <name>pcre</name>
+    </utilizes>
+    <utilizes>
+      <name>doxygen</name>
+    </utilizes>
+  </packageinfo>
+  <stage name="Unpacking.">
+    <unpack>
+      <archive>&packages_dir;/&ethereal-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  <stage name="Installing.">
+    <stageinfo>
+      <base>&build_dir;/&ethereal-directory;</base>
+    </stageinfo>
+    <configure>
+      <param>--prefix=/usr</param>
+      <param>--sysconfdir=/etc</param>
+      <param>--enable-randpkt</param>
+      <param>--enable-threads</param>
+    </configure>
+    <make />
+    <make>
+      <param>install</param>
+    </make>
+  </stage>
+  <stage name="Cleanup.">
+    <remove>&build_dir;/&ethereal-directory;</remove>
+  </stage>
+</package>
+</alfs>

Modified: profiles/BLFS/trunk/chapter19/whois.xml
===================================================================
--- profiles/BLFS/trunk/chapter19/whois.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter19/whois.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -22,6 +22,11 @@
       <stageinfo>
         <base>&build_dir;/&whois-directory;</base>
       </stageinfo>
+      <search_replace>
+	<file>config.h</file>
+	<find>4.6.20</find>
+	<replace>4.6.21</replace>
+      </search_replace>
       <make />
       <make>
         <param>prefix=/usr</param>

Modified: profiles/BLFS/trunk/chapter20/fetchmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/fetchmail.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter20/fetchmail.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -19,6 +19,12 @@
       <requires>
         <name>procmail</name>
       </requires>
+      <utilizes>
+	<name>python</name>
+      </utilizes>
+      <utilizes>
+	<name>tk</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter20/nail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/nail.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter20/nail.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -16,6 +16,9 @@
       <utilizes>
         <name>openssl</name>
       </utilizes>
+      <utilizes>
+	<name>&mta-impl;</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -27,11 +30,12 @@
       <stageinfo>
         <base>&build_dir;/&nail-directory;</base>
       </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-      </configure>
-      <make />
       <make>
+	<param>SENDMAIL=/usr/sbin/sendmail</param>
+      </make>
+      <make>
+	<param>PREFIX=/usr</param>
+	<param>UCBINSTALL=/usr/bin/install</param>
         <param>install</param>
       </make>
       <link>

Modified: profiles/BLFS/trunk/chapter20/procmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/procmail.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter20/procmail.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -23,7 +23,6 @@
         <base>&build_dir;/&procmail-directory;</base>
       </stageinfo>
       <make>
-        <param>BASENAME=/usr</param>
         <param>LOCKINGTEST=/tmp</param>
         <param>install</param>
       </make>

Modified: profiles/BLFS/trunk/chapter20/slrn.xml
===================================================================
--- profiles/BLFS/trunk/chapter20/slrn.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter20/slrn.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -16,6 +16,12 @@
       <requires>
         <name>slang</name>
       </requires>
+      <requires>
+	<name>&mta-impl;</name>
+      </requires>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter21/courier.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/courier.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter21/courier.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -16,6 +16,33 @@
       <requires>
         <name>gdbm</name>
       </requires>
+      <utilizes>
+	<name>mysql</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>gnupg</name>
+      </utilizes>
+      <utilizes>
+	<name>expect</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking.">
       <unpack>
@@ -24,18 +51,18 @@
       </unpack>
     </stage>
     <stage name="Creating user and group">
-      <execute command="groupadd">
+      <execute command="getent group courier > /dev/null || groupadd">
         <param>-f</param>
         <param>courier</param>
       </execute>
-      <execute command="grep -q ^courier /etc/passwd || useradd">
+      <execute command="getent passwd courier > /dev/null || useradd">
         <param>-c courier</param>
         <param>-d /dev/null</param>
         <param>-g courier</param>
         <param>-s /bin/false</param>
         <param>courier</param>
       </execute>
-      <execute command="grep -q ^bin /etc/passwd || useradd">
+      <execute command="getent passwd bin > /dev/null || useradd">
         <param>-c bin</param>
         <param>-d /dev/null</param>
         <param>-g bin</param>

Modified: profiles/BLFS/trunk/chapter21/exim.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/exim.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter21/exim.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -19,6 +19,21 @@
       <requires>
         <name>db</name>
       </requires>
+      <utilizes>
+	<name>&ximpl;</name>
+      </utilizes>
+      <utilizes>
+	<name>openldap</name>
+      </utilizes>
+      <utilizes>
+	<name>mysql</name>
+      </utilizes>
+      <utilizes>
+	<name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking.">
       <unpack>
@@ -28,11 +43,10 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group exim > /dev/null || groupadd">
         <param>exim</param>
       </execute>
-      <execute command="grep -q ^exim /etc/passwd || useradd">
+      <execute command="getent passwd exim > /dev/null || useradd">
         <param>-c exim</param>
         <param>-d /dev/null</param>
         <param>-g exim</param>

Modified: profiles/BLFS/trunk/chapter21/postfix.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter21/postfix.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -19,6 +19,21 @@
       <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>cyrus-sasl</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -28,27 +43,24 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group postfix > /dev/null || groupadd">
         <param>postfix</param>
       </execute>
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group postdrop > /dev/null || groupadd">
         <param>postdrop</param>
       </execute>
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group nogroup > /dev/null || groupadd">
         <param>-g 65534</param>
         <param>nogroup</param>
       </execute>
-      <execute command="grep -q ^postfix /etc/passwd || useradd">
+      <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="grep -q ^nobody /etc/passwd || useradd">
+      <execute command="getent passwd nobody > /dev/null || useradd">
         <param>-c nobody</param>
         <param>-d /home</param>
         <param>-g nogroup</param>

Modified: profiles/BLFS/trunk/chapter21/qpopper.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/qpopper.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter21/qpopper.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -14,8 +14,20 @@
   <package name="qpopper" version="&qpopper-version;">
     <packageinfo>
       <requires>
-        <name>postfix</name>
+        <name>&mta-impl;</name>
       </requires>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>gdbm</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>mitkrb</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -38,10 +50,6 @@
         <file>/etc/inetd.conf</file>
         <content>=pop stream tcp nowait root /usr/sbin/popper popper</content>
       </textdump>
-      <textdump mode="append">
-        <file>/etc/services</file>
-        <content>=pop 110/tcp</content>
-      </textdump>
       <execute command="killall inetd || inetd" />
       <textdump mode="append">
         <file>/etc/syslog.conf</file>

Modified: profiles/BLFS/trunk/chapter21/sendmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter21/sendmail.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -22,6 +22,24 @@
       <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>&ghostscript-impl;</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking.">
       <unpack>
@@ -31,15 +49,13 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group smmsp > /dev/null || groupadd">
         <param>smmsp</param>
       </execute>
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group mail > /dev/null || groupadd">
         <param>mail</param>
       </execute>
-      <execute command="grep -q ^smmsp /etc/passwd || useradd">
+      <execute command="getent passwd smmsp > /dev/null || useradd">
         <param>-g smmsp</param>
         <param>-G mail</param>
         <param>-s /bin/false</param>

Modified: profiles/BLFS/trunk/chapter22/bind.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/bind.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -4,10 +4,12 @@
 <!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">
@@ -15,6 +17,20 @@
 ]>
 <alfs>
   <package name="bind" version="&bind-version;">
+    <packageinfo>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>db</name>
+      </utilizes>
+      <utilizes>
+	<name>openjade</name>
+      </utilizes>
+      <utilizes>
+	<name>jadetex</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&bind-package;</archive>
@@ -23,11 +39,10 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group named > /dev/null || groupadd">
         <param>named</param>
       </execute>
-      <execute command="grep -q ^named /etc/passwd || useradd">
+      <execute command="getent passwd named > /dev/null || useradd">
         <param>-c named</param>
         <param>-m</param>
         <param>-g named</param>
@@ -92,10 +107,19 @@
 	  = controls {
 	  =   inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
 	  = };
-	  = key "rndc_key" {
-	  =   algorithm hmac-md5;
-	  =   secret "[c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K]";
-	  = };
+	</content>
+      </textdump>
+      <execute command="rndc-confgen">
+	<param>-a -b 512</param>
+	<param>-c key.tmp</param>
+      </execute>
+      <execute command="cat">
+	<param>>> /home/named/etc/named.conf</param>
+	<param>< key.tmp</param>
+      </execute>
+      <textdump mode="append">
+	<file>/home/named/etc/named.conf</file>
+	<content>
 	  = zone "." {
 	  =   type hint;
 	  =   file "root.hints";
@@ -104,8 +128,58 @@
 	  =   type master;
 	  =   file "pz/127.0.0";
 	  = };
+	  =
+	  =// Bind 9 now logs by default through syslog (except debug).
+	  =// These are the default logging rules.
+	  =
+	  =logging {
+	  =     category default { default_syslog; default_debug; };
+	  =     category unmatched { null; };
+	  =
+	  =  channel default_syslog {
+	  =      syslog daemon;                      // send to syslog's daemon
+	  =                                          // facility
+	  =      severity info;                      // only send priority info
+	  =                                          // and higher
+	  =  };
+	  =
+	  =  channel default_debug {
+	  =      file "named.run";                   // write to named.run in
+	  =                                          // the working directory
+	  =                                          // Note: stderr is used instead
+	  =                                          // of "named.run"
+	  =                                          // if the server is started
+	  =                                          // with the '-f' option.
+	  =      severity dynamic;                   // log at the server's
+	  =                                          // current debug level
+	  =  };
+	  =
+	  =  channel default_stderr {
+	  =      stderr;                             // writes to stderr
+	  =      severity info;                      // only send priority info
+	  =                                          // and higher
+	  =  };
+	  =
+	  =  channel null {
+	  =     null;                                // toss anything sent to
+	  =                                          // this channel
+	  =  };
+	  =};
 	</content>
       </textdump>
+      <execute command="cat">
+	<param>>> /etc/rndc.conf</param>
+	<param>< key.tmp</param>
+      </execute>
+      <textdump mode="append">
+        <file>/etc/rndc.conf</file>
+        <content>
+	  =options {
+	  =    default-server localhost;
+	  =    default-key    rndc_key;
+	  =};
+	</content>
+      </textdump>
       <textdump>
         <file>/home/named/etc/namedb/pz/127.0.0</file>
         <content>
@@ -120,51 +194,10 @@
 	  =1		    PTR	    localhost.
 	</content>
       </textdump>
-      <textdump>
-        <file>/home/named/etc/namedb/root.hints</file>
-        <content>
-	  =.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-	  =.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-	  =A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-	  =B.ROOT-SERVERS.NET.     6D  IN      A       128.9.0.107
-	  =C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-	  =D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
-	  =E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-	  =F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-	  =G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-	  =H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
-	  =I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-	  =J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-	  =K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-	  =L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
-	  =M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-	</content>
-      </textdump>
-      <textdump>
-        <file>/etc/rndc.conf</file>
-        <content>
-	  =key rndc_key {
-	  =algorithm "hmac-md5";
-	  =    secret
-	  =    "[c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K]";
-	  =    };
-	  =options {
-	  =    default-server localhost;
-	  =    default-key    rndc_key;
-	  =};
-	</content>
-      </textdump>
+      <copy base="&blfs-config;/named">
+	<source>root.hints</source>
+	<destination>/home/named/etc/namedb</destination>
+      </copy>
       <copy base="/etc">
         <source>resolv.conf</source>
         <destination>resolv.conf.bak</destination>

Modified: profiles/BLFS/trunk/chapter22/dhcp.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/dhcp.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -22,9 +22,19 @@
       </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-package;</base>
+        <base>&build_dir;/&dhcp-directory;</base>
       </stageinfo>
       <configure />
       <make />
@@ -43,10 +53,10 @@
 	  =max-lease-time 144000;
 	  =ddns-update-style ad-hoc;
 	  =
-	  =subnet 192.168.5.0 netmask 255.255.255.0 {
-	  =  range 192.168.5.10 192.168.5.240;
-	  =  option broadcast-address 195.168.5.255;
-	  =  option routers 192.168.5.1;
+	  =subnet &dhcp-subnet; netmask &dhcp-netmask; {
+	  =  range &dhcp-beg-range; &dhcp-end-range;;
+	  =  option broadcast-address &dhcp-broadcast;;
+	  =  option routers &dhcp-routers-addr;;
 	  =}
 	</content>
       </textdump>

Modified: profiles/BLFS/trunk/chapter22/leafnode.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/leafnode.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/leafnode.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,8 +17,11 @@
         <name>pcre</name>
       </requires>
       <requires>
+	<name>tcpwrappers</name>
+      </requires>
+      <utilizes>
         <name>xinetd</name>
-      </requires>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -27,11 +30,10 @@
       </unpack>
     </stage>
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group news > /dev/null || groupadd">
         <param>news</param>
       </execute>
-      <execute command="grep -q ^news /etc/passwd || useradd">
+      <execute command="getent passwd news > /dev/null || useradd">
         <param>-g news</param>
         <param>news</param>
       </execute>
@@ -43,16 +45,30 @@
     <configure>
       <param>--prefix=/usr</param>
       <param>--localstatedir=/var</param>
-      <param>--sysconfdir=/etc/news</param>
-      <param>--with-lockfile=/var/lock/fetchnews.lck</param>
+      <param>--sysconfdir=/etc/leafnode</param>
+      <param>--with-lockfile=/var/lock/leafnode/fetchnews.lck</param>
     </configure>
     <make />
     <make>
       <param>install</param>
-    </make>&ldconfig; 
-    <make>
-      <param>update</param>
     </make>
+    &ldconfig;
+    <copy>
+      <source>/etc/leafnode/config.example</source>
+      <destination>/etc/leafnode/config</destination>
+    </copy>
+    <textdump base="/etc">
+      <file>nntpserver</file>
+      <content>
+	=127.0.0.1
+      </content>
+    </textdump>
+    <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>
@@ -70,10 +86,7 @@
         =}
 	</content>
     </textdump>
-    <copy>
-      <source>/etc/news/config.example</source>
-      <destination>/etc/news/config</destination>
-    </copy></stage>
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&leafnode-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter22/openldap.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openldap.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/openldap.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,6 +17,9 @@
         <name>db</name>
       </requires>
       <utilizes>
+	<name>cyrus-sasl</name>
+      </utilizes>
+      <utilizes>
         <name>openssl</name>
       </utilizes>
       <utilizes>
@@ -26,11 +29,8 @@
         <name>tcpwrappers</name>
       </utilizes>
       <utilizes>
-        <name>readline</name>
+        <name>&krb-impl;</name>
       </utilizes>
-      <utilizes>
-        <name>heimdal</name>
-      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -46,9 +46,9 @@
         <param>--prefix=/usr</param>
         <param>--libexecdir=/usr/sbin</param>
         <param>--sysconfdir=/etc</param>
-        <param>--localstatedir=/var/lib</param>
+        <param>--localstatedir=/srv/ldap</param>
+        <param>--enable-ldbm</param>
         <param>--disable-debug</param>
-        <param>--enable-ldbm</param>
       </configure>
       <make>
         <param>depend</param>
@@ -60,6 +60,9 @@
       <make>
         <param>install</param>
       </make>
+      <permissions mode="755">
+	<name>/usr/lib/libl*-2.2.so.7.0.10</name>
+      </permissions>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&openldap-directory;</remove>

Modified: profiles/BLFS/trunk/chapter22/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/openssh.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -22,6 +22,21 @@
       <utilizes>
         <name>linuxpam</name>
       </utilizes>
+      <utilizes>
+	<name>tcpwrappers</name>
+      </utilizes>
+      <utilizes>
+	<name>&ximpl;</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>j2sdk</name>
+      </utilizes>
+      <utilizes>
+	<name>net-tools</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -31,11 +46,10 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group sshd > /dev/null || groupadd">
         <param>sshd</param>
       </execute>
-      <execute command="grep -q ^sshd /etc/passwd || useradd">
+      <execute command="getent passwd sshd > /dev/null || useradd">
         <param>-c sshd</param>
         <param>-d /var/empty</param>
         <param>-g sshd</param>

Modified: profiles/BLFS/trunk/chapter22/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/rsync.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/rsync.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="rsync" version="&rsync-version;">
@@ -18,12 +21,12 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group rsyncd > /dev/null || groupadd">
         <param>rsyncd</param>
       </execute>
-      <execute command="grep -q ^rsyncd /etc/passwd || useradd">
+      <execute command="getent passwd rsyncd > /dev/null || useradd">
         <param>-c rsyncd</param>
         <param>-d /home/rsync</param>
         <param>-g rsyncd</param>
@@ -43,7 +46,7 @@
         <param>install</param>
       </make>
       <textdump base="/etc">
-        <file>/etc/rsyncd.conf</file>
+        <file>rsyncd.conf</file>
         <content>
 	  =# This is a basic rsync configuration file
 	  =# It exports a single module without user authentication.
@@ -61,9 +64,17 @@
 	</content>
       </textdump>
     </stage>
+    <stage name="Installing bootscript and configuration">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-rsyncd</param>
+      </make>
+    </stage>    
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&rsync-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/samba.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter22/samba.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -15,6 +15,41 @@
 ]>
 <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>stunnel</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking.">
       <unpack>
         <archive>&packages_dir;/&samba-package;</archive>
@@ -22,16 +57,6 @@
       </unpack>
     </stage>
     &bootscripts-get;
-    <stage name="Patching.">
-      <stageinfo>
-        <base>&build_dir;/&samba-directory;/source</base>
-      </stageinfo>
-      <patch base="&build_dir;/&samba-directory;">
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&samba-maintainer-patch;</param>
-      </patch>
-    </stage>
     <stage name="Installing.">
       <stageinfo>
         <base>&build_dir;/&samba-directory;/source</base>
@@ -52,6 +77,9 @@
       <make>
         <param>install</param>
       </make>
+      <permissions mode="644">
+	<name>/usr/include/libsmbclient.h</name>
+      </permissions>
       <copy>
         <source>nsswitch/libnss_win{s,bind.so}</source>
         <destination>/lib</destination>
@@ -75,18 +103,21 @@
       </copy>
       <textdump mode="append">
         <file>/etc/services</file>
-        <content>=swat		901/tcp</content>
+        <content>
+	=swat		901/tcp
+	=swat_tunnel	902/tcp
+	</content>
       </textdump>
       <textdump mode="append">
         <file>/etc/inetd.conf</file>
-        <content>=swat stream tcp nowait.400 root /usr/sbin/swat swat</content>
+        <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
+	  =service swat_tunnel
 	  ={
-	  =    port            = 901
+	  =    port            = 902
 	  =    socket_type     = stream
 	  =    wait            = no
 	  =    only_from       = 127.0.0.1
@@ -96,6 +127,14 @@
 	  =}
 	</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>

Modified: profiles/BLFS/trunk/chapter23/db.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter23/db.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -12,6 +12,14 @@
 ]>
 <alfs>
   <package name="db" version="&db-version;">
+    <packageinfo>
+      <utilizes>
+	<name>tcl</name>
+      </utilizes>
+      <utilizes>
+	<name>j2sdk</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&db-package;</archive>

Modified: profiles/BLFS/trunk/chapter23/db3.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db3.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter23/db3.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -18,6 +18,21 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+	<stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&db3-directory;/build_unix</base>
+      </stageinfo>
+      <patch base="&build_dir;/&db3-directory;">
+        <param>-N</param>
+        <param>-p0</param>
+        <param>-i &packages_dir;/&db3-patch1;</param>
+      </patch>
+      <patch base="&build_dir;/&db3-directory;">
+        <param>-N</param>
+        <param>-p0</param>
+        <param>-i &packages_dir;/&db3-patch2;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&db3-directory;/build_unix</base>
@@ -28,11 +43,10 @@
       </configure>
       <make />
       <make>
-        <param>docdir=/opt/db-3.3/Berkeley-DB</param>
+        <param>docdir=/opt/db-3.3/doc/Berkeley-DB</param>
         <param>install</param>
       </make>
-      <remove>/opt/db-3.3/lib/libdb.so</remove>
-      <execute command="cd /opt/db-3.3/lib/ &real-amp;&real-amp; for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done" />
+      <execute command="cd /opt/db-3.3/lib/ &real-amp;&real-amp; mv libdb.so ..; for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done &real-amp;&real-amp; mv ../libdb.so ." />
       <execute command="sed 's/^DB185/DB/' /opt/db-3.3/include/db_185.h > /opt/db-3.3/include/db_185.h.new" />
       <move>
         <source>/opt/db-3.3/include/db_185.h.new</source>
@@ -44,6 +58,10 @@
         <target>/opt/db-3.3/include</target>
         <name>/usr/include/db3</name>
       </link>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>/opt/db-3.3/doc</name>
+      </ownership>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&db3-directory;</remove>

Modified: profiles/BLFS/trunk/chapter23/mysql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/mysql.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter23/mysql.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -17,14 +17,23 @@
   <package name="mysql" version="&mysql-version;">
     <packageinfo>
       <utilizes>
-        <name>readline</name>
-      </utilizes>
-      <utilizes>
         <name>openssl</name>
       </utilizes>
       <utilizes>
         <name>tcpwrappers</name>
       </utilizes>
+      <utilizes>
+	<name>which</name>
+      </utilizes>
+      <utilizes>
+	<name>orbit</name>
+      </utilizes>
+      <utilizes>
+	<name>doxygen</name>
+      </utilizes>
+      <utilizes>
+	<name>tex</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -34,11 +43,10 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group mysql > /dev/null || groupadd">
         <param>mysql</param>
       </execute>
-      <execute command="grep -q ^mysql /etc/passwd || useradd">
+      <execute command="getent passwd mysql > /dev/null || useradd">
         <param>-c mysql</param>
         <param>-d /dev/null</param>
         <param>-g mysql</param>
@@ -51,15 +59,19 @@
         <base>&build_dir;/&mysql-directory;</base>
       </stageinfo>
       <configure>
+	<prefix>CPPFLAGS="-D_GNU_SOURCE"</prefix>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc</param>
         <param>--libexecdir=/usr/sbin</param>
-        <param>--localstatedir=/var/lib/mysql</param>
+        <param>--localstatedir=/srv/mysql</param>
         <param>--enable-thread-safe-client</param>
+	<param>--enable-assembler</param>
         <param>--enable-local-infile</param>
-        <param>--enable-assembler</param>
+        <param>--with-named-thread-libs=-lpthread</param>
+	<param>--with-unix-socket-path=/var/run/mysql/mysql.sock</param>
         <param>--without-debug</param>
         <param>--without-bench</param>
+	<param>--without-readline</param>
       </configure>
       <make>
         <param>testdir=/usr/lib/mysql/mysql-test</param>
@@ -75,25 +87,26 @@
         <source>/usr/share/mysql/my-medium.cnf</source>
         <destination>/etc/my.cnf</destination>
       </copy>
-      <execute command="mysql_install_db" />
-      <ownership user="mysql" group="mysql">
-        <option>recursive</option>
-        <name>/var/lib/mysql</name>
-      </ownership>
-      <!--
-      <execute command="safe_mysqld 2>&real-amp;1 >/dev/null &real-amp;" />
-      <textdump>
-	<file>/tmp/mysql.script</file>
+      <execute command="mysql_install_db --user=mysql" />
+      <mkdir>
+	<name>/var/run/mysql</name>
+      </mkdir>
+      <ownership user="mysql">
+	<name>/var/run/mysql</name>
+     </ownership>
+<!--
+     <execute command="mysqld_safe 2>&real-amp;1 >/dev/null &real-amp;" />
+     <textdump>
+      <file>/tmp/mysql.script</file>
 	<content>
-	  =UPDATE user SET password=password(&mysql-password;) WHERE user='root';
+	  =UPDATE user SET password=password(&mysql-root-pass;) WHERE user='root';
 	  =FLUSH PRIVILEGES;
 	  =EXIT;
 	</content>
       </textdump>
       <execute command="mysql -uroot mysql < /tmp/mysql.script" />
       <remove>/tmp/mysql.script</remove>
-      <execute command="kill `pidof -x safe_mysqld mysqld`" />
-      -->
+      <execute command="kill `pidof -x mysqld_safe mysqld`" />-->
     </stage>
     <stage name="Installing bootscript and configuration">
       <stageinfo>

Modified: profiles/BLFS/trunk/chapter23/postgresql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/postgresql.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter23/postgresql.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -15,6 +15,38 @@
 ]>
 <alfs>
   <package name="postgresql" version="&postgresql-version;">
+    <packageinfo>
+      <utilizes>
+	<name>python</name>
+      </utilizes>
+      <utilizes>
+	<name>tcl</name>
+      </utilizes>
+      <utilizes>
+	<name>tk</name>
+      </utilizes>
+      <utilizes>
+	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>linuxpam</name>
+      </utilizes>
+      <utilizes>
+	<name>sgml-dtd31</name>
+      </utilizes>
+      <utilizes>
+	<name>docbook-dsssl</name>
+      </utilizes>
+      <utilizes>
+	<name>SGMLSpm</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>apache-ant</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&postgresql-package;</archive>
@@ -23,28 +55,48 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user">
-      <execute command="grep -q ^postgres /etc/passwd || useradd">
-        <param>-d /var/pgsql/data</param>
+      <execute command="getent passwd postgres > /dev/null || useradd">
+        <param>-d /srv/pgsql/data</param>
         <param>postgres</param>
       </execute>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&postgresql-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&postgresql-dsssl-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&postgresql-directory;</base>
       </stageinfo>
+      <execute command='sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+	/etc/sgml/catalog /etc/sgml/sgml-docbook.cat' />
       <configure>
         <param>--prefix=/usr</param>
+	<param>--enable-thread-safety</param>
       </configure>
       <make />
       <make>
         <param>install</param>
       </make>
+      <make>
+	<param>install-all-headers</param>
+      </make>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>/usr/share/doc/postgresql/html</name>
+      </ownership>
       <mkdir>
         <option>parents</option>
-        <name>/var/pgsql/data</name>
+        <name>/srv/pgsql/data</name>
       </mkdir>
       <ownership user="postgres">
-        <name>/var/pgsql/data</name>
+        <name>/srv/pgsql/data</name>
       </ownership>
     </stage>
     <stage name="Initializing database">
@@ -52,7 +104,7 @@
         <user>postgres</user>
       </stageinfo>
       <execute command="initdb">
-        <param>-D /var/pgsql/data</param>
+        <param>-D /srv/pgsql/data</param>
       </execute>
     </stage>
     <stage name="Installing bootscript and configuration">

Modified: profiles/BLFS/trunk/chapter24/apache.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/apache.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter24/apache.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -31,6 +31,9 @@
       <utilizes>
         <name>expat</name>
       </utilizes>
+      <utilizes>
+	<name>doxygen</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -40,11 +43,10 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group apache > /dev/null || groupadd">
         <param>apache</param>
       </execute>
-      <execute command="grep -q ^apache /etc/passwd || useradd">
+      <execute command="getent passwd apache > /dev/null || useradd">
         <param>-c apache</param>
         <param>-d /dev/null</param>
         <param>-g apache</param>
@@ -67,13 +69,36 @@
         <base>&build_dir;/&apache-directory;</base>
       </stageinfo>
       <configure>
-        <param>--enable-layout=LFS</param>
+        <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>

Modified: profiles/BLFS/trunk/chapter24/php.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/php.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter24/php.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -90,6 +90,7 @@
         <param>--with-iconv</param>
         <param>--with-mysql=/usr</param>
         <param>--with-ncurses</param>
+	<param>--with-readline</param>
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter24/proftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter24/proftpd.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -23,15 +23,25 @@
     </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
-      <execute command="groupadd">
-        <param>-f</param>
+      <execute command="getent group proftpd > /dev/null || groupadd">
         <param>proftpd</param>
       </execute>
-      <execute command="grep -q ^proftpd /etc/passwd || useradd">
+      <link>
+	<option>force</option>
+	<target>false</target>
+	<name>/bin/proftpdonly</name>
+      </link>
+      <textdump mode="append">
+	<file>/etc/shells</file>
+	<content>
+	  =/bin/proftpdonly
+	</content>
+      </textdump>
+      <execute command="getent passwd proftpd > /dev/null || useradd">
         <param>-c proftpd</param>
         <param>-d /home/ftp</param>
         <param>-g proftpd</param>
-        <param>-s /bin/false</param>
+        <param>-s /bin/proftpdonly</param>
         <param>proftpd</param>
       </execute>
     </stage>
@@ -44,7 +54,7 @@
         <prefix>install_group=proftpd</prefix>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc</param>
-        <param>--localstatedir=/var</param>
+        <param>--localstatedir=/var/run</param>
       </configure>
       <make />
       <make>

Added: profiles/BLFS/trunk/chapter24/vsftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/vsftpd.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/chapter24/vsftpd.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -0,0 +1,109 @@
+<?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>
+      <archive>&packages_dir;/&vsftpd-package;</archive>
+      <destination>&build_dir;</destination>
+    </unpack>
+  </stage>
+  &bootscripts-get;
+  <stage name="Creating user and group">
+    <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>
+    <mkdir>
+      <option>parents</option>
+      <name>/var/ftp/empty</name>
+      <name>/home/ftp</name>
+    </mkdir>
+    <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>

Modified: profiles/BLFS/trunk/config_standard/config.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/config.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/config.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -27,21 +27,33 @@
 
 <!-- configuration for dhclient -->
 <!-- These two entities should be set to appropriate values to start and stop dhclient -->
-<!ENTITY dhclient-start-params "">
-<!ENTITY dhclient-stop-params "-r">
+<!ENTITY dhclient-start-params "-q">
+<!ENTITY dhclient-stop-params "-q -r">
 
 <!-- configuration for dhcpcd -->
 <!-- These two entities should be set to appropriate values to start and stop dhcpcd -->
 <!ENTITY dhcpcd-start-params "">
 <!ENTITY dhcpcd-stop-params "-k">
 
+<!-- Kerberos Implementation -->
+<!-- MIT krb 5 (mitkrb) or Heimdal (heimdal) -->
+<!ENTITY krb-impl "heimdal">
+
+<!-- DHCP Config (Server) -->
+<!ENTITY dhcp-subnet "192.168.5.0">
+<!ENTITY dhcp-netmask "255.255.255.0">
+<!ENTITY dhcp-beg-range "192.168.5.10">
+<!ENTITY dhcp-end-range "192.168.5.240">
+<!ENTITY dhcp-broadcast "192.168.5.255">
+<!ENTITY dhcp-routers-addr "192.168.5.1">
+
 <!-- X Window System Implementation -->
 <!-- XFree86 (xfree86) or X.org (xorg) -->
 <!ENTITY ximpl "xorg">
 
 <!-- Ghostscript Implementation -->
-<!-- esp or afpl -->
-<!ENTITY ghostscript-impl "esp">
+<!-- esp (espghostscript) or afpl (ghostscript)-->
+<!ENTITY ghostscript-impl "espghostscript">
 
 <!-- GIF library implementation-->
 <!-- libungif or giflib -->
@@ -51,6 +63,9 @@
 <!-- sendmail, exim, courier, qpopper or postfix -->
 <!ENTITY mta-impl "sendmail">
 
+<!-- MySQL -->
+<!ENTITY mysql-root-pass "blahblah">
+
 <!-- where to put kde -->
 <!ENTITY kde-prefix "/usr">
 

Added: profiles/BLFS/trunk/config_standard/named/root.hints
===================================================================
--- profiles/BLFS/trunk/config_standard/named/root.hints	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/named/root.hints	2004-12-07 18:09:44 UTC (rev 1636)
@@ -0,0 +1,26 @@
+.                       6D  IN      NS      A.ROOT-SERVERS.NET.
+.                       6D  IN      NS      B.ROOT-SERVERS.NET.
+.                       6D  IN      NS      C.ROOT-SERVERS.NET.
+.                       6D  IN      NS      D.ROOT-SERVERS.NET.
+.                       6D  IN      NS      E.ROOT-SERVERS.NET.
+.                       6D  IN      NS      F.ROOT-SERVERS.NET.
+.                       6D  IN      NS      G.ROOT-SERVERS.NET.
+.                       6D  IN      NS      H.ROOT-SERVERS.NET.
+.                       6D  IN      NS      I.ROOT-SERVERS.NET.
+.                       6D  IN      NS      J.ROOT-SERVERS.NET.
+.                       6D  IN      NS      K.ROOT-SERVERS.NET.
+.                       6D  IN      NS      L.ROOT-SERVERS.NET.
+.                       6D  IN      NS      M.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
+B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
+C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
+D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
+E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
+F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
+G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
+H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
+I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
+J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
+K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
+L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
+M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33

Modified: profiles/BLFS/trunk/config_standard/packages/ch16.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch16.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch16.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,20 +1,19 @@
 <!--************* packages for chapter 16 *************-->
 
-<!ENTITY curl-version   "7.11.1">
+<!ENTITY curl-version   "7.12.2">
 <!ENTITY curl-package   "curl-&curl-version;.tar.bz2">
 <!ENTITY curl-directory "curl-&curl-version;">
 
-<!ENTITY wvstreams-version   "3.70">
+<!ENTITY wvstreams-version   "3.75.0">
 <!ENTITY wvstreams-package   "wvstreams-&wvstreams-version;.tar.gz">
 <!ENTITY wvstreams-directory "wvstreams-&wvstreams-version;">
 
-<!ENTITY wvstreams-wvcrypto-patch     "wvstreams-&wvstreams-version;-wvcrypto.patch">
-<!ENTITY wvstreams-wvresolver-patch   "wvstreams-&wvstreams-version;-wvresolver.patch">
+<!ENTITY wvstreams-tcl-patch "wvstreams-&wvstreams-version;-tcl84-1.patch">
 
 <!ENTITY gnet-version   "2.0.5">
 <!ENTITY gnet-package   "gnet-&gnet-version;.tar.gz">
 <!ENTITY gnet-directory "gnet-&gnet-version;">
 
-<!ENTITY libsoup-version   "1.99.28">
+<!ENTITY libsoup-version   "2.2.1">
 <!ENTITY libsoup-package   "libsoup-&libsoup-version;.tar.bz2">
 <!ENTITY libsoup-directory "libsoup-&libsoup-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch17.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch17.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch17.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,6 +1,6 @@
 <!--************* packages for chapter 17 *************-->
 
-<!ENTITY links-version   "2.1pre14">
+<!ENTITY links-version   "2.1pre15">
 <!ENTITY links-package   "links-&links-version;.tar.bz2">
 <!ENTITY links-directory "links-&links-version;">
 
@@ -8,6 +8,6 @@
 <!ENTITY lynx-package   "lynx&lynx-version;.tar.bz2">
 <!ENTITY lynx-directory "lynx2-8-5">
 
-<!ENTITY w3m-version   "0.4.2">
+<!ENTITY w3m-version   "0.5.1">
 <!ENTITY w3m-package   "w3m-&w3m-version;.tar.gz">
 <!ENTITY w3m-directory "w3m-&w3m-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch18.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch18.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch18.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -4,10 +4,16 @@
 <!ENTITY ncftp-package   "ncftp-&ncftp-version;-src.tar.bz2">
 <!ENTITY ncftp-directory "ncftp-&ncftp-version;">
 
-<!ENTITY cvs-version   "1.11.16">
+<!ENTITY cvs-version   "1.11.18">
 <!ENTITY cvs-package   "cvs-&cvs-version;.tar.bz2">
 <!ENTITY cvs-directory "cvs-&cvs-version;">
 
+<!ENTITY cvs-zlib-patch "cvs-&cvs-version;-zlib-1.patch">
+
+<!ENTITY subversion-version "1.1.1">
+<!ENTITY subversion-package "subversion-&subversion-version;.tar.bz2">
+<!ENTITY subversion-directory "subversion-&subversion-version;">
+
 <!ENTITY wget-version   "1.9.1">
 <!ENTITY wget-package   "wget-&wget-version;.tar.gz">
 <!ENTITY wget-directory "wget-&wget-version;">
@@ -16,19 +22,22 @@
 <!ENTITY tcpwrappers-package   "tcp_wrappers_&tcpwrappers-version;.tar.gz">
 <!ENTITY tcpwrappers-directory "tcp_wrappers_&tcpwrappers-version;">
 
-<!ENTITY tcpwrappers-shared-libs-plus-plus-patch     "tcp_wrappers-&tcpwrappers-version;-shared-lib-plus-plus.patch">
+<!ENTITY tcpwrappers-shared-libs-plus-plus-patch "tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch">
+<!ENTITY tcpwrappers-gcc34-patch "tcp_wrappers-&tcpwrappers-version;-gcc34-1.patch">
 
 <!ENTITY portmap-version   "5beta">
 <!ENTITY portmap-package   "portmap_&portmap-version;.tar.gz">
 <!ENTITY portmap-directory "portmap_&portmap-version;">
 
-<!ENTITY portmap-compilation-fixes-patch    "portmap-&portmap-version;-compilation-fixes-2.patch">
-<!ENTITY portmap-glibc-errno-fix-patch    "portmap-&portmap-version;-glibc-errno-fix.patch">
+<!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 inetutils-version   "1.4.2">
 <!ENTITY inetutils-package   "inetutils-&inetutils-version;.tar.gz">
 <!ENTITY inetutils-directory "inetutils-&inetutils-version;">
 
+<!ENTITY inetutils-kernel-header-patch "inetutils-&inetutils-version;-kernel_headers-1.patch">
+
 <!ENTITY nfs-utils-version   "1.0.6">
 <!ENTITY nfs-utils-package   "nfs-utils-&nfs-utils-version;.tar.gz">
 <!ENTITY nfs-utils-directory "nfs-utils-&nfs-utils-version;">
@@ -40,3 +49,12 @@
 <!ENTITY ntp-version   "4.2.0">
 <!ENTITY ntp-package   "ntp-&ntp-version;.tar.gz">
 <!ENTITY ntp-directory "ntp-&ntp-version;">
+
+<!ENTITY net-tools-version "1.60">
+<!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.gz">
+<!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-kernel-header-patch "net-tools-&net-tools-version;-kernel_headers-2.patch">
+<!ENTITY net-tools-mii-ioctl-patch "net-tools-&net-tools-version;-mii_ioctl-1.patch">
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch19.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch19.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch19.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -4,14 +4,19 @@
 <!ENTITY traceroute-package   "traceroute-&traceroute-version;.tar.gz">
 <!ENTITY traceroute-directory "traceroute-&traceroute-version;">
 
-<!ENTITY nmap-version   "3.50">
+<!ENTITY nmap-version   "3.70">
 <!ENTITY nmap-package   "nmap-&nmap-version;.tar.bz2">
 <!ENTITY nmap-directory "nmap-&nmap-version;">
 
-<!ENTITY whois-version   "4.6.14">
-<!ENTITY whois-package   "whois-&whois-version;.tar.gz">
+<!ENTITY whois-version   "4.6.21">
+<!ENTITY whois-package   "whois_&whois-version;.tar.gz">
 <!ENTITY whois-directory "whois-&whois-version;">
 
-<!ENTITY bind-utils-version "9.2.3">
+<!ENTITY bind-utils-version "9.3.0">
 <!ENTITY bind-utils-package "bind-&bind-utils-version;.tar.gz">
 <!ENTITY bind-utils-directory "bind-&bind-utils-version;">
+
+<!ENTITY ethereal-version "0.10.6">
+<!ENTITY ethereal-package "ethereal-&ethereal-version;.tar.bz2">
+<!ENTITY ethereal-directory "ethereal-&ethereal-version;">
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch20.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch20.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch20.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,6 +1,6 @@
 <!--************* packages for chapter 20 *************-->
 
-<!ENTITY nail-version   "10.7">
+<!ENTITY nail-version   "11.11">
 <!ENTITY nail-package   "nail-&nail-version;.tar.bz2">
 <!ENTITY nail-directory "nail-&nail-version;">
 
@@ -22,6 +22,6 @@
 
 <!ENTITY pine-patch     "pine-&pine-version;-fhs-3.patch">
 
-<!ENTITY slrn-version   "0.9.8.0">
+<!ENTITY slrn-version   "0.9.8.1">
 <!ENTITY slrn-package   "slrn-&slrn-version;.tar.bz2">
 <!ENTITY slrn-directory "slrn-&slrn-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch21.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch21.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch21.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,10 +1,10 @@
 <!--************* packages for chapter 21 *************-->
 
-<!ENTITY postfix-version   "2.1.1">
+<!ENTITY postfix-version   "2.1.5">
 <!ENTITY postfix-package   "postfix-&postfix-version;.tar.gz">
 <!ENTITY postfix-directory "postfix-&postfix-version;">
 
-<!ENTITY sendmail-version "8.12.10">
+<!ENTITY sendmail-version "8.13.1">
 <!ENTITY sendmail-package "sendmail.&sendmail-version;.tar.gz">
 <!ENTITY sendmail-directory "sendmail-&sendmail-version;">
 

Modified: profiles/BLFS/trunk/config_standard/packages/ch22.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch22.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch22.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,18 +1,20 @@
 <!--************* packages for chapter 22 *************-->
 
-<!ENTITY bind-version   "9.2.3">
+<!ENTITY bind-version   "9.3.0">
 <!ENTITY bind-package   "bind-&bind-version;.tar.gz">
 <!ENTITY bind-directory "bind-&bind-version;">
 
-<!ENTITY dhcp-version "3.0pl2">
+<!ENTITY dhcp-version "3.0.1">
 <!ENTITY dhcp-package "dhcp-&dhcp-version;.tar.gz">
 <!ENTITY dhcp-directory "dhcp-&dhcp-version;">
 
-<!ENTITY leafnode-version   "1.9.43">
+<!ENTITY dhcp-iproute2-patch "dhcp-&dhcp-version;-iproute2-1.patch">
+
+<!ENTITY leafnode-version   "1.10.0">
 <!ENTITY leafnode-package   "leafnode-&leafnode-version;.rel.tar.bz2">
 <!ENTITY leafnode-directory "leafnode-&leafnode-version;.rel">
 
-<!ENTITY openssh-version   "3.8.1p1">
+<!ENTITY openssh-version   "3.9p1">
 <!ENTITY openssh-package   "openssh-&openssh-version;.tar.gz">
 <!ENTITY openssh-directory "openssh-&openssh-version;">
 
@@ -20,14 +22,13 @@
 <!ENTITY rsync-package   "rsync-&rsync-version;.tar.gz">
 <!ENTITY rsync-directory "rsync-&rsync-version;">
 
-<!ENTITY openldap-version   "2.1.30">
-<!ENTITY openldap-package   "openldap-&openldap-version;.tgz">
+<!ENTITY openldap-version   "2.2.17">
+<!ENTITY openldap-package   "openldap-stable-20040923.tgz">
 <!ENTITY openldap-directory "openldap-&openldap-version;">
 
-<!ENTITY samba-version "3.0.4">
+<!ENTITY samba-version "3.0.7">
 <!ENTITY samba-package "samba-&samba-version;.tar.bz2">
 <!ENTITY samba-directory "samba-&samba-version;">
-<!ENTITY samba-maintainer-patch "samba-&samba-version;-maintainer.patch">
 
 <!ENTITY xinetd-version   "2.3.13">
 <!ENTITY xinetd-package   "xinetd-&xinetd-version;.tar.gz">

Modified: profiles/BLFS/trunk/config_standard/packages/ch23.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch23.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch23.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -9,11 +9,15 @@
 <!ENTITY db3-version   "3.3.11">
 <!ENTITY db3-package   "db-&db3-version;.tar.gz">
 <!ENTITY db3-directory "db-&db3-version;">
+<!ENTITY db3-patch1 "patch.&db3-version;.1">
+<!ENTITY db3-patch2 "patch.&db3-version;.2">
 
-<!ENTITY mysql-version   "4.0.20">
+<!ENTITY mysql-version   "4.1.7">
 <!ENTITY mysql-package   "mysql-&mysql-version;.tar.gz">
 <!ENTITY mysql-directory "mysql-&mysql-version;">
 
-<!ENTITY postgresql-version   "7.4.2">
+<!ENTITY postgresql-version   "7.4.6">
 <!ENTITY postgresql-package   "postgresql-&postgresql-version;.tar.bz2">
 <!ENTITY postgresql-directory "postgresql-&postgresql-version;">
+<!ENTITY postgresql-dsssl-patch "postgresql-&postgresql-version;-dsssl_fix-1.patch">
+

Modified: profiles/BLFS/trunk/config_standard/packages/ch24.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch24.ent	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/config_standard/packages/ch24.ent	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,16 +1,20 @@
 <!--************* packages for chapter 24 **************-->
 
-<!ENTITY apache-version   "2.0.49">
-<!ENTITY apache-package   "httpd-&apache-version;.tar.gz">
+<!ENTITY apache-version   "2.0.52">
+<!ENTITY apache-package   "httpd-&apache-version;.tar.bz2">
 <!ENTITY apache-directory "httpd-&apache-version;">
 
-<!ENTITY apache-patch     "httpd-&apache-version;-config.patch">
+<!ENTITY apache-patch     "httpd-&apache-version;-config-1.patch">
 
-<!ENTITY php-version   "4.3.6">
+<!ENTITY php-version   "5.0.2">
 <!ENTITY php-package   "php-&php-version;.tar.bz2">
 <!ENTITY php-directory "php-&php-version;">
 
-<!ENTITY proftpd-version   "1.2.9">
+<!ENTITY proftpd-version   "1.2.10">
 <!ENTITY proftpd-package   "proftpd-&proftpd-version;.tar.bz2">
 <!ENTITY proftpd-directory "proftpd-&proftpd-version;">
 
+<!ENTITY vsftpd-version "2.0.1">
+<!ENTITY vsftpd-package "vsftpd-&vsftpd-version;.tar.gz">
+<!ENTITY vsftpd-directory "vsftpd-&vsftpd-version;">
+

Modified: profiles/BLFS/trunk/misc/template.xml
===================================================================
--- profiles/BLFS/trunk/misc/template.xml	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/misc/template.xml	2004-12-07 18:09:44 UTC (rev 1636)
@@ -10,6 +10,7 @@
 %config_entities;
 
 ]>
+<alfs>
 <package name="" version="">
   <stage name="Unpacking.">
     <unpack>
@@ -33,3 +34,4 @@
     <remove>&build_dir;/</remove>
   </stage>
 </package>
+</alfs>

Modified: profiles/BLFS/trunk/wget/chapter11.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter11.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter11.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -23,4 +23,4 @@
 
 ftp://ftp.uni-koeln.de/util/shell/mc-4.6.0.tar.gz
 
-ftp://ibiblio.org/pub/linux/system/status/sysstat-5.0.6.tar.gz
+http://perso.wanadoo.fr/sebastien.godard/sysstat-5.0.6.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter13.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter13.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter13.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,3 +1,3 @@
 ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz
 
-ftp://ftp.ing-steen.se/pub/unix/unsort/wvdial-1.54.0.tar.gz
+http://open.nit.ca/download/wvdial-1.54.0.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter16.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter16.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter16.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,9 +1,8 @@
-http://curl.haxx.se/download/curl-7.11.2.tar.bz2
+http://curl.haxx.se/download/curl-7.12.2.tar.bz2
 
-ftp://ftp.ing-steen.se/pub/unix/unsort/wvstreams-3.70.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/wvstreams-3.70-wvcrypto.patch
-http://www.linuxfromscratch.org/patches/blfs/5.1/wvstreams-3.70-wvresolver.patch
+http://people.nit.ca/~jim/wvstreams-3.75.0.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/wvstreams-3.75.0-tcl84-1.patch
 
 http://gnetlibrary.org/src/gnet-2.0.5.tar.gz
 
-ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-1.99.28.tar.bz2
+ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.1.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter17.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter17.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter17.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,5 +1,5 @@
-ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/links-2.1pre14.tar.bz2
+ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/links-2.1pre15.tar.bz2
 
 ftp://lynx.isc.org/lynx2.8.5/lynx2.8.5.tar.bz2
 
-http://unc.dl.sourceforge.net/sourceforge/w3m/w3m-0.4.2.tar.gz
+http://unc.dl.sourceforge.net/sourceforge/w3m/w3m-0.5.1.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter18.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter18.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter18.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,20 +1,31 @@
 http://public.planetmirror.com/pub/ncftp/ncftp/ncftp-3.1.7-src.tar.bz2
 
-http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cvs/1.11.16/cvs-1.11.16.tar.bz2
+http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cvs/1.11.18/cvs-1.11.18.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/cvs-1.11.18-zlib-1.patch
 
+http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2
+
 ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz
 
 ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/tcp_wrappers-7.6-shared-lib-plus-plus.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/tcp_wrappers-7.6-gcc34-1.patch
 
 ftp://ftp.porcupine.org/pub/security/portmap_5beta.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/portmap-5beta-compilation-fixes-2.patch
-http://www.linuxfromscratch.org/patches/blfs/5.1/portmap-5beta-glibc-errno-fix.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/portmap-5beta-compilation_fixes-3.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/portmap-5beta-glibc_errno_fix-1.patch
 
 ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/inetutils-1.4.2-kernel_headers-1.patch
 
 ftp://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-1.0.6.tar.gz
 
 ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.4.tar.gz
 
 ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2.0.tar.gz
+
+ftp://ftp.ibiblio.org/pub/Linux/distributions/rootlinux/rootlinux-1.3/source/base/net-tools/net-tools-1.60.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/net-tools-1.60-gcc34-3.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/net-tools-1.60-kernel_headers-2.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/net-tools-1.60-mii_ioctl-1.patch
+

Modified: profiles/BLFS/trunk/wget/chapter19.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter19.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter19.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,7 +1,9 @@
 ftp://ftp.ee.lbl.gov/traceroute-1.4a12.tar.gz
 
-http://download.insecure.org/nmap/dist/nmap-3.50.tar.bz2
+http://download.insecure.org/nmap/dist/nmap-3.70.tar.bz2
 
-http://site.n.ml.org/download/20040502200048/whois/whois-4.6.14.tar.gz
+http://ftp.debian.org/debian/pool/main/w/whois/whois_4.6.21.tar.gz
 
-ftp://ftp.isc.org/isc/bind9/9.2.3/bind-9.2.3.tar.gz
+ftp://ftp.isc.org/isc/bind9/9.3.0/bind-9.3.0.tar.gz
+
+ftp://ftp.ethereal.com/pub/ethereal/all-versions/ethereal-0.10.6.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter20.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter20.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter20.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,4 +1,4 @@
-http://unc.dl.sourceforge.net/sourceforge/nail/nail-10.7.tar.bz2
+http://unc.dl.sourceforge.net/sourceforge/nail/nail-11.11.tar.bz2
 
 ftp://ftp.procmail.net/pub/procmail/procmail-3.22.tar.gz
 
@@ -7,6 +7,6 @@
 ftp://ftp.mutt.org/mutt/mutt-1.4.2.1i.tar.gz
 
 http://ftp.azc.uam.mx/mirrors/pine/pine4.60.tar.bz2
-http://www.linuxfromscratch.org/patches/blfs/5.1/pine-4.60-fhs-3.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/pine-4.60-fhs-3.patch
 
-ftp://ftp.fh-heilbronn.de/pub/mirrors/slrn/slrn-0.9.8.0.tar.bz2
+ftp://ftp.fh-heilbronn.de/pub/mirrors/slrn/slrn-0.9.8.1.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter21.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter21.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter21.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,8 +1,8 @@
-ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.1.1.tar.gz
+ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.1.5.tar.gz
 
-ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.12.10.tar.gz
+ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.13.1.tar.gz
 
-http://ftp.plusline.de/exim/exim4/exim-4.24.tar.bz2
+http://mirror.etf.bg.ac.yu/freebsd/distfiles/exim/exim-4.24.tar.bz2
 
 ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.5.tar.gz
 

Modified: profiles/BLFS/trunk/wget/chapter22.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter22.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter22.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,16 +1,16 @@
-ftp://ftp.isc.org/isc/bind9/9.2.3/bind-9.2.3.tar.gz
+ftp://ftp.isc.org/isc/bind9/9.3.0/bind-9.3.0.tar.gz
 
-http://open-systems.ufl.edu/mirrors/ftp.isc.org/isc/dhcp/dhcp-3.0pl2.tar.gz
+ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.1.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/dhcp-3.0.1-iproute2-1.patch
 
-http://unc.dl.sourceforge.net/sourceforge/leafnode/leafnode-1.9.43.rel.tar.bz2
+http://unc.dl.sourceforge.net/sourceforge/leafnode/leafnode-1.10.0.rel.tar.bz2
 
-ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.8.1p1.tar.gz
+ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.9p1.tar.gz
 
-ftp://gd.tuwien.ac.at/utils/admin-tools/rsync/rsync-2.6.2.tar.gz
+http://rsync.samba.org/ftp/rsync/old-versions/rsync-2.6.2.tar.gz
 
-ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.1.30.tgz
+ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable/openldap-stable-20040923.tgz
 
-ftp://ftp.samba.org/pub/samba/samba-3.0.4.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/samba-3.0.4-maintainer.patch
+ftp://ftp.samba.org/pub/samba/stable/samba-3.0.7.tar.gz
 
 ftp://gd.tuwien.ac.at/infosys/servers/xinetd/xinetd-2.3.13.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter23.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter23.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter23.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -2,8 +2,11 @@
 http://www.sleepycat.com/update/4.2.52/patch.4.2.52.1
 http://www.sleepycat.com/update/4.2.52/patch.4.2.52.2
 
-ftp://ftp.pu.edu.tw/Unix/Database/BerkeleyDB/db-3.3.11.tar.gz
+ftp://sleepycat1.inetu.net/releases/db-3.3.11.tar.gz
+http://www.sleepycat.com/update/3.3.11/patch.3.3.11.1
+http://www.sleepycat.com/update/3.3.11/patch.3.3.11.2
 
-ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.0/mysql-4.0.20.tar.gz
+ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.1/mysql-4.1.7.tar.gz
 
-ftp://ftp.fr.postgresql.org/src/7.4.2/postgresql-7.4.2.tar.bz2
+ftp://ftp.fr.postgresql.org/v7.4.6/postgresql-7.4.6.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/postgresql-7.4.6-dsssl_fix-1.patch

Modified: profiles/BLFS/trunk/wget/chapter24.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter24.urls	2004-12-07 00:05:41 UTC (rev 1635)
+++ profiles/BLFS/trunk/wget/chapter24.urls	2004-12-07 18:09:44 UTC (rev 1636)
@@ -1,6 +1,8 @@
-http://archive.apache.org/dist/httpd/httpd-2.0.49.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/httpd-2.0.49-config.patch
+http://www.apache.org/dist/httpd/httpd-2.0.52.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/httpd-2.0.52-config-1.patch
 
-ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-4.3.6.tar.bz2
+http://us2.php.net/distributions/php-5.0.2.tar.bz2
 
-ftp://ftp.proftpd.org/distrib/source/proftpd-1.2.9.tar.bz2
+ftp://ftp.proftpd.org/distrib/source/proftpd-1.2.10.tar.bz2
+
+ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.1.tar.gz




More information about the alfs-log mailing list