Note in DESCR and in README.pkgsrc that {dnscache,tinydns}-showctl

are useful only for services configured in the standard way (with
{dnscache,tinydns}-conf(8)).

On second thought, don't use the G prefix for the account names.
It makes the dnscache account longer than 8 characters, which in
turn makes noise in the nightly report. (Also, it looks a little
funny.) Since this is already a heavily customized way of running
djbdns services, it's just a little more customized now.

Bump version.

6 files changed, 28 insertions, 16 deletions

diff --git a/net/djbdns-run/DESCR b/net/djbdns-run/DESCR
index 54f01c835bd..6cf3f465011 100644
--- a/net/djbdns-run/DESCR
+++ b/net/djbdns-run/DESCR
@@ -1,3 +1,5 @@
 This package creates all the needed basic config files to run djbdns
 services, and provides NetBSD-style rc.d scripts. It also includes
-Jonathan de Boyne Pollard's dnscache-showctl and tinydns-showctl.
+Jonathan de Boyne Pollard's dnscache-showctl and tinydns-showctl,
+useful if you run services configured with dnscache-conf(8) or
+tinydns-conf(8).
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index fe7420984b0..981ebabb8a6 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/09/01 20:15:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2004/09/02 08:23:02 schmonz Exp $
 #
 
-DISTNAME=		djbdns-run-20040901
+DISTNAME=		djbdns-run-20040902
 CATEGORIES=		net
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -26,10 +26,10 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}/dnscache/ip
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/dnscache/servers
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/tinydns
 PKG_GROUPS=		djbdns
-PKG_USERS+=		Gdnslog:djbdns::dnslog
-PKG_USERS+=		Gaxfrdns:djbdns::axfrdns
-PKG_USERS+=		Gdnscache:djbdns::dnscache
-PKG_USERS+=		Gtinydns:djbdns::tinydns
+PKG_USERS+=		dnslog:djbdns::dnslog
+PKG_USERS+=		axfrdns:djbdns::axfrdns
+PKG_USERS+=		dnscache:djbdns::dnscache
+PKG_USERS+=		tinydns:djbdns::tinydns
 RCD_SCRIPTS=		axfrdns dnscache tinydns
 FILES_SUBST+=		PKGNAME=${PKGNAME}
 
diff --git a/net/djbdns-run/files/README.pkgsrc b/net/djbdns-run/files/README.pkgsrc
index 74280189c92..ca3fa63326b 100644
--- a/net/djbdns-run/files/README.pkgsrc
+++ b/net/djbdns-run/files/README.pkgsrc
@@ -9,3 +9,13 @@ the package's maintainer:
 
 If you need to ask for help on the dns list, please mention that
 you're using the djbdns-run package from pkgsrc.
+
+Jonathan de Boyne Pollard's dnscache-showctl and tinydns-showctl
+scripts are included. When posting to the dns list, it's normally
+a good idea to include the output of those commands. However, those
+scripts expect services configured with dnscache-conf(8) and
+tinydns-conf(8).
+
+This package configures them in a much different way, in order to
+run nicely from rc.d. Pollard's scripts are only useful, therefore,
+if you've configured additional djbdns services in the standard way.
diff --git a/net/djbdns-run/files/axfrdns.sh b/net/djbdns-run/files/axfrdns.sh
index 6ef582c1fc1..028baee3b98 100644
--- a/net/djbdns-run/files/axfrdns.sh
+++ b/net/djbdns-run/files/axfrdns.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: axfrdns.sh,v 1.1.1.1 2004/09/01 20:13:04 schmonz Exp $
+# $NetBSD: axfrdns.sh,v 1.2 2004/09/02 08:23:02 schmonz Exp $
 #
 # @PKGNAME@ script to control axfrdns (DNS zone-transfer and TCP service)
 #
@@ -25,11 +25,11 @@ cdb_cmd="axfrdns_cdb"
 # User-settable rc.conf variables and their default values:
 axfrdns_tcpflags=${axfrdns_tcpflags-"-vDRHl0"}
 axfrdns_datalimit=${axfrdns_datalimit-"300000"}
