CVS commit: pkgsrc/net/djbdns-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Oct 16 09:28:15 UTC 2020

Modified Files:
        pkgsrc/net/djbdns-run: Makefile
        pkgsrc/net/djbdns-run/files: README.pkgsrc axfrdns.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/djbdns-run/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/djbdns-run/files/README.pkgsrc
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/djbdns-run/files/axfrdns.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/djbdns-run/Makefile
diff -u pkgsrc/net/djbdns-run/Makefile:1.36 pkgsrc/net/djbdns-run/Makefile:1.37
--- pkgsrc/net/djbdns-run/Makefile:1.36 Mon Oct  5 12:17:47 2020
+++ pkgsrc/net/djbdns-run/Makefile      Fri Oct 16 09:28:14 2020
@@ -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

Index: pkgsrc/net/djbdns-run/files/README.pkgsrc
diff -u pkgsrc/net/djbdns-run/files/README.pkgsrc:1.5 pkgsrc/net/djbdns-run/files/README.pkgsrc:1.6
--- pkgsrc/net/djbdns-run/files/README.pkgsrc:1.5       Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/files/README.pkgsrc   Fri Oct 16 09:28:14 2020
@@ -9,11 +9,10 @@ Caching resolver for the local machine:
 - 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).

Index: pkgsrc/net/djbdns-run/files/axfrdns.sh
diff -u pkgsrc/net/djbdns-run/files/axfrdns.sh:1.10 pkgsrc/net/djbdns-run/files/axfrdns.sh:1.11
--- pkgsrc/net/djbdns-run/files/axfrdns.sh:1.10 Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/files/axfrdns.sh      Fri Oct 16 09:28:15 2020
@@ -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 @@ name="axfrdns"
 
 # 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 @@ axfrdns_precmd() {
        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}"