3 files changed, 93 insertions, 54 deletions

diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index f9c3c0bc1624..3755ced2ed92 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	yadifa
-DISTVERSION=	2.3.9
-DISTVERSIONSUFFIX=	-8497
+DISTVERSION=	2.4.1
+DISTVERSIONSUFFIX=	-9916
 CATEGORIES=	dns
-MASTER_SITES=	http://cdn.yadifa.eu/sites/default/files/releases/
+MASTER_SITES=	https://www.yadifa.eu/sites/default/files/releases/ \
+		https://dns.company/downloads/yadifa/
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	Authoritative nameserver with DNSSEC capabilities
@@ -12,36 +13,44 @@ COMMENT=	Authoritative nameserver with DNSSEC capabilities
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	libtool ssl
+USES=		libtool ssl
+USE_RC_SUBR=	${PORTNAME}d
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 
-OPTIONS_DEFINE=	CTRL DOCS EXAMPLES TCL RRL MESSAGES NSID
-OPTIONS_DEFAULT=	RRL NSID
-OPTIONS_SUB=	yes
-
-CTRL_DESC=	Remote control
-RRL_DESC=	Response Rate Limiting
-MESSAGES_DESC=	Use messages instead of send (if many ip aliases)
-NSID_DESC=	Name Server Identifier Option
-
-CTRL_CONFIGURE_ENABLE=	ctrl
-TCL_USES=	tcl
-TCL_CONFIGURE_ENABLE=	tcl
-RRL_CONFIGURE_ENABLE=	rrl
-MESSAGES_CONFIGURE_ENABLE=	messages
-NSID_CONFIGURE_ENABLE=	nsid
-
-USE_RC_SUBR=	${PORTNAME}d
-
-PORTDOCS=	AUTHORS COPYING ChangeLog \
-		INSTALL NEWS README TODO VERSION
-
-post-patch:
-# Fix the build with -fno-common (for Clang 11 and GCC 10)
-	@${REINPLACE_CMD} -e '/\*g_client_logger/d' \
-		${WRKSRC}/bin/yadifa/yadifa.c
+PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
+
+OPTIONS_DEFINE=		CTRL DDNS DNSSECTOOLS DOCS ECDSA EXAMPLES KEYGEN \
+			LARGEFILE MASTER NSID RRL RRSIG TCL ZONESIGN
+OPTIONS_DEFAULT=	DDNS DNSSECTOOLS DOCS ECDSA EXAMPLES KEYGEN LARGEFILE \
+			MASTER NSID RRL RRSIG ZONESIGN
+OPTIONS_SUB=		yes
+
+CTRL_DESC=		Remote control
+DDNS_DESC=		Dynamic DNS support (DDNS)
+DNSSECTOOLS_DESC=	DNSSEC module
+ECDSA_DESC=		Elliptic Curve (ECDSA)
+KEYGEN_DESC=		Keygen tool
+LARGEFILE_DESC=		Support for largefiles
+MASTER_DESC=		Use as primary nameserver
+NSID_DESC=		Name Server Identifier Option
+RRL_DESC=		Response Rate Limiting
+RRSIG_DESC=		RRSIG management
+ZONESIGN_DESC=		Zonesign tool
+
+CTRL_CONFIGURE_OFF=		--disable-ctrl
+DDNS_CONFIGURE_OFF=		--disable-dynupdate
+ECDSA_CONFIGURE_OFF=		--disable-ecdsa
+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
 
 post-configure:
 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
@@ -50,11 +59,13 @@ post-configure:
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} features
 
-post-install:
-	${CP} ${WRKSRC}/etc/yadifad.conf \
-		${STAGEDIR}${PREFIX}/etc/yadifad.conf.sample
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/etc/yadifad.conf \
+		${STAGEDIR}${PREFIX}/etc/yadifad.conf.sample
 	${MV} ${STAGEDIR}/var/zones ${STAGEDIR}/var/${PORTNAME}
 
 post-install-EXAMPLES-on:
diff --git a/dns/yadifa/distinfo b/dns/yadifa/distinfo
index 1390dc721030..82b070f9a2f1 100644
--- a/dns/yadifa/distinfo
+++ b/dns/yadifa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550135251
-SHA256 (yadifa-2.3.9-8497.tar.gz) = 45e9a0e1c3c770147236c58a43041f715abe1a1d09c1f10cbff33fa743ca7e77
-SIZE (yadifa-2.3.9-8497.tar.gz) = 3670338
+TIMESTAMP = 1608810435
+SHA256 (yadifa-2.4.1-9916.tar.gz) = ad13e5f26e050959eed1cd15d22eeaf14551742df6458c5eec0219e0023e32d4
+SIZE (yadifa-2.4.1-9916.tar.gz) = 2635686
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index cafa87aa4a66..dde189616a47 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -1,7 +1,9 @@
-bin/yadifa
 %%EXAMPLES%%etc/bash_completion.d/yadifa.sh
 %%EXAMPLES%%etc/bash_completion.d/yadifad.sh
 @sample etc/yadifad.conf.sample
