CVS commit: pkgsrc/net/djbdns-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan  8 18:29:30 UTC 2019

Modified Files:
        pkgsrc/net/djbdns-run: options.mk
        pkgsrc/net/djbdns-run/files: rbldns.sh

Log Message:
Let ucspi-tcp6, if installed, satisfy the non-'inet6' DEPENDS. Fix
rbldns_needcdb() to operate on rbldns_data. Ride previous bump.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/djbdns-run/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/djbdns-run/files/rbldns.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/options.mk
diff -u pkgsrc/net/djbdns-run/options.mk:1.3 pkgsrc/net/djbdns-run/options.mk:1.4
--- pkgsrc/net/djbdns-run/options.mk:1.3        Mon Jan  7 19:45:48 2019
+++ pkgsrc/net/djbdns-run/options.mk    Tue Jan  8 18:29:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/01/07 19:45:48 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2019/01/08 18:29:29 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.djbdns-run
 PKG_SUPPORTED_OPTIONS+=        inet6
@@ -20,7 +20,7 @@ CONF_FILES+=          ${PREFIX}/share/examples/$
                        ${PKG_SYSCONFDIR}/dnscache/ip/::1
 .else
 DEPENDS_DJBDNS=                djbdns>=1.05nb5:../../net/djbdns
-DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
+DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
 DNSROOTS_GLOBAL=       share/examples/djbdns/dnsroots.global
 TINYDNS_LISTENIP=      0.0.0.0
 DNSCACHE_LISTENIP=     127.0.0.1

Index: pkgsrc/net/djbdns-run/files/rbldns.sh
diff -u pkgsrc/net/djbdns-run/files/rbldns.sh:1.8 pkgsrc/net/djbdns-run/files/rbldns.sh:1.9
--- pkgsrc/net/djbdns-run/files/rbldns.sh:1.8   Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/files/rbldns.sh       Tue Jan  8 18:29:30 2019
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: rbldns.sh,v 1.8 2019/01/07 14:01:55 schmonz Exp $
+# $NetBSD: rbldns.sh,v 1.9 2019/01/08 18:29:30 schmonz Exp $
 #
 # @PKGNAME@ script to control rbldns (local RBL service).
 #
@@ -57,8 +57,8 @@ BASE=${rbldns_base} \
 }
 
 rbldns_needcdb() {
-       _src=${axfrdns_tcprules}
-       _dst=${axfrdns_tcprules}.cdb
+       _src=${rbldns_data}
+       _dst=${rbldns_data}.cdb
        [ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
 }