From b4a7459e765acd411f6bf56455a7b7b837434cee Mon Sep 17 00:00:00 2001
From: Leo Vandewoestijne <freebsd@dns.company>
Date: Fri, 21 Jun 2024 09:23:31 +0200
Subject: dns/knot3: upgrade to 3.3.6

Externalization of the port version to help keeping in sync with the upcoming
port dns/py-libknot to be introduced in PR #278280.

ChangeLog: https://www.knot-dns.cz/2024-06-12-version-336.html

Features:

 * knotd: configurable control socket backlog size (see 'control.backlog')
 * knotd: optional configuration of congruency of generated keytags (see
   'policy.keytag-modulo')
 * knotc: support for exporting configuration schema in JSON (see 'conf-export')
 * mod-dnstap: configuration of sink allows TCP address specification

Improvements:

 * knotd: last-signed serial is stored to KASP even if not a secondary zone
 * knotd: allowed catalog role member in a catalog template configuration
 * knotd: some references in a zone configuration can be set empty to override
   a template
 * knotd: allowed zone backup during a zone transaction
 * knotd: add remote TSIG key name to outgoing event logs
 * knotc: zone backup with '+keysonly' silently uses all defaults as 'off'
 * kxdpgun: host name can be used for target specification
 * libs: upgraded embedded libngtcp2 to 1.5.0
 * doc: various fixes and updates

Bugfixes:

 * knotd: reset TCP connection not removed from a connection pool
 * knotd: server wrongly tries to remove removed ZONEMD
 * knotd: failed to parse empty list from a textual configuration
 * knotd: blocking zone signing in combination with an open transaction causes a
   deadlock
 * knotd: missing RCU lock when sending NOTIFY
 * kdig: QNAME letter case isn't preserved if IDN is enabled
 * kdig: failed to parse empty QNAME (do not fill question section)
 * kxdpgun: floating point exception on SIGUSR1 #927
 * libknot: incorrect handling of regular QUIC tokens in incoming initials
 * python: failed to set an empty configuration value

PR:		279828
---
 dns/knot3/Makefile             | 3 ++-
 dns/knot3/distinfo             | 6 +++---
 dns/knot3/files/knot.in        | 3 ++-
 dns/knot3/files/pkg-message.in | 2 +-
 dns/knot3/knotdns.mk           | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 dns/knot3/knotdns.mk

(limited to 'dns')

diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile
index 2dae99633be0..cf30506e6998 100644
--- a/dns/knot3/Makefile
+++ b/dns/knot3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	knot
-DISTVERSION=	3.3.5
+DISTVERSION=	${KNOT_VERSION}
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		https://dns.company/downloads/knot-dns/
@@ -119,4 +119,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
+.include "knotdns.mk"
 .include <bsd.port.mk>
diff --git a/dns/knot3/distinfo b/dns/knot3/distinfo
index 73a2f056cb53..499160e437c9 100644
--- a/dns/knot3/distinfo
+++ b/dns/knot3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711024049
-SHA256 (knot-3.3.5.tar.xz) = 0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad
-SIZE (knot-3.3.5.tar.xz) = 1558484
+TIMESTAMP = 1718719373
+SHA256 (knot-3.3.6.tar.xz) = c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987
+SIZE (knot-3.3.6.tar.xz) = 1600484
diff --git a/dns/knot3/files/knot.in b/dns/knot3/files/knot.in
index 13cf8bf266ef..df885ed7c9c2 100644
--- a/dns/knot3/files/knot.in
+++ b/dns/knot3/files/knot.in
@@ -62,9 +62,10 @@ rcvar=${name}_enable
 load_rc_config ${name}
 
 eval ": \${${name}_enable:=\"NO\"}"
+eval ": \${${name}_config:=\"%%PREFIX%%/etc/knot/${name}.conf\"}"
 eval ": \${${name}_diruser:=\"%%USERS%%\"}"
 eval ": \${${name}_dirgroup:=\"%%GROUPS%%\"}"
-eval ": \${${name}_config:=\"%%PREFIX%%/etc/knot/${name}.conf\"}"
+eval ": \${${name}_svcj_options:=\"net_basic\"}"
 
 configfile="$(eval echo \${${name}_config})"
 diruser="$(eval echo \${${name}_diruser})"
diff --git a/dns/knot3/files/pkg-message.in b/dns/knot3/files/pkg-message.in
index 02cde6dc4373..d2722acaa4d4 100644
--- a/dns/knot3/files/pkg-message.in
+++ b/dns/knot3/files/pkg-message.in
@@ -15,7 +15,7 @@
    - https://www.knot-dns.cz/documentation/
 
   When upgrading from 2.4.x read:
-   - https://www.knot-dns.cz/docs/3.1/html/migration.html#upgrade-2-9-x-to-3-0-x
+   - https://www.knot-dns.cz/docs/3.3/html/migration.html#upgrade-2-9-x-to-3-0-x
 EOM
 }
 ]
diff --git a/dns/knot3/knotdns.mk b/dns/knot3/knotdns.mk
new file mode 100644
index 000000000000..bc6a9c05ef02
--- /dev/null
+++ b/dns/knot3/knotdns.mk
@@ -0,0 +1 @@
+KNOT_VERSION=	3.3.6
-- 
cgit v1.2.3