[pkgsrc/trunk]: pkgsrc/net/djbdns-run For DNS Flag Day 2020, suggest enabling...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7389204eee8e
branches:  trunk
changeset: 440709:7389204eee8e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Oct 16 09:28:14 2020 +0000

description:
For DNS Flag Day 2020, suggest enabling axfrdns along with tinydns. Let
the admin set axfrdns_ip distinctly from tinydns_ip, keeping the same
default. Fix an outdated comment. Bump version.

diffstat:

 net/djbdns-run/Makefile            |   4 ++--
 net/djbdns-run/files/README.pkgsrc |   5 ++---
 net/djbdns-run/files/axfrdns.sh    |  10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r a5fcd85f0c56 -r 7389204eee8e net/djbdns-run/Makefile
--- a/net/djbdns-run/Makefile   Fri Oct 16 07:44:23 2020 +0000
+++ b/net/djbdns-run/Makefile   Fri Oct 16 09:28:14 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/10/05 12:17:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.37 2020/10/16 09:28:14 schmonz Exp $
 #
 
-DISTNAME=              djbdns-run-20201005
+DISTNAME=              djbdns-run-20201016
 CATEGORIES=            net
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r a5fcd85f0c56 -r 7389204eee8e net/djbdns-run/files/README.pkgsrc
--- a/net/djbdns-run/files/README.pkgsrc        Fri Oct 16 07:44:23 2020 +0000
+++ b/net/djbdns-run/files/README.pkgsrc        Fri Oct 16 09:28:14 2020 +0000
@@ -9,11 +9,10 @@
 - Run "@RCD_SCRIPTS_DIR@/dnscache start".
 
 Authoritative name server:
-- Set tinydns=YES in /etc/rc.conf.
+- Set tinydns=YES axfrdns=YES in /etc/rc.conf.
 - Create @PKG_SYSCONFDIR@/tinydns/data with suitable contents.
 - Run "@RCD_SCRIPTS_DIR@/tinydns start".
-- For TCP service (if needed), set axfrdns=YES in /etc/rc.conf
-  and run "@RCD_SCRIPTS_DIR@/axfrdns start".
+  and "@RCD_SCRIPTS_DIR@/axfrdns start".
 
 RBL name server:
 - Set rbldns=YES in /etc/rc.conf (and rbldns_ip to a suitable IP address).
diff -r a5fcd85f0c56 -r 7389204eee8e net/djbdns-run/files/axfrdns.sh
--- a/net/djbdns-run/files/axfrdns.sh   Fri Oct 16 07:44:23 2020 +0000
+++ b/net/djbdns-run/files/axfrdns.sh   Fri Oct 16 09:28:14 2020 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: axfrdns.sh,v 1.10 2019/01/07 14:01:55 schmonz Exp $
+# $NetBSD: axfrdns.sh,v 1.11 2020/10/16 09:28:15 schmonz Exp $
 #
 # @PKGNAME@ script to control axfrdns (DNS zone-transfer and TCP service).
 #
@@ -13,7 +13,7 @@
 
 # User-settable rc.conf variables and their default values:
 : ${axfrdns_postenv:=""}
-: ${tinydns_ip:="@TINYDNS_LISTENIP@"}
+: ${axfrdns_ip:="@TINYDNS_LISTENIP@"}
 : ${axfrdns_datalimit:="300000"}
 : ${axfrdns_pretcpserver:=""}
 : ${axfrdns_tcpserver:="@PREFIX@/bin/tcpserver"}
@@ -47,16 +47,16 @@
        fi
        # tcpserver(1) is akin to inetd(8), but runs one service per process.
        # We want to signal only the tcpserver process responsible for this
-       # service. Use argv0(1) to set procname to "axfrdns".
+       # service. Use argv0(1) to set procname to "nbaxfrdns".
        command="@PREFIX@/bin/pgrphack @SETENV@ - ${axfrdns_postenv} \
 ROOT=@PKG_SYSCONFDIR@/tinydns \
-IP=${tinydns_ip} \
+IP=${axfrdns_ip} \
 @PREFIX@/bin/envuidgid @DJBDNS_AXFR_USER@ \
 @PREFIX@/bin/softlimit -d ${axfrdns_datalimit} ${axfrdns_pretcpserver} \
 @PREFIX@/bin/argv0 ${axfrdns_tcpserver} ${procname} \
 ${axfrdns_tcpflags} -x ${axfrdns_tcprules}.cdb \
 -- \
-${tinydns_ip} ${axfrdns_tcpport} \
+${axfrdns_ip} ${axfrdns_tcpport} \
 @PREFIX@/bin/${name} \
 </dev/null 2>&1 | \
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DJBDNS_LOG_USER@ ${axfrdns_logcmd}"