Tue Jan 8 18:29:30 2019 UTC ()
Let ucspi-tcp6, if installed, satisfy the non-'inet6' DEPENDS. Fix
rbldns_needcdb() to operate on rbldns_data. Ride previous bump.


(schmonz)
diff -r1.3 -r1.4 pkgsrc/net/djbdns-run/options.mk
diff -r1.8 -r1.9 pkgsrc/net/djbdns-run/files/rbldns.sh
cvs diff -r1.3 -r1.4 pkgsrc/net/djbdns-run/options.mk (expand / switch to unified diff)

--- pkgsrc/net/djbdns-run/options.mk 2019/01/07 19:45:48 1.3
+++ pkgsrc/net/djbdns-run/options.mk 2019/01/08 18:29:29 1.4
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: options.mk,v 1.3 2019/01/07 19:45:48 schmonz Exp $ 1# $NetBSD: options.mk,v 1.4 2019/01/08 18:29:29 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns-run 3PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns-run
4PKG_SUPPORTED_OPTIONS+= inet6 4PKG_SUPPORTED_OPTIONS+= inet6
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8FILES_SUBST+= TINYDNS_LISTENIP=${TINYDNS_LISTENIP:Q} 8FILES_SUBST+= TINYDNS_LISTENIP=${TINYDNS_LISTENIP:Q}
9FILES_SUBST+= DNSCACHE_LISTENIP=${DNSCACHE_LISTENIP:Q} 9FILES_SUBST+= DNSCACHE_LISTENIP=${DNSCACHE_LISTENIP:Q}
10FILES_SUBST+= DNSCACHE_SENDIP=${DNSCACHE_SENDIP:Q} 10FILES_SUBST+= DNSCACHE_SENDIP=${DNSCACHE_SENDIP:Q}
11 11
12.if !empty(PKG_OPTIONS:Minet6) 12.if !empty(PKG_OPTIONS:Minet6)
13DEPENDS_DJBDNS= djbdnscurve6-[0-9]*:../../net/djbdnscurve6 13DEPENDS_DJBDNS= djbdnscurve6-[0-9]*:../../net/djbdnscurve6
14DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 14DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
15DNSROOTS_GLOBAL= share/examples/djbdnscurve6/dnsroots.global 15DNSROOTS_GLOBAL= share/examples/djbdnscurve6/dnsroots.global
16TINYDNS_LISTENIP= :: 16TINYDNS_LISTENIP= ::
17DNSCACHE_LISTENIP= ::1 17DNSCACHE_LISTENIP= ::1
18DNSCACHE_SENDIP= :: 18DNSCACHE_SENDIP= ::
19CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \ 19CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \
20 ${PKG_SYSCONFDIR}/dnscache/ip/::1 20 ${PKG_SYSCONFDIR}/dnscache/ip/::1
21.else 21.else
22DEPENDS_DJBDNS= djbdns>=1.05nb5:../../net/djbdns 22DEPENDS_DJBDNS= djbdns>=1.05nb5:../../net/djbdns
23DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp 23DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
24DNSROOTS_GLOBAL= share/examples/djbdns/dnsroots.global 24DNSROOTS_GLOBAL= share/examples/djbdns/dnsroots.global
25TINYDNS_LISTENIP= 0.0.0.0 25TINYDNS_LISTENIP= 0.0.0.0
26DNSCACHE_LISTENIP= 127.0.0.1 26DNSCACHE_LISTENIP= 127.0.0.1
27DNSCACHE_SENDIP= 0.0.0.0 27DNSCACHE_SENDIP= 0.0.0.0
28CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \ 28CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \
29 ${PKG_SYSCONFDIR}/dnscache/ip/127.0.0.1 29 ${PKG_SYSCONFDIR}/dnscache/ip/127.0.0.1
30.endif 30.endif
cvs diff -r1.8 -r1.9 pkgsrc/net/djbdns-run/files/rbldns.sh (expand / switch to unified diff)

--- pkgsrc/net/djbdns-run/files/rbldns.sh 2019/01/07 14:01:55 1.8
+++ pkgsrc/net/djbdns-run/files/rbldns.sh 2019/01/08 18:29:30 1.9
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: rbldns.sh,v 1.8 2019/01/07 14:01:55 schmonz Exp $ 3# $NetBSD: rbldns.sh,v 1.9 2019/01/08 18:29:30 schmonz Exp $
4# 4#
5# @PKGNAME@ script to control rbldns (local RBL service). 5# @PKGNAME@ script to control rbldns (local RBL service).
6# 6#
7 7
8# PROVIDE: rbldns named 8# PROVIDE: rbldns named
9# REQUIRE: NETWORKING mountcritremote syslogd 9# REQUIRE: NETWORKING mountcritremote syslogd
10# BEFORE: DAEMON 10# BEFORE: DAEMON
11 11
12name="rbldns" 12name="rbldns"
13 13
14# User-settable rc.conf variables and their default values: 14# User-settable rc.conf variables and their default values:
15: ${rbldns_postenv:=""} 15: ${rbldns_postenv:=""}
16: ${rbldns_ip:="127.0.0.3"} 16: ${rbldns_ip:="127.0.0.3"}
@@ -47,28 +47,28 @@ rbldns_precmd() { @@ -47,28 +47,28 @@ rbldns_precmd() {
47ROOT=@PKG_SYSCONFDIR@/${name} \ 47ROOT=@PKG_SYSCONFDIR@/${name} \
48IP=${rbldns_ip} \ 48IP=${rbldns_ip} \
49BASE=${rbldns_base} \ 49BASE=${rbldns_base} \
50@PREFIX@/bin/envuidgid @DJBDNS_RBL_USER@ \ 50@PREFIX@/bin/envuidgid @DJBDNS_RBL_USER@ \
51@PREFIX@/bin/softlimit -d ${rbldns_datalimit} \ 51@PREFIX@/bin/softlimit -d ${rbldns_datalimit} \
52@PREFIX@/bin/argv0 @PREFIX@/bin/${name} ${procname} \ 52@PREFIX@/bin/argv0 @PREFIX@/bin/${name} ${procname} \
532>&1 | \ 532>&1 | \
54@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DJBDNS_LOG_USER@ ${rbldns_logcmd}" 54@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DJBDNS_LOG_USER@ ${rbldns_logcmd}"
55 command_args="&" 55 command_args="&"
56 rc_flags="" 56 rc_flags=""
57} 57}
58 58
59rbldns_needcdb() { 59rbldns_needcdb() {
60 _src=${axfrdns_tcprules} 60 _src=${rbldns_data}
61 _dst=${axfrdns_tcprules}.cdb 61 _dst=${rbldns_data}.cdb
62 [ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ] 62 [ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
63} 63}
64 64
65rbldns_cdb() { 65rbldns_cdb() {
66 @ECHO@ "Reloading ${rbldns_data}." 66 @ECHO@ "Reloading ${rbldns_data}."
67 cd @PKG_SYSCONFDIR@/${name} && @PREFIX@/bin/rbldns-data 67 cd @PKG_SYSCONFDIR@/${name} && @PREFIX@/bin/rbldns-data
68 @CHMOD@ 644 ${rbldns_data}.cdb 68 @CHMOD@ 644 ${rbldns_data}.cdb
69} 69}
70 70
71if [ -f /etc/rc.subr ]; then 71if [ -f /etc/rc.subr ]; then
72 load_rc_config $name 72 load_rc_config $name
73 run_rc_command "$1" 73 run_rc_command "$1"
74else 74else