Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ basicnet/basicnet.ent (revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -70,9 +70,2 @@
%nail;
%slrn;
-
-
-
-
-
-%daemontools;
-%ucspi-tcp;
Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ basicnet/basicnet.xml (revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -8,5 +8,4 @@
&basicnet-netutils;
&basicnet-mailnews;
-&basicnet-djb;
Index: sicnet/djb/daemontools.xml
===================================================================
--- basicnet/djb/daemontools.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-daemontools-&daemontools-version;
-
-&daemontools-intro;
-&daemontools-inst;
-&daemontools-exp;
-&daemontools-desc;
-
-
-
Index: sicnet/djb/daemontools/daemontools-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-desc.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,94 +1,0 @@
-
-Contents
-
-The daemontools package contains
-svscanboot, svscan,
-supervise, svc,
-svok, svstat,
-fghack, pgrphack,
-readproctitle, multilog,
-tai64n, tai64nlocal,
-setuidgid, envuidgid,
-envdir, softlimit and
-setlock. More detailed descriptions of these
-commands may be found at .
-
-
-
-Description
-
-svscanboot
-svscanboot is simply a script that calls
-svscan and pipes its output to readproctitle.
-
-svscan
-svscan checks the service
-directory for daemons to run and starts a supervise process
-for each run script that it finds.
-
-supervise
-supervise runs the run script passed to it by
-svscan and monitors the process the script starts so that
-if it dies, supervise restarts it.
-
-svc
-svc sends signals to processes being run under
-supervise.
-
-
-svok
-svok checks to see that
-supervise is running in the directory
-passed to it.
-
-svstat
-svstat prints the status of processes monitored by
-supervise.
-
-fghack
-fghack prevents processes from putting themselves into
-the background.
-
-pgrphack
-pgrphack runs a process in a separate process group.
-
-
-readproctitle
-readproctitle displays log entries in the output of
-ps.
-
-
-multilog
-multilog is a logging program. It takes output from a
-daemon and appends it to any number of logs.
-
-tai64n
-tai64n is a timestamp generating program.
-
-
-tai64nlocal
-tai64nlocal converts output of tai64n into a human
-readable format.
-
-setuidgid
-setuidgid runs a specified program under a given
-account's UID and GID.
-
-envuidgid
-envuidgid performs the same function as setuidgid,
-but sets environment variables UID and GID equal
-to the UID and GID of the account specified.
-
-envdir
-envdir runs a given program with environment variables
-specified by files in a directory.
-
-softlimit
-softlimit allows resource limits to be set for a given
-program.
-
-setlock
-setlock locks a file and runs a program.
-
-
-
Index: sicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,64 +1,0 @@
-
-Command explanations
-
-The first thing to understand in installing any package written
-by Daniel J. Bernstein, and
-this includes qmail, djbdns
- and ucspi-tcp in addition to
-daemontools, is that he is willing to completely
-disregard standards if his idea of the correct thing to do differs from an
-particular standard. Professor Bernstein is a standards body unto himself when
-it comes to his own software.
-
-It is therefore necessary to make quite a few changes to the
-installation commands for his packages to get them to install in a manner
-that is compliant with the Filesystem Hierarchy Standard
-(FHS). Most of the following commands are due to this
-difficulty.
-
-cd admin/daemontools-0.76: First off, the package is
-unpacked in an admin directory. You will find the actual
-packages two directory levels below this.
-
-package/compile: This command actually
-compiles the source and prepares the binaries.
-
-Since we are installing the binaries in /usr/sbin
-rather than creating a non-standard /command directory,
-several paths have to be changed:
-sed 's|command|usr/sbin|' boot.inittab > boot.inittab~
-mv boot.inittab~ boot.inittab
-In boot.inittab,
-/command/svscanboot is changed to
-/usr/sbin/svscanboot.
-
-sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \
- -e 's|command|usr/sbin|' \
- -e 's|/service|/etc/service|g' svscanboot > svscanboot~ &&
-Here various paths are adjusted in the svscanboot
-script. In our setup svscan will check the
-/etc/service directory instead of
-the /service directory for daemons to run.
-
-cp * /usr/sbin: We must manually copy the
-binaries to the /usr/sbin directory.
-
-cat /etc/inittab boot.inittab > /etc/inittab~
-mv -f /etc/inittab~ /etc/inittab
-These commands append a line to /etc/inittab so that
-init will launch the svscanboot script.
-
-
-mkdir /etc/service: This command creates
-the daemontools control directory, which - even if
-empty - needs to exist for
-daemontools to run properly.
-
-telinit Q: 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.
-
-
-
-
Index: sicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,32 +1,0 @@
-
-Installation of daemontools
-
-Install daemontools by running the following
-commands:
-
-cd admin/daemontools-0.76 &&
-patch -Np1 -i ../../daemontools-0.76-errno.patch &&
-package/compile &&
-cd package &&
-sed 's|command|usr/sbin|' boot.inittab > boot.inittab~ &&
-mv boot.inittab~ boot.inittab &&
-cd ../command &&
-sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \
- -e 's|command|usr/sbin|' \
- -e 's|/service|/etc/service|g' svscanboot > svscanboot~ &&
-mv svscanboot~ svscanboot &&
-chmod 555 svscanboot &&
-cp * /usr/sbin &&
-cd ../package &&
-cat /etc/inittab boot.inittab > /etc/inittab~ &&
-mv -f /etc/inittab~ /etc/inittab &&
-mkdir /etc/service &&
-telinit Q
-
-The daemontools package does not come with man pages, so install
-this package if you want online help with the daemontools programs:
-
-tar xzvf daemontools-0.76-man.tar.gz &&
-cp daemontools-man/*.8 /usr/share/man/man8
-
-
Index: sicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,31 +1,0 @@
-
-Introduction to daemontools
-
-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 and djbdns.
-
-Package information
-
-Download (HTTP):
-Download (FTP):
-Download size: &daemontools-size;
-Estimated Disk space required:
-&daemontools-buildsize;
-Estimated build time:
-&daemontools-time;
-
-
-Additional downloads
-
-Required patch:
-
-Man pages:
-
-
-
-
Index: sicnet/djb/daemontools/daemontools.ent
===================================================================
--- basicnet/djb/daemontools/daemontools.ent (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
Index: sicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,13 +1,0 @@
-
-
-D.J. Bernstein's Utilities
-
-This chapter includes applications needed for the qmail server.
-Their installation instructions are different than most packages in the
-book because we want to support the FHS throughout
-the book.
-
-&daemontools;
-&ucspi-tcp;
-
-
Index: sicnet/djb/ucspi-tcp.xml
===================================================================
--- basicnet/djb/ucspi-tcp.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-ucspi-tcp-&ucspi-tcp-version;
-
-&ucspi-tcp-intro;
-&ucspi-tcp-inst;
-&ucspi-tcp-exp;
-&ucspi-tcp-desc;
-
-
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,99 +1,0 @@
-
-Contents
-
-The ucspi-tcp package contains tcpserver,
-tcprules, tcprulescheck,
-argv0, fixcrio,
-recordio, rblsmtpd,
-tcpclient, who@,
-date@, finger@,
-http@, tcpcat,
-mconnect, addcr and
-delcr
-
-You can also find detailed descriptions of each of these programs at
-, but here is a brief summary:
-
-
-
-Description
-
-tcpserver
-tcpserver listens for incoming TCP
-connections on a given port, and runs a program of your choosing in response to
-a connection.
-
-tcprules
-tcprules compiles rules that govern access
-control for tcpserver into a fast access database format.
-
-
-tcprulescheck
-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.
-
-argv0
-argv0 runs a given program with a specified 0th
-argument.
-
-fixcrio
-fixcrio inserts carriage returns at the end of lines
-when they are missing.
-
-recordio
-recordio records all input and output of a program
-given as an argument.
-
-rblsmtpd
-rblsmtpd is a spam blocking program that works in
-conjunction with your SMTP daemon and tcpserver
-.
-
-tcpclient
-tcpclient creates a connection to a TCP
- port for a given program.
-
-who@
-who@ is a demonstration program using
-tcpclient that has the functionality of the rwho
-program. It requires a server running sysstat on port 11.
-
-
-date@
-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.
-
-finger@
-finger@ is a demonstration program using
-tcpclient that mimics the functionality of the finger
- program. It requires a server running fingerd
-on port 79.
-
-http@
-http@ downloads web pages from web servers.
-
-
-tcpcat
-tcpcat connects to a TCP port and
-prints all that is returned from the port.
-
-mconnect
-mconnect connects to a TCP port,
-delivers any input specified to the port, and prints any output from the port.
-
-
-addcr
-addcr adds carriage returns to files. This and
-delcr are useful for converting between Windows to Unix file
-formats.
-
-delcr
-delcr removes carriage returns from files.
-
-
-
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,21 +1,0 @@
-
-Command explanations
-
-sed 's|/usr/local|/usr|' conf-home > conf-home~
-mv conf-home~ conf-home
-sed 's/bin/sbin/' hier.c > hier.c~
-mv hier.c~ hier.c
-These commands change the installation directory to
-/usr/sbin from the default
-of /usr/local/bin. Since these tools
-are used in conjunction 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:
-cd /usr/sbin mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin
-This will place the client related programs into /usr/bin
-for general use.
-
-
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,16 +1,0 @@
-
-Installation of ucspi-tcp
-
-Install ucspi-tcp by running the following
-commands:
-
-patch -Np1 -i ../ucspi-tcp-0.88-errno.patch &&
-sed 's|/usr/local|/usr|' conf-home > conf-home~ &&
-mv conf-home~ conf-home &&
-sed 's/bin/sbin/' hier.c > hier.c~ &&
-mv hier.c~ hier.c &&
-make &&
-make setup check
-
-
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,32 +1,0 @@
-
-Introduction to ucspi-tcp
-
-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.
-
-Package information
-
-Download (HTTP):
-Download (FTP):
-Download size: &ucspi-tcp-size;
-Estimated Disk space required:
-&ucspi-tcp-buildsize;
-Estimated build time:
-&ucspi-tcp-time;
-
-
-Additional downloads
-
-Required patch:
-
-
-
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/mail/mail.xml (revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -12,5 +12,4 @@
&postfix;
-&qmail;
&sendmail;
&exim;
Index: rver/mail/qmail.xml
===================================================================
--- server/mail/qmail.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-qmail-&qmail-version;
-
-&qmail-intro;
-&qmail-inst;
-&qmail-config;
-&qmail-desc;
-
-
-
Index: rver/mail/qmail/qmail-config.xml
===================================================================
--- server/mail/qmail/qmail-config.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,99 +1,0 @@
-
-Configuring qmail
-
-Config files
-/etc/inetd.conf and boot scripts
-
-
-Configuration Information
-
-If inetd is used, the following command will add the qmaild
-entry to /etc/inetd.conf:
-
-echo "smtp stream tcp nowait qmaild /var/qmail/bin/tcp-env \
-tcp-env /var/qmail/bin/qmail-smtpd" >> /etc/inetd.conf
-
-If xinetd is used, the following command will add the qmaild
-entry to /etc/xinetd.conf:
-
-cat >> /etc/xinetd.conf << "EOF"
-service smtp
-{
- disable = no
- id = smtp-local
- socket_type = stream
- protocol = tcp
- wait = no
- user = qmaild
- server = /var/qmail/bin/tcp-env
- server_args = /var/qmail/bin/qmail-smtpd
- env = RELAYCLIENT=
- only_from = 127.0.0.1
- log_on_failure += USERID
-}
-EOF
-
-To automate the running of qmail, use following command to
-create the init.d script:
-
-cat > /etc/rc.d/init.d/qmail << "EOF"
-#!/bin/sh
-# Begin $rc_base/init.d/qmail
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org
-
-source /etc/sysconfig/rc
-source $rc_functions
-
-case "$1" in
-
- start)
- echo "Starting Qmail..."
- /var/qmail/rc &
- ;;
-
- stop)
- echo "Stopping Qmail..."
- killall qmail-send
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/qmail
-EOF
-chmod 755 /etc/rc.d/init.d/qmail
-
-Create the symbolic links to this file in the relevant
-rc.d directory with the following commands:
-
-cd /etc/rc.d/init.d &&
-ln -sf ../init.d/qmail ../rc0.d/K25qmail &&
-ln -sf ../init.d/qmail ../rc1.d/K25qmail &&
-ln -sf ../init.d/qmail ../rc2.d/K25qmail &&
-ln -sf ../init.d/qmail ../rc3.d/S35qmail &&
-ln -sf ../init.d/qmail ../rc4.d/S35qmail &&
-ln -sf ../init.d/qmail ../rc5.d/S35qmail &&
-ln -sf ../init.d/qmail ../rc6.d/K25qmail
-
-
-
-Configuring mailers to work with qmail
-Configuration information for some commonly used MUAs can be
-found in the /var/qmail/doc/INSTALL.mbox
-file. Most MUAs can be configured to use qmail Mailbox format buy
-putting the following in ~/.profile:
-MAIL=$HOME/Mailbox; export MAIL
-
-
-
Index: rver/mail/qmail/qmail-desc.xml
===================================================================
--- server/mail/qmail/qmail-desc.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,76 +1,0 @@
-Contents
-The qmail package contains
-bouncesaying,
-condredirect,
-except,
-forward,
-maildir2mbox,
-maildirmake,
-maildirwatch,
-mailsubj,
-preline,
-qbiff,
-qreceipt,
-qmail-clean,
-qmail-inject,
-qmail-local,
-qmail-pop3d,
-qmail-popup,
-qmail-qstat,
-qmail-send,
-qmail-smtpd and
-qmail-start.
-
-Description
-bouncesaying
-bouncesaying processes, possibly bouncing, incoming
-messages.
-condredirect
-condredirect processes, possibly redirecting incoming
-messages.
-except
-except reverses the exit code of a program.
-forward
-forward forwards new mail to one or more
-addresses.
-maildir2mbox
-maildir2mbox moves current email from an maildir-format
-directory to an mbox-format file.
-maildirmake
-maildirmake create a maildir format directory for incoming
-mail.
-maildirwatch
-maildirwatch watches a users maildir and prints a new mail
-summary every 30 seconds.
-mailsubj
-mailsubj sends a mail message with a subject supplied on the
-command-line. The body of the message is read from standard
-input.
-preline
-preline prepends lines to a message.
-qbiff
-qbiff announces new mail as soon as it arrives.
-qreceipt
-qreceipt responds to delivery notice requests.
-qmail-clean
-qmail-clean cleans up the queue directory.
-qmail-inject
-qmail-inject preprocesses and sends a mail
-message.
-qmail-local
-qmail-local delivers or forwards mail messages.
-qmail-pop3d
-qmail-pop3d accesses users' pop3 mail accounts.
-qmail-popup
-qmail-popup reads pop3 usernames and passwords.
-qmail-qstat
-qmail-qstat summarizes mail queue statistics.
-qmail-send
-qmail-send delivers mail from the message queue.
-qmail-smtpd
-qmail-smtpd receives mail via SMTP.
-qmail-start
-qmail-start enables mail delivery services, spawning qmail-send,
-qmail-lspawn, qmail-rspawn, and qmail-clean.
-
-
Index: rver/mail/qmail/qmail-inst.xml
===================================================================
--- server/mail/qmail/qmail-inst.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,33 +1,0 @@
-
-Installation of qmail
-
-qmail needs certain user and group account to be added before
-installation of the software. Add the users and groups with the
-following commands:
-
-
-mkdir /var/qmail &&
-groupadd nofiles &&
-useradd -g nofiles -d /var/qmail/alias alias &&
-useradd -g nofiles -d /var/qmail qmaild &&
-useradd -g nofiles -d /var/qmail qmaill &&
-useradd -g nofiles -d /var/qmail qmailp &&
-groupadd qmail &&
-useradd -g qmail -d /var/qmail qmailq &&
-useradd -g qmail -d /var/qmail qmailr &&
-useradd -g qmail -d /var/qmail qmails
-
-Install qmail by running the following commands:
-
-patch -Np1 -i ../qmail-1.03-errno.patch &&
-make setup check &&
-./config-fast `hostname` &&
-cd /var/qmail &&
-touch .qmail-postmaster .qmail-mailer-daemon .qmail-root &&
-chmod 644 .qmail-* &&
-ln -s /var/qmail/bin/sendmail /usr/sbin/sendmail &&
-mv /var/qmail/boot/home /var/qmail/rc &&
-for mandir in 1 5 7 8; do mv /var/qmail/man/man$mandir/* \
- /usr/man/man$mandir; done &&
-rm -rf /var/qmail/man
-
Index: rver/mail/qmail/qmail-intro.xml
===================================================================
--- server/mail/qmail/qmail-intro.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,28 +1,0 @@
-
-Introduction to qmail
-
-The qmail package contains Dan Bernstein's Mail Transport Agent
-(MTA). qmail provides local and remote mail delivery/relaying.
-
-Package information
-
-Download (HTTP):
-Download (FTP):
-Download size: &qmail-size;
-Estimated Disk space required:
-&qmail-buildsize;
-Estimated build time:
-&qmail-time;
-
-
-Additional downloads
-
-Required patch:
-
-
-
-
-
-
Index: rver/mail/qmail/qmail.ent
===================================================================
--- server/mail/qmail/qmail.ent (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ (revision )
@@ -1,11 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
Index: server/mail/qpopper/qpopper-intro.xml
===================================================================
--- server/mail/qpopper/qpopper-intro.xml (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/mail/qpopper/qpopper-intro.xml (revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -17,6 +17,5 @@
Qpopper dependencies
Required
- or or
+ or
Index: server/server.ent
===================================================================
--- server/server.ent (revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/server.ent (revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -4,5 +4,4 @@
-
@@ -11,5 +10,4 @@
%exim;
%postfix;
-%qmail;
%qpopper;
%sendmail;