-axfrdns_logcmd=${axfrdns_logcmd-"@LOCALBASE@/bin/setuidgid Gdnslog logger -t nb${name} -p daemon.info"}
+axfrdns_logcmd=${axfrdns_logcmd-"@LOCALBASE@/bin/setuidgid dnslog logger -t nb${name} -p daemon.info"}
 
 axfrdns_precmd()
 {
- 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @LOCALBASE@/bin/envuidgid Gaxfrdns @LOCALBASE@/bin/softlimit -d ${axfrdns_datalimit} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${axfrdns_tcpflags} -x @PKG_SYSCONFDIR@/axfrdns/tcp.cdb -- ${tinydns_ip} 53 @LOCALBASE@/bin/axfrdns </dev/null 2>&1 | ${axfrdns_logcmd}"
+ 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @LOCALBASE@/bin/envuidgid axfrdns @LOCALBASE@/bin/softlimit -d ${axfrdns_datalimit} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${axfrdns_tcpflags} -x @PKG_SYSCONFDIR@/axfrdns/tcp.cdb -- ${tinydns_ip} 53 @LOCALBASE@/bin/axfrdns </dev/null 2>&1 | ${axfrdns_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
diff --git a/net/djbdns-run/files/dnscache.sh b/net/djbdns-run/files/dnscache.sh
index 82244e0eb9f..ccb391ee9a9 100644
--- a/net/djbdns-run/files/dnscache.sh
+++ b/net/djbdns-run/files/dnscache.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dnscache.sh,v 1.1.1.1 2004/09/01 20:13:04 schmonz Exp $
+# $NetBSD: dnscache.sh,v 1.2 2004/09/02 08:23:02 schmonz Exp $
 #
 # @PKGNAME@ script to control dnscache (caching DNS resolver)
 #
@@ -25,11 +25,11 @@ dnscache_ip=${dnscache_ip-"127.0.0.1"}
 dnscache_ipsend=${dnscache_ipsend-"0.0.0.0"}
 dnscache_size=${dnscache_size-"1000000"}
 dnscache_datalimit=${dnscache_datalimit-"3000000"}
-dnscache_logcmd=${dnscache_logcmd-"@LOCALBASE@/bin/setuidgid Gdnslog logger -t nb${name} -p daemon.info"}
+dnscache_logcmd=${dnscache_logcmd-"@LOCALBASE@/bin/setuidgid dnslog logger -t nb${name} -p daemon.info"}
 
 dnscache_precmd()
 {
- 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/dnscache IP=${dnscache_ip} IPSEND=${dnscache_ipsend} CACHESIZE=${dnscache_size} @LOCALBASE@/bin/envuidgid Gdnscache @LOCALBASE@/bin/softlimit -o250 -d ${dnscache_datalimit} @LOCALBASE@/bin/dnscache </dev/random 2>&1 | ${dnscache_logcmd}"
+ 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/dnscache IP=${dnscache_ip} IPSEND=${dnscache_ipsend} CACHESIZE=${dnscache_size} @LOCALBASE@/bin/envuidgid dnscache @LOCALBASE@/bin/softlimit -o250 -d ${dnscache_datalimit} @LOCALBASE@/bin/dnscache </dev/random 2>&1 | ${dnscache_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
diff --git a/net/djbdns-run/files/tinydns.sh b/net/djbdns-run/files/tinydns.sh
index a0202d4032a..d8d8b4c74cf 100644
--- a/net/djbdns-run/files/tinydns.sh
+++ b/net/djbdns-run/files/tinydns.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tinydns.sh,v 1.1.1.1 2004/09/01 20:13:04 schmonz Exp $
+# $NetBSD: tinydns.sh,v 1.2 2004/09/02 08:23:02 schmonz Exp $
 #
 # @PKGNAME@ script to control tinydns (authoritative DNS service)
 #
@@ -24,11 +24,11 @@ cdb_cmd="tinydns_cdb"
 # User-settable rc.conf variables and their default values:
 tinydns_ip=${tinydns_ip-"127.0.0.2"}
 tinydns_datalimit=${tinydns_datalimit-"300000"}
-tinydns_logcmd=${tinydns_logcmd-"@LOCALBASE@/bin/setuidgid Gdnslog logger -t nb${name} -p daemon.info"}
+tinydns_logcmd=${tinydns_logcmd-"@LOCALBASE@/bin/setuidgid dnslog logger -t nb${name} -p daemon.info"}
 
 tinydns_precmd()
 {
- 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @LOCALBASE@/bin/envuidgid Gtinydns @LOCALBASE@/bin/softlimit -d ${tinydns_datalimit} @LOCALBASE@/bin/tinydns </dev/null 2>&1 | ${tinydns_logcmd}"
+ 	command="@SETENV@ - ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @LOCALBASE@/bin/envuidgid tinydns @LOCALBASE@/bin/softlimit -d ${tinydns_datalimit} @LOCALBASE@/bin/tinydns </dev/null 2>&1 | ${tinydns_logcmd}"
 	command_args="&"
 	rc_flags=""
 }