Index: basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,82 @@
+<sect2>
+<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>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>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>tcpserver</title>
+<para>tcpserver listens for incoming tcp connections on a given port, and runs 
+a program of your choosing in response to a connection.</para></sect3>
+
+<sect3><title>tcprules</title>
+<para>tcprules compiles rules that govern access control for tcpserver into a 
+fast access database format.</para></sect3>
+
+<sect3><title>tcprulescheck</title>
+<para>tcprulescheck makes it possible to see how tcpserver will react to 
+connections from a given address without actually having to connect via that 
+address. This is useful for checking to see if the access control rules you 
+are using are doing what you expected.</para></sect3>
+
+<sect3><title>argv0</title>
+<para>argv0 runs a given program with a specified 0th argument.</para></sect3>
+
+<sect3><title>fixcrio</title>
+<para>fixcrio inserts carriage returns at the end of lines when they are 
+missing.</para></sect3>
+
+<sect3><title>recordio</title>
+<para>recordio records all input and output of a program given as an 
+argument.</para></sect3>
+
+<sect3><title>rblsmtpd</title>
+<para>rblsmtpd is a spam blocking program that works in conjunction with your 
+smtp daemon and tcpserver.</para></sect3>
+
+<sect3><title>tcpclient</title>
+<para>tcpclient creates a connection to a tcp port for a given 
+program.</para></sect3>
+
+<sect3><title>who@</title>
+<para>who@ is a demonstration program using tcpclient that has the 
+functionality of the rwho program. It requires a server running sysstat 
+on port 11.</para></sect3>
+
+<sect3><title>date@</title>
+<para>date@ is a demonstration program using tcpclient that will return the 
+system time of a remote host which is running a daytime service on 
+port 13.</para></sect3>
+
+<sect3><title>finger@</title>
+<para>finger@ is a demonstration program using tcpclient that mimics the 
+functionality of the finger program. It requires a server running fingerd 
+on port 79.</para></sect3>
+
+<sect3><title>http@</title>
+<para>http@ downloads web pages from web servers.</para></sect3>
+
+<sect3><title>tcpcat</title>
+<para>tcpcat connects to a tcp port and prints all that is returned from the 
+port.</para></sect3>
+
+<sect3><title>mconnect</title>
+<para>mconnect connects to a tcp port, delivers any input specified to the 
+port, and prints any output from the port.</para></sect3>
+
+<sect3><title>addcr</title>
+<para>addcr adds carriage returns to files. This and delcr are useful for 
+converting between Windows to UNIX file formats.</para></sect3>
+
+<sect3><title>delcr</title>
+<para>delcr removes carriage returns from files.</para></sect3>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<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> 
+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, 
+they don't make much sense in general user directories. However, some of the 
+example programs and the tcpclient program might be of use to non-root users. 
+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 
+will place the client related programs into /usr/bin for general use.</para>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of ucspi-tcp</title>
+
+<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>
+<userinput>mv conf-home~ conf-home &amp;&amp;</userinput>
+<userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;</userinput>
+<userinput>mv hier.c~ hier.c &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make setup check</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to ucspi-tcp</title>
+
+<screen>Download location:              &ucspi-tcp-download;
+Version used:                   &ucspi-tcp-version;
+Package size:                   &ucspi-tcp-size;
+Estimated Disk space required:  &ucspi-tcp-buildsize;</screen>
+
+<para>The ucspi-tcp package consists of a suite of tools that allow the easy 
+creation of client-server tcp daemons. Tcpserver is a more secure alternative 
+to inetd. It has built in functionality for rule based access control, and 
+will gracefully defer connections when the configurable maximum load is reached,
+unlike inetd. Tcpserver is also recommended for use with Qmail, and was 
+written by the same author.</para>
+
+</sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY ucspi-tcp SYSTEM "../ucspi-tcp.xml">
+<!ENTITY ucspi-tcp-intro SYSTEM "ucspi-tcp-intro.xml">
+<!ENTITY ucspi-tcp-inst SYSTEM "ucspi-tcp-inst.xml">
+<!ENTITY ucspi-tcp-exp SYSTEM "ucspi-tcp-exp.xml">
+<!ENTITY ucspi-tcp-desc SYSTEM "ucspi-tcp-desc.xml">
+<!ENTITY ucspi-tcp-buildsize "199 KB">
+<!ENTITY ucspi-tcp-version "0.88">
+<!ENTITY ucspi-tcp-download "http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz">
+<!ENTITY ucspi-tcp-size "53 KB">
