diff --git a/basicnet/djb/daemontools/daemontools-desc.xml b/basicnet/djb/daemontools/daemontools-desc.xml index 59060dc637..5018850493 100644 --- a/basicnet/djb/daemontools/daemontools-desc.xml +++ b/basicnet/djb/daemontools/daemontools-desc.xml @@ -1,11 +1,17 @@ Contents -The daemontools package contains svscanboot svscan -supervise svc svok svstat fghack pgrphack readproctitle multilog tai64n -tai64nlocal setuidgid envuidgid envdir softlimit and +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 http://cr.yp.to/daemontools.html. +commands may be found at . diff --git a/basicnet/djb/daemontools/daemontools-exp.xml b/basicnet/djb/daemontools/daemontools-exp.xml index 0bddbada88..ed625859ad 100644 --- a/basicnet/djb/daemontools/daemontools-exp.xml +++ b/basicnet/djb/daemontools/daemontools-exp.xml @@ -14,11 +14,11 @@ 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 +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 +package/compile : This command actually compiles the source and puts the binaries in a command directory. Since we are installing the binaries in /usr/sbin rather than creating @@ -34,20 +34,19 @@ a non-standard /command directory, several paths have to be changed: will check the /etc/service directory instead of the /service directory for daemons to run. -cp * /usr/sbin: We must manually copy the +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 +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 +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 +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. diff --git a/basicnet/djb/daemontools/daemontools-inst.xml b/basicnet/djb/daemontools/daemontools-inst.xml index 589cfee40f..1f7a849f84 100644 --- a/basicnet/djb/daemontools/daemontools-inst.xml +++ b/basicnet/djb/daemontools/daemontools-inst.xml @@ -3,7 +3,8 @@ Install daemontools by running the following commands: -cd admin/daemontools-0.76 && +patch -Np1 -i ../daemontools-0.76.errno.patch && +cd admin/daemontools-0.76 && package/compile && cd package && sed 's|command|usr/sbin|' boot.inittab > boot.inittab~ && diff --git a/basicnet/djb/daemontools/daemontools-intro.xml b/basicnet/djb/daemontools/daemontools-intro.xml index d7d8296347..090f191789 100644 --- a/basicnet/djb/daemontools/daemontools-intro.xml +++ b/basicnet/djb/daemontools/daemontools-intro.xml @@ -6,7 +6,8 @@ Download location (FTP): Version used: &daemontools-version; Package size: &daemontools-size; Estimated Disk space required: &daemontools-buildsize; - +Additional downloads: +daemontools errno patch 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. diff --git a/basicnet/djb/daemontools/daemontools-man-desc.xml b/basicnet/djb/daemontools/daemontools-man-desc.xml index f4ea3be0c5..4e86b504a1 100644 --- a/basicnet/djb/daemontools/daemontools-man-desc.xml +++ b/basicnet/djb/daemontools/daemontools-man-desc.xml @@ -1,10 +1,16 @@ Contents -The daemontools-man package contains manpages for the daemontools -commands envdir envuidgid fghack multilog pgrphack -readproctitle setlock setuidgid softlimit supervise svc svok svscan -svscanboot svstat tai64n and +The daemontools-man package contains man pages for the daemontools +commands envdir, +envuidgid, fghack, +multilog, pgrphack, +readproctitle, setlock, +setuidgid, softlimit, +supervise, svc, +svok, svscan, +svscanboot, svstat, +tai64n and tai64nlocal. diff --git a/basicnet/djb/daemontools/daemontools-man-exp.xml b/basicnet/djb/daemontools/daemontools-man-exp.xml index 9d8f1bb294..e50f969fef 100644 --- a/basicnet/djb/daemontools/daemontools-man-exp.xml +++ b/basicnet/djb/daemontools/daemontools-man-exp.xml @@ -1,10 +1,10 @@ Command explanations -gzip -9 *.8: You can compress the manpages +gzip -9 *.8 : You can compress the manpages to save space, but it isn't needed for the manpages to work. -package/compile: This command actually +package/compile : This command actually compiles the source and puts the binaries in a command directory. diff --git a/basicnet/djb/djb.xml b/basicnet/djb/djb.xml index 8bea17000e..edd579b240 100644 --- a/basicnet/djb/djb.xml +++ b/basicnet/djb/djb.xml @@ -2,8 +2,6 @@ DJB's Utilities -Intro & Who wants to use them? - &daemontools; &daemontools-man; &ucspi-tcp; diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml index 35310a7b25..ae7b233934 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml @@ -1,12 +1,18 @@ Contents -The ucspi-tcp package contains tcpserver, tcprules, -tcprulescheck, argv0, fixcrio, recordio, rblsmtpd, tcpclient, who@, -date@, finger@, http@, tcpcat, mconnect, addcr, delcr +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 -http://cr.yp.to/ucspi-tcp/tcpserver.html, but here is a brief summary: +, but here is a brief summary: diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml index f22124f39a..b77374305a 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml @@ -1,18 +1,18 @@ 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 : +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 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: -cd /usr/sbin -mv tcpclient *@ mconnect delcr addcr tcpcat /usr/binThis +cd /usr/sbin +mv tcpclient *@ mconnect delcr addcr tcpcat /usr/binThis will place the client related programs into /usr/bin for general use. diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml index a88e692862..c5db2ad705 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml @@ -2,7 +2,8 @@ Installation of ucspi-tcp Install ucspi-tcp by running the following commands: -sed 's|/usr/local|/usr|' conf-home > conf-home~ && +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 && diff --git a/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml b/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml index 4ebdaba6b5..fd5abf98a7 100644 --- a/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml +++ b/basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml @@ -6,6 +6,8 @@ Download location (FTP): Version used: &ucspi-tcp-version; Package size: &ucspi-tcp-size; Estimated Disk space required: &ucspi-tcp-buildsize; +Additional downloads: +ucspi-tcp errno patch 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 diff --git a/server/other/samba/samba-intro.xml b/server/other/samba/samba-intro.xml index 64c17f72b5..19d5aa4ef5 100644 --- a/server/other/samba/samba-intro.xml +++ b/server/other/samba/samba-intro.xml @@ -5,7 +5,8 @@ Download location (FTP): Version used: &samba-version; Package size: &samba-size; -Estimated Disk space required: &samba-buildsize; +Estimated Disk space required: &samba-buildsize; +Estimated build time: &samba-time; The Samba package provides file and print services to SMB/CIFS clients. diff --git a/server/other/samba/samba.ent b/server/other/samba/samba.ent index 9f2bc90154..a78dd7bff7 100644 --- a/server/other/samba/samba.ent +++ b/server/other/samba/samba.ent @@ -5,8 +5,9 @@ - + - + +