+etc/yakeyrolld.conf
+include/dnscore/acl-config.h
+include/dnscore/acl.h
 include/dnscore/alarm.h
 include/dnscore/allocator.h
 include/dnscore/async.h
@@ -14,10 +16,12 @@ include/dnscore/base64.h
 include/dnscore/basic-priority-queue.h
 include/dnscore/buffer_input_stream.h
 include/dnscore/buffer_output_stream.h
+include/dnscore/buffered-file.h
 include/dnscore/bytearray_input_stream.h
 include/dnscore/bytearray_output_stream.h
 include/dnscore/bytezarray_output_stream.h
 include/dnscore/chroot.h
+include/dnscore/circular-file.h
 include/dnscore/clone_input_output_stream.h
 include/dnscore/cmdline.h
 include/dnscore/concat_input_stream.h
@@ -32,7 +36,6 @@ include/dnscore/digest.h
 include/dnscore/dns-udp.h
 include/dnscore/dns_resource_record.h
 include/dnscore/dnscore-config-features.h
-include/dnscore/dnscore-config.h
 include/dnscore/dnscore.h
 include/dnscore/dnsformat.h
 include/dnscore/dnskey-keyring.h
@@ -46,15 +49,21 @@ include/dnscore/dnsname_set.h
 include/dnscore/dnssec_errors.h
 include/dnscore/empty-input-stream.h
 include/dnscore/fdtools.h
+include/dnscore/file-pool.h
+include/dnscore/file.h
 include/dnscore/file_input_stream.h
 include/dnscore/file_output_stream.h
+include/dnscore/filesystem-file.h
 include/dnscore/fingerprint.h
 include/dnscore/format.h
+include/dnscore/hash.h
+include/dnscore/hmac.h
 include/dnscore/host_address.h
 include/dnscore/hsdllist.h
 include/dnscore/identity.h
 include/dnscore/input_stream.h
 include/dnscore/io_stream.h
+include/dnscore/json.h
 include/dnscore/limited_input_stream.h
 include/dnscore/limiter.h
 include/dnscore/list-dl.h
@@ -63,9 +72,11 @@ include/dnscore/list-sl.h
 include/dnscore/logger-output-stream.h
 include/dnscore/logger.h
 include/dnscore/logger_channel_file.h
+include/dnscore/logger_channel_pipe.h
 include/dnscore/logger_channel_stream.h
 include/dnscore/logger_channel_syslog.h
 include/dnscore/logger_handle.h
+include/dnscore/mapped-file.h
 include/dnscore/message-buffer.h
 include/dnscore/message-viewer.h
 include/dnscore/message.h
@@ -73,9 +84,10 @@ include/dnscore/message_dnsupdate.h
 include/dnscore/message_verify_rrsig.h
 include/dnscore/mt_output_stream.h
 include/dnscore/mutex.h
-include/dnscore/name.h
 include/dnscore/network.h
+include/dnscore/nsec3-hash.h
 %%NSID%%include/dnscore/nsid.h
+include/dnscore/openssl.h
 include/dnscore/output_stream.h
 include/dnscore/pace.h
 include/dnscore/packet_reader.h
@@ -85,7 +97,9 @@ include/dnscore/parsing.h
 include/dnscore/pid.h
 include/dnscore/pipe_stream.h
 include/dnscore/pool.h
+include/dnscore/popen-output-stream.h
 include/dnscore/print_stream.h
+include/dnscore/process.h
 include/dnscore/ptr_set.h
 include/dnscore/ptr_set_debug.h
 include/dnscore/ptr_vector.h
@@ -97,17 +111,27 @@ include/dnscore/rfc.h
 include/dnscore/serial.h
 include/dnscore/server-setup.h
 include/dnscore/service.h
+include/dnscore/shared-circular-buffer.h
+include/dnscore/shared-heap-bytearray-output-stream.h
+include/dnscore/shared-heap.h
+include/dnscore/signals.h
+include/dnscore/simple-http-server.h
+include/dnscore/socket-server.h
 include/dnscore/string_set.h
 include/dnscore/sys_error.h
 include/dnscore/sys_get_cpu_count.h
 include/dnscore/sys_types.h
 include/dnscore/tcp_io_stream.h
+include/dnscore/tcp_manager.h
+include/dnscore/thread-tag.h
+include/dnscore/thread.h
 include/dnscore/thread_pool.h
 include/dnscore/threaded-qsl-cw.h
 include/dnscore/threaded_dll_cw.h
 include/dnscore/threaded_nb_mm.h
 include/dnscore/threaded_nbrb.h
 include/dnscore/threaded_queue.h
+include/dnscore/threaded_queue_slg.h
 include/dnscore/threaded_ringbuffer.h
 include/dnscore/threaded_ringbuffer_cw.h
 include/dnscore/threaded_ringlist.h
