dns/yadifa: update to 2.5.0

Changes: https://www.yadifa.eu/sites/default/files/README_2.5.0.txt

PR:	256900

4 files changed, 46 insertions, 32 deletions

diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index 153eb85e6518..db4b9f513ae5 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yadifa
-DISTVERSION=	2.4.1
-DISTVERSIONSUFFIX=	-9916
+DISTVERSION=	2.5.0
+DISTVERSIONSUFFIX=	-10188
 CATEGORIES=	dns
 MASTER_SITES=	https://www.yadifa.eu/sites/default/files/releases/ \
 		https://dns.company/downloads/yadifa/
@@ -17,6 +17,15 @@ USE_RC_SUBR=	${PORTNAME}d
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 
+SUB_LIST+=	GROUPS="${GROUPS}" \
+		USERS="${USERS}"
+
+USERS=		yadifa
+GROUPS=		yadifa
+
+PLIST_SUB=	GROUPS="${GROUPS}" \
+		USERS="${USERS}"
+
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
 
 OPTIONS_DEFINE=		CTRL DDNS DNSSECTOOLS DOCS ECDSA EXAMPLES KEYGEN \
@@ -39,16 +48,16 @@ ZONESIGN_DESC=		Zonesign tool
 
 CTRL_CONFIGURE_OFF=		--disable-ctrl
 DDNS_CONFIGURE_OFF=		--disable-dynupdate
+DNSSECTOOLS_CONFIGURE_OFF=	--disable-dnssec-tools
 ECDSA_CONFIGURE_OFF=		--disable-ecdsa
+KEYGEN_CONFIGURE_ENABLE=	keygen
 LARGEFILE_CONFIGURE_OFF=	--disable-largefile
 MASTER_CONFIGURE_OFF=		--disable-master
 NSID_CONFIGURE_OFF=		--disable-nsid
 RRL_CONFIGURE_OFF=		--disable-rrl
 RRSIG_CONFIGURE_OFF=		--disable-rrsig-management
 TCL_USES=			tcl
-DNSSECTOOLS_OFF=		--disable-dnssec-tools
-KEYGEN_ENABLE=			keygen
-ZONESIGN_ENABLE=		zonesign
+ZONESIGN_CONFIGURE_ENABLE=	zonesign
 
 post-configure:
 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
diff --git a/dns/yadifa/distinfo b/dns/yadifa/distinfo
index 82b070f9a2f1..af22fd824f25 100644
--- a/dns/yadifa/distinfo
+++ b/dns/yadifa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608810435
-SHA256 (yadifa-2.4.1-9916.tar.gz) = ad13e5f26e050959eed1cd15d22eeaf14551742df6458c5eec0219e0023e32d4
-SIZE (yadifa-2.4.1-9916.tar.gz) = 2635686
+TIMESTAMP = 1628693820
+SHA256 (yadifa-2.5.0-10188.tar.gz) = 5cdc4cf61b87fe6d0fdc260386375172b8802a0bd7e63bbf3716ebe1a233fa16
+SIZE (yadifa-2.5.0-10188.tar.gz) = 2655763
diff --git a/dns/yadifa/files/yadifad.in b/dns/yadifa/files/yadifad.in
index 7ae9a5f9f518..0d4c818ec09f 100644
--- a/dns/yadifa/files/yadifad.in
+++ b/dns/yadifa/files/yadifad.in
@@ -1,30 +1,32 @@
 #!/bin/sh
 
 # PROVIDE: yadifad
-# REQUIRE: SERVERS cleanvar
+# REQUIRE: FILESYSTEMS SERVERS cleanvar defaultroute netwait
+# BEFORE: NETWORKING
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable yadifad:
 #
 # yadifad_enable="YES"
-# # optional
+# # and optional
 # yadifad_config="%%PREFIX%%/etc/yadifad.conf"
+# yadifad_uid="%%USERS%%"
+# yadifad_gid="%%GROUPS%%"
 
 . /etc/rc.subr
 
 name=yadifad
 rcvar=yadifad_enable
 
