Index: basicnet/djb/daemontools/daemontools-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,9 +2,15 @@
 <title>Contents</title>
 
-<para>The daemontools package contains <userinput>svscanboot svscan 
-supervise svc svok svstat fghack pgrphack readproctitle multilog tai64n 
-tai64nlocal setuidgid envuidgid envdir softlimit</userinput> and 
+<para>The daemontools package contains
+<userinput>svscanboot</userinput>, <userinput>svscan</userinput>,
+<userinput>supervise</userinput>, <userinput>svc</userinput>,
+<userinput>svok</userinput>, <userinput>svstat</userinput>,
+<userinput>fghack</userinput>, <userinput>pgrphack</userinput>,
+<userinput>readproctitle</userinput>, <userinput>multilog</userinput>,
+<userinput>tai64n</userinput>, <userinput>tai64nlocal</userinput>,
+<userinput>setuidgid</userinput>, <userinput>envuidgid</userinput>,
+<userinput>envdir</userinput>, <userinput>softlimit</userinput> and 
 <userinput>setlock</userinput>. More detailed descriptions of these 
-commands may be found at http://cr.yp.to/daemontools.html.</para>
+commands may be found at <ulink url="http://cr.yp.to/daemontools.html"/>.</para>
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -15,9 +15,9 @@
 the following commands are due to this difficulty.</para>
 
-<para><userinput>cd admin/daemontools-0.76: </userinput>First off, the 
+<para><userinput>cd admin/daemontools-0.76</userinput> : First off, the 
 package is unpacked in an "admin" directory. You will find the actual 
 packages two directory levels below this.</para>
 
-<para><userinput>package/compile: </userinput>This command actually 
+<para><userinput>package/compile</userinput> : This command actually 
 compiles the source and puts the binaries in a command directory.</para>
 
@@ -35,18 +35,17 @@
 daemons to run.</para>
 
-<para><userinput>cp * /usr/sbin: </userinput>We must manually copy the 
+<para><userinput>cp * /usr/sbin</userinput> : We must manually copy the 
 binaries to the /usr/sbin directory.</para>
 
 <para><screen><userinput>cat /etc/inittab boot.inittab &gt; /etc/inittab~</userinput>
-<userinput>mv -f /etc/inittab~ /etc/inittab</userinput></screen></para>
-
-<para>These commands append a line to /etc/inittab so that init will launch 
+<userinput>mv -f /etc/inittab~ /etc/inittab</userinput></screen>
+These commands append a line to /etc/inittab so that init will launch 
 the svscanboot script.</para>
 
-<para><userinput>mkdir /etc/service: </userinput>This command creates 
+<para><userinput>mkdir /etc/service</userinput> : This command creates 
 the daemontools control directory, which - even if empty - needs to exist for 
 daemontools to run properly.</para>
 
-<para><userinput>telinit Q: </userinput>This command tells the init 
+<para><userinput>telinit Q</userinput> : This command tells the init 
 process to re-read its configuration file (inittab) and act upon any 
 changes that have been made. The svscanboot script is started.</para>
Index: basicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-inst.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -4,5 +4,6 @@
 <para>Install daemontools by running the following commands:</para>
 
-<para><screen><userinput>cd admin/daemontools-0.76 &amp;&amp; 
+<para><screen><userinput>patch -Np1 -i ../daemontools-0.76.errno.patch &amp;&amp;
+cd admin/daemontools-0.76 &amp;&amp; 
 package/compile &amp;&amp;
 cd package &amp;&amp; 
Index: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -7,5 +7,6 @@
 Package size:                   &daemontools-size;
 Estimated Disk space required:  &daemontools-buildsize;</screen>
-
+<screen>Additional downloads:
+<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/daemontools-0.76.errno.patch">daemontools errno patch</ulink></screen>
 <para>The daemontools package is a replacement for inetd or xinetd. The main 
 reason for using it here is because it is recommended for use with qmail 
Index: basicnet/djb/daemontools/daemontools-man-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-man-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,8 +2,14 @@
 <title>Contents</title>
 
-<para>The daemontools-man package contains manpages for the daemontools
-commands <userinput>envdir envuidgid fghack multilog pgrphack
-readproctitle setlock setuidgid softlimit supervise svc svok svscan
-svscanboot svstat tai64n</userinput> and
+<para>The daemontools-man package contains man pages for the daemontools
+commands <userinput>envdir</userinput>,
+<userinput>envuidgid</userinput>, <userinput>fghack</userinput>,
+<userinput>multilog</userinput>, <userinput>pgrphack</userinput>,
+<userinput>readproctitle</userinput>, <userinput>setlock</userinput>,
+<userinput>setuidgid</userinput>, <userinput>softlimit</userinput>,
+<userinput>supervise</userinput>, <userinput>svc</userinput>,
+<userinput>svok</userinput>, <userinput>svscan</userinput>,
+<userinput>svscanboot</userinput>, <userinput>svstat</userinput>,
+<userinput>tai64n</userinput> and
 <userinput>tai64nlocal</userinput>.</para>
 
Index: basicnet/djb/daemontools/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><userinput>gzip -9 *.8: </userinput>You can compress the manpages
+<para><userinput>gzip -9 *.8</userinput> : You can compress the manpages
 to save space, but it isn't needed for the manpages to work.</para>
 
-<para><userinput>package/compile: </userinput>This command actually 
+<para><userinput>package/compile</userinput> : This command actually 
 compiles the source and puts the binaries in a command directory.</para>
 
Index: basicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/djb.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,6 +2,4 @@
 <?dbhtml filename="djb.html" dir="basicnet"?>
 <title>DJB's Utilities</title>
-
-<para>Intro &amp; Who wants to use them?</para>
 
 &daemontools;
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,10 +2,16 @@
 <title>Contents</title>
 
-<para>The ucspi-tcp package contains <userinput>tcpserver, tcprules, 
-tcprulescheck, argv0, fixcrio, recordio, rblsmtpd, tcpclient, who@,
-date@, finger@, http@, tcpcat, mconnect, addcr, delcr</userinput></para>
+<para>The ucspi-tcp package contains <userinput>tcpserver</userinput>,
+<userinput>tcprules</userinput>, <userinput>tcprulescheck</userinput>,
+<userinput>argv0</userinput>, <userinput>fixcrio</userinput>,
+<userinput>recordio</userinput>, <userinput>rblsmtpd</userinput>,
+<userinput>tcpclient</userinput>, <userinput>who@</userinput>,
+<userinput>date@</userinput>, <userinput>finger@</userinput>,
+<userinput>http@</userinput>, <userinput>tcpcat</userinput>,
+<userinput>mconnect</userinput>, <userinput>addcr</userinput> and
+<userinput>delcr</userinput></para>
 
 <para>You can also find detailed descriptions of each of these programs at 
-http://cr.yp.to/ucspi-tcp/tcpserver.html, but here is a brief summary:</para>
+<ulink url="http://cr.yp.to/ucspi-tcp/tcpserver.html"/>, but here is a brief summary:</para>
 
 </sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><screen><userinput>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~</userinput>
-<userinput>mv conf-home~ conf-home</userinput>
-<userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~</userinput>
-<userinput>mv hier.c~ hier.c :</userinput></screen> 
+<para><screen><userinput>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~
+mv conf-home~ conf-home
+sed 's/bin/sbin/' hier.c &gt; hier.c~
+mv hier.c~ hier.c</userinput></screen> 
 These commands change the installation directory to /usr/sbin from the default 
 of /usr/local/bin. Since these tools are used in conjuction with daemons, 
@@ -12,6 +12,6 @@
 If you wish to make these available, then we would suggest installing as above, 
 and then executing the following commands: 
-<screen><userinput>cd /usr/sbin</userinput>
-<userinput>mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</userinput></screen>This 
+<screen><userinput>cd /usr/sbin
+mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</userinput></screen>This 
 will place the client related programs into /usr/bin for general use.</para>
 
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -3,5 +3,6 @@
 
 <para>Install ucspi-tcp by running the following commands:</para>
-<para><screen><userinput>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../ucspi-tcp-0.88.errno.patch &amp;&amp;
+sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;</userinput>
 <userinput>mv conf-home~ conf-home &amp;&amp;</userinput>
 <userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;</userinput>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -7,4 +7,6 @@
 Package size:                   &ucspi-tcp-size;
 Estimated Disk space required:  &ucspi-tcp-buildsize;</screen>
+<screen>Additional downloads:
+<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/ucspi-tcp-0.88.errno.patch">ucspi-tcp errno patch</ulink></screen>
 
 <para>The ucspi-tcp package consists of a suite of tools that allow the easy 
Index: server/other/samba/samba-intro.xml
===================================================================
--- server/other/samba/samba-intro.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ server/other/samba/samba-intro.xml	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -6,5 +6,6 @@
 Version used:                   &samba-version;
 Package size:                   &samba-size;
-Estimated Disk space required:  &samba-buildsize;</screen>
+Estimated Disk space required:  &samba-buildsize;
+Estimated build time:           &samba-time;</screen>
 
 <para>The Samba package provides file and print services to SMB/CIFS
Index: server/other/samba/samba.ent
===================================================================
--- server/other/samba/samba.ent	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
+++ server/other/samba/samba.ent	(revision 4e2ef6e52afce335967e21822e75370b372f1ef0)
@@ -6,7 +6,8 @@
 <!ENTITY samba-desc SYSTEM "samba-desc.xml">
 <!ENTITY samba-config SYSTEM "samba-config.xml">
-<!ENTITY samba-buildsize "45 MB">
+<!ENTITY samba-buildsize "40 MB">
 <!ENTITY samba-version "2.2.8">
 <!ENTITY samba-download-http "http://us1.samba.org/samba/ftp/samba-&samba-version;.tar.bz2">
 <!ENTITY samba-download-ftp "">
-<!ENTITY samba-size "5.0 MB">
+<!ENTITY samba-size "4.4 MB">
+<!ENTITY samba-time "5.40 SBU">