@@ -120,6 +144,9 @@ include/dnscore/u64_set.h
 include/dnscore/u64_set_debug.h
 include/dnscore/xfr_input_stream.h
 include/dnscore/zalloc.h
+include/dnscore/zone_reader.h
+include/dnscore/zone_reader_axfr.h
+include/dnscore/zone_reader_text.h
 include/dnscore/zonefile_reader.h
 include/dnsdb/avl.h
 include/dnsdb/btree.h
@@ -131,9 +158,9 @@ include/dnsdb/dnsrdata.h
 include/dnsdb/dnssec-keystore.h
 include/dnsdb/dnssec.h
 include/dnsdb/dnssec_config.h
-include/dnsdb/dynupdate.h
-include/dnsdb/dynupdate-diff.h
-include/dnsdb/hash.h
+%%DDNS%%include/dnsdb/dynupdate-diff.h
+%%DDNS%%include/dnsdb/dynupdate.h
+%%DDNS%%include/dnsdb/dynupdate-message.h
 include/dnsdb/htable.h
 include/dnsdb/htbt.h
 include/dnsdb/journal-cjf-common.h
@@ -142,15 +169,15 @@ include/dnsdb/journal-cjf-page-cache.h
 include/dnsdb/journal-cjf-page-output-stream.h
 include/dnsdb/journal-cjf-page.h
 include/dnsdb/journal-cjf.h
+include/dnsdb/journal-jnl.h
 include/dnsdb/journal.h
 include/dnsdb/journal_ix.h
-include/dnsdb/nsec.h
 include/dnsdb/nsec-chain-replay.h
+include/dnsdb/nsec.h
 include/dnsdb/nsec3-chain-replay.h
 include/dnsdb/nsec3-forall-label.h
 include/dnsdb/nsec3.h
 include/dnsdb/nsec3_collection.h
-include/dnsdb/nsec3_hash.h
 include/dnsdb/nsec3_item.h
 include/dnsdb/nsec3_load.h
 include/dnsdb/nsec3_name_error.h
@@ -160,7 +187,6 @@ include/dnsdb/nsec3_types.h
 include/dnsdb/nsec3_zone.h
 include/dnsdb/nsec_collection.h
 include/dnsdb/nsec_common.h
-include/dnsdb/rr_canonize.h
 include/dnsdb/rrsig.h
 include/dnsdb/xfr_copy.h
 include/dnsdb/zdb-config-features.h
@@ -173,8 +199,8 @@ include/dnsdb/zdb-zone-dnssec.h
 include/dnsdb/zdb-zone-find.h
 include/dnsdb/zdb-zone-garbage.h
 include/dnsdb/zdb-zone-journal.h
-include/dnsdb/zdb-zone-lock.h
 include/dnsdb/zdb-zone-lock-monitor.h
+include/dnsdb/zdb-zone-lock.h
 include/dnsdb/zdb-zone-maintenance.h
 include/dnsdb/zdb-zone-path-provider.h
 include/dnsdb/zdb-zone-reader-filter.h
@@ -192,8 +218,8 @@ include/dnsdb/zdb_zone.h
 include/dnsdb/zdb_zone_axfr_input_stream.h
 include/dnsdb/zdb_zone_label.h
 include/dnsdb/zdb_zone_label_iterator.h
+include/dnsdb/zdb_zone_label_iterator_ex.h
 include/dnsdb/zdb_zone_load.h
-include/dnsdb/zdb_zone_load_interface.h
 include/dnsdb/zdb_zone_process.h
 include/dnsdb/zdb_zone_write.h
 include/dnslg/config-load.h
@@ -202,21 +228,18 @@ include/dnslg/dns.h
 include/dnslg/dnslg-config-features.h
 include/dnslg/resolv-conf.h
 include/dnslg/resolv.h
-include/dnszone/dnszone-config-features.h
-include/dnszone/dnszone-config.h
-include/dnszone/dnszone.h
-include/dnszone/hints_file_reader.h
-include/dnszone/zone_axfr_reader.h
-include/dnszone/zone_file_reader.h
 lib/libdnscore.a
 lib/libdnsdb.a
 lib/libdnslg.a
-lib/libdnszone.a
+man/man5/yadifa.conf.5.gz
 man/man5/yadifa.rc.5.gz
 man/man5/yadifad.conf.5.gz
+man/man5/yakeyrolld.conf.5.gz
 man/man8/yadifa.8.gz
 man/man8/yadifad.8.gz
+man/man8/yakeyrolld.8.gz
 sbin/yadifad
+sbin/yakeyrolld
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.bash_completion
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.conf
@@ -232,14 +255,19 @@ sbin/yadifad
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.arch
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.debian
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.service.rhel
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yakeyrolld.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yakeyrolld.conf.example
 /var/yadifa/masters/0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.zone
 /var/yadifa/masters/0.0.127.in-addr.arpa.zone
 /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/yadifa