-load_rc_config ${name}
-
-: ${yadifad_enable:="NO"}
-: ${yadifad_config="%%PREFIX%%/etc/yadifad.conf"}
+eval ": \${${name}_enable:=\"NO\"}"
+eval ": \${${name}_config:=\"%%PREFIX%%/etc/${name}.conf\"}"
+eval ": \${${name}_uid:=\"%%USERS%%\"}"
+eval ": \${${name}_gid:=\"%%GROUPS%%\"}"
 
-command=%%PREFIX%%/sbin/${name}
-procname=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
+load_rc_config ${name}
 
-command_args="-c ${yadifad_config} -d"
 required_files=${yadifad_config}
+command=%%PREFIX%%/sbin/${name}
+command_args="-c ${yadifad_config} -d -u ${yadifad_uid} -g ${yadifad_gid}"
 
 run_rc_command "$1"
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index dde189616a47..42d21b6a1902 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -35,8 +35,8 @@ include/dnscore/debug_config.h
 include/dnscore/digest.h
 include/dnscore/dns-udp.h
 include/dnscore/dns_resource_record.h
-include/dnscore/dnscore-config-features.h
 include/dnscore/dnscore.h
+include/dnscore/dnscore-release-date.h
 include/dnscore/dnsformat.h
 include/dnscore/dnskey-keyring.h
 include/dnscore/dnskey-signature.h
@@ -148,6 +148,7 @@ include/dnscore/zone_reader.h
 include/dnscore/zone_reader_axfr.h
 include/dnscore/zone_reader_text.h
 include/dnscore/zonefile_reader.h
+include/dnscore-config-features.h
 include/dnsdb/avl.h
 include/dnsdb/btree.h
 include/dnsdb/chain-replay.h
@@ -189,7 +190,6 @@ include/dnsdb/nsec_collection.h
 include/dnsdb/nsec_common.h
 include/dnsdb/rrsig.h
 include/dnsdb/xfr_copy.h
-include/dnsdb/zdb-config-features.h
 include/dnsdb/zdb-lock.h
 include/dnsdb/zdb-packed-ttlrdata.h
 include/dnsdb/zdb-zone-answer-axfr.h
@@ -225,9 +225,10 @@ include/dnsdb/zdb_zone_write.h
 include/dnslg/config-load.h
 include/dnslg/config-resolver.h
 include/dnslg/dns.h
-include/dnslg/dnslg-config-features.h
 include/dnslg/resolv-conf.h
 include/dnslg/resolv.h
+include/dnslg-config-features.h
+include/zdb-config-features.h
 lib/libdnscore.a
 lib/libdnsdb.a
 lib/libdnslg.a
@@ -243,8 +244,8 @@ sbin/yakeyrolld
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.bash_completion
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-master.conf.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-slave.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-primary.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-secondary.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.bash_completion
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.init
@@ -262,12 +263,14 @@ sbin/yakeyrolld
 /var/yadifa/masters/localhost.zone
 /var/yadifa/masters/localhost6.zone
 /var/yadifa/masters/somedomain.eu.zone
-@dir /var/log/yadifa
-@dir /var/log/yadifad
-@dir /var/log/yakeyrolld
-@dir /var/plans
-@dir /var/yadifa
-@dir /var/yadifa/keys
-@dir /var/yadifa/masters
-@dir /var/yadifa/slaves
-@dir /var/yadifa/xfr
+@dir /var/log
+@dir(%%USERS%%,%%GROUPS%%,750) /var/log/yadifa
+@dir(%%USERS%%,%%GROUPS%%,750) /var/log/yadifad
+@dir(%%USERS%%,%%GROUPS%%,750) /var/log/yakeyrolld
+@dir(%%USERS%%,%%GROUPS%%,750) /var/plans
+@dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa
+@dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/keys
+@dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/masters
+@dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/slaves
+@dir(%%USERS%%,%%GROUPS%%,750) /var/yadifa/xfr
+@postexec chown -R %%USERS%%:%%GROUPS%% /var/yadifa