dns/knot-resolver: upgrade 3.2.1 -> 4.1.0

PR:		239261
Submitted by:	freebsd@dns.company (maintainer)
MFH:		2019Q3
Relnotes:	https://www.knot-resolver.cz/2019-07-10-knot-resolver-4.1.0.html
		https://www.knot-resolver.cz/2019-04-18-knot-resolver-4.0.0.html
Security:	CVE-2019-10190, CVE-2019-10191

5 files changed, 129 insertions, 98 deletions

diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 8f6f78f3c560..7dcbe55ef4f1 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
-DISTVERSION=	3.2.1
-PORTREVISION=	4
+DISTVERSION=	4.1.0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -11,7 +10,7 @@ MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 MAINTAINER=	freebsd@dns.company
 COMMENT=	Caching full resolver implementation
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	bash:shells/bash \
 		git:devel/git
@@ -22,25 +21,46 @@ LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libuv.so:devel/libuv
 TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 
-USES=		gmake libedit libtool ncurses pkgconfig shebangfix tar:xz
-
-SHEBANG_FILES=	scripts/coverage_env.sh
+USES=		compiler:c11 compiler:c++11-lang libedit libtool meson \
+		ncurses ninja pkgconfig shebangfix tar:xz
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
+LDFLAGS=	-L${LOCALBASE}/lib
+
+SHEBANG_FILES=	scripts/bench.sh \
+		scripts/build-in-obs.sh \
+		scripts/coverage_c_combine.sh \
+		scripts/coverage_env.sh \
+		scripts/gen-cdefs.sh \
+		scripts/get-date.sh \
+		scripts/get-scanbuild-args.sh \
+		scripts/luacov_gen_empty.sh \
+		scripts/make-dev-archive.sh \
+		scripts/make-distrofiles.sh \
+		scripts/make-doc.sh \
+		scripts/make-srpm.sh \
+		scripts/run-pylint.sh \
+		scripts/test-config.sh \
+		scripts/test-integration-prepare.sh \
+		scripts/update-root-hints.sh
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
-MAKE_ARGS+=	PREFIX=${LOCALBASE}
-MAKE_ARGS+=	LIBDIR=${PREFIX}/lib
-MAKE_ARGS+=	MANDIR=${PREFIX}/man
-MAKE_ARGS+=	PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
-MAKE_ARGS+=	lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
+MESON_ARGS=	--default-library=static \
+		--mandir=${MANPREFIX} \
+		--prefix=${LOCALBASE} \
+		-Dsystemd=false
+#MESON_ARGS+=	--libdir=${PREFIX}/lib
+#MESON_ARGS+=	--pkg-config-path=${PREFIX}/libdata/pkgconfig
+#MESON_ARGS+=	lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
 
-OPTIONS_DEFINE=	DOCS DNSTAP DOXYGEN GO TRUSTANCHOR
+OPTIONS_DEFINE=		DOCS DNSTAP DOXYGEN GO TRUSTANCHOR
+OPTIONS_DEFAULT=	DOCS DNSTAP DOXYGEN GO	
 
 # COOKIES will come return/reworked to reflect IETF dnsop group development
 #COOKIES_DESC=			cookies
 #COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle
-#COOKIES_MAKE_ARGS=		HAS_nettle=yes
+#COOKIES_MAKE_ARGS_ON=		HAS_nettle=yes
 #COOKIES_MAKE_ARGS_OFF=		HAS_nettle=no
 #COOKIES_PLIST_FILES=		lib/kdns_modules/cookies.so      \
 #				include/libkres/alg_containers.h \
@@ -54,39 +74,45 @@ DNSTAP_DESC=			dnstap support
 DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
 				libprotobuf-c.so:devel/protobuf-c \
 				libfstrm.so:devel/fstrm
-DNSTAP_MAKE_ARGS=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
-DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
-DNSTAP_PLIST_FILES=		lib/kdns_modules/dnstap.so
+#DNSTAP_MAKE_ARGS_ON=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
+#DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
+DNSTAP_PLIST_FILES=		lib/knot-resolver/kres_modules/dnstap.so
 
 DOXYGEN_IMPLIES=		DOCS
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
-DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
-DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
+#DOXYGEN_MAKE_ARGS_ON=		HAS_doxygen=yes
+#DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 
 GO_DESC=			go
 GO_USES=			go:no_targets
-GO_MAKE_ARGS=			HAS_go=yes
-GO_MAKE_ARGS_OFF=		HAS_go=no
+GO_BUILD_DEPENDS=		go>=1.5:lang/go
+#GO_MAKE_ARGS_ON=		HAS_go=yes
+#GO_MAKE_ARGS_OFF=		HAS_go=no
 
 TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
 TRUSTANCHOR_USES=		lua
-TRUSTANCHOR_MAKE_ARGS=		HAS_ltn12=yes HAS_ssl.https=yes
-TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
+#TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=yes
+#TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
 TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
 				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON_i386=	libknot (installed by knot2) is broken on 11.2 at i386
-.endif
+# has to be tested if this is still is a bug.
+# if so, look in /usr/ports/multimedia/dav1d/Makefile for
+# CPU stuff / llvm bug/workaround/solution
+#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000
+#NOT_FOR_ARCHS=	i386
+#NOT_FOR_ARCHS_REASON_i386=	libknot (installed by knot2) is broken on 11.2 at i386
+#.endif
 
 USERS=		kresd
 GROUPS=		kresd
 
 PORTDOCS=	AUTHORS COPYING CodingStyle README.md
 
+# check below list.
+# libkres shouldn't have versioning anymore...
 STRIP_TARGETS=	sbin/kresd			\
 		sbin/kresc			\
 		lib/libkres.so.7		\
@@ -97,6 +123,8 @@ STRIP_TARGETS=	sbin/kresd			\
 		lib/kdns_modules/hints.so	\
 		lib/kdns_modules/stats.so
 
+pre-install-TEST-on: do-test
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 479e745e489c..0be4f125923e 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548257387
-SHA256 (knot-resolver-3.2.1.tar.xz) = d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b
-SIZE (knot-resolver-3.2.1.tar.xz) = 1765912
+TIMESTAMP = 1563184187
+SHA256 (knot-resolver-4.1.0.tar.xz) = 2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68
+SIZE (knot-resolver-4.1.0.tar.xz) = 1766916
diff --git a/dns/knot-resolver/files/patch-Makefile b/dns/knot-resolver/files/patch-Makefile
deleted file mode 100644
index 52a4f3d9b872..000000000000
--- a/dns/knot-resolver/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	2018-07-02 17:45:52.000000000 +0200
-+++ Makefile	2018-07-04 10:35:57.228161000 +0200
-@@ -1,4 +1,4 @@
--SHELL=/bin/bash -o pipefail -o errexit
-+SHELL=/usr/local/bin/bash -o pipefail -o errexit
- 
- include config.mk
- include platform.mk
diff --git a/dns/knot-resolver/files/pkg-message.in b/dns/knot-resolver/files/pkg-message.in
index 644ccbedae9a..adb121c11ba8 100644
--- a/dns/knot-resolver/files/pkg-message.in
+++ b/dns/knot-resolver/files/pkg-message.in
@@ -2,9 +2,12 @@
 
   Please consult the documentation:
    - man kresd
-   - http://knot-resolver.readthedocs.io/en/latest/
+   - https://knot-resolver.readthedocs.io/
 
   To run as daemon see:
-   - http://knot-resolver.readthedocs.io/en/latest/daemon.html
+   - https://knot-resolver.readthedocs.io/en/latest/daemon.html
+
+  If upgrading:
+   - https://knot-resolver.readthedocs.io/en/stable/upgrading.html
 
 ######################################################################
diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist
index 169660b66c8e..703fadf7c325 100644
--- a/dns/knot-resolver/pkg-plist
+++ b/dns/knot-resolver/pkg-plist
@@ -1,9 +1,7 @@
-%%ETCDIR%%/config.cluster
-%%ETCDIR%%/config.isp
-%%ETCDIR%%/config.personal
-%%ETCDIR%%/config.splitview
 %%ETCDIR%%/icann-ca.pem
+%%ETCDIR%%/kresd.conf
 %%ETCDIR%%/root.hints
+%%ETCDIR%%/root.keys
 include/libkres/api.h
 include/libkres/array.h
 include/libkres/cdb_api.h
@@ -28,61 +26,71 @@ include/libkres/ta.h
 include/libkres/trie.h
 include/libkres/utils.h
 include/libkres/zonecut.h
-lib/kdns_modules/ahocorasick.so
-lib/kdns_modules/basexx.lua
-lib/kdns_modules/bogus_log.so
-lib/kdns_modules/daf.lua
-lib/kdns_modules/daf/daf.js
-lib/kdns_modules/detect_time_jump.lua
-lib/kdns_modules/detect_time_skew.lua
-lib/kdns_modules/dns64.lua
-lib/kdns_modules/edns_keepalive.so
-lib/kdns_modules/etcd.lua
-lib/kdns_modules/experimental_dot_auth.lua
-lib/kdns_modules/graphite.lua
-lib/kdns_modules/hints.so
-lib/kdns_modules/http.lua
-lib/kdns_modules/http/LICENSE
-lib/kdns_modules/http/bootstrap-theme.min.css
-lib/kdns_modules/http/bootstrap.min.css
-lib/kdns_modules/http/bootstrap.min.js
-lib/kdns_modules/http/d3.js
-lib/kdns_modules/http/datamaps.world.min.js
-lib/kdns_modules/http/dygraph-combined.js
-lib/kdns_modules/http/epoch.css
-lib/kdns_modules/http/epoch.js
-lib/kdns_modules/http/favicon.ico
-lib/kdns_modules/http/glyphicons-halflings-regular.woff2
-lib/kdns_modules/http/jquery.js
-lib/kdns_modules/http/kresd.css
-lib/kdns_modules/http/kresd.js
-lib/kdns_modules/http/main.tpl
-lib/kdns_modules/http/selectize.bootstrap3.min.css
-lib/kdns_modules/http/selectize.min.css
-lib/kdns_modules/http/selectize.min.js
-lib/kdns_modules/http/topojson.js
-lib/kdns_modules/http_trace.lua
-lib/kdns_modules/kres-gen.lua
-lib/kdns_modules/kres.lua
-lib/kdns_modules/nsid.so
-lib/kdns_modules/policy.lua
-lib/kdns_modules/predict.lua
-lib/kdns_modules/prefill.lua
-lib/kdns_modules/priming.lua
-lib/kdns_modules/prometheus.lua
-lib/kdns_modules/rebinding.lua
-lib/kdns_modules/renumber.lua
-lib/kdns_modules/serve_stale.lua
-lib/kdns_modules/stats.so
-lib/kdns_modules/ta_sentinel.lua
-lib/kdns_modules/ta_signal_query.lua
-lib/kdns_modules/trust_anchors.lua
-lib/kdns_modules/view.lua
-lib/kdns_modules/workarounds.lua
-lib/kdns_modules/zonefile.lua
-lib/libkres.so
-lib/libkres.so.9
+lib/knot-resolver/ahocorasick.so
+lib/knot-resolver/config.lua
+lib/knot-resolver/kres-gen.lua
+lib/knot-resolver/kres.lua
+lib/knot-resolver/kres_modules/bogus_log.so
+lib/knot-resolver/kres_modules/daf.lua
+lib/knot-resolver/kres_modules/daf/daf.js
+lib/knot-resolver/kres_modules/detect_time_jump.lua
+lib/knot-resolver/kres_modules/detect_time_skew.lua
+lib/knot-resolver/kres_modules/dns64.lua
+lib/knot-resolver/kres_modules/edns_keepalive.so
+lib/knot-resolver/kres_modules/etcd.lua
+lib/knot-resolver/kres_modules/experimental_dot_auth.lua
+lib/knot-resolver/kres_modules/graphite.lua
+lib/knot-resolver/kres_modules/hints.so
+lib/knot-resolver/kres_modules/http.lua
+lib/knot-resolver/kres_modules/http/LICENSE
+lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css
+lib/knot-resolver/kres_modules/http/bootstrap.min.css
+lib/knot-resolver/kres_modules/http/bootstrap.min.js
+lib/knot-resolver/kres_modules/http/d3.js
+lib/knot-resolver/kres_modules/http/datamaps.world.min.js
+lib/knot-resolver/kres_modules/http/dygraph.min.js
+lib/knot-resolver/kres_modules/http/epoch.css
+lib/knot-resolver/kres_modules/http/epoch.js
+lib/knot-resolver/kres_modules/http/favicon.ico
+lib/knot-resolver/kres_modules/http/glyphicons-halflings-regular.woff2
+lib/knot-resolver/kres_modules/http/jquery.js
+lib/knot-resolver/kres_modules/http/kresd.css
+lib/knot-resolver/kres_modules/http/kresd.js
+lib/knot-resolver/kres_modules/http/main.tpl
+lib/knot-resolver/kres_modules/http/selectize.bootstrap3.min.css
+lib/knot-resolver/kres_modules/http/selectize.min.css
+lib/knot-resolver/kres_modules/http/selectize.min.js
+lib/knot-resolver/kres_modules/http/topojson.js
+lib/knot-resolver/kres_modules/http_doh.lua
+lib/knot-resolver/kres_modules/http_tls_cert.lua
+lib/knot-resolver/kres_modules/http_trace.lua
+lib/knot-resolver/kres_modules/nsid.so
+lib/knot-resolver/kres_modules/policy.lua
+lib/knot-resolver/kres_modules/predict.lua
+lib/knot-resolver/kres_modules/prefill.lua
+lib/knot-resolver/kres_modules/priming.lua
+lib/knot-resolver/kres_modules/prometheus.lua
+lib/knot-resolver/kres_modules/rebinding.lua
+lib/knot-resolver/kres_modules/renumber.lua
+lib/knot-resolver/kres_modules/serve_stale.lua
+lib/knot-resolver/kres_modules/stats.so
+lib/knot-resolver/kres_modules/ta_sentinel.lua
+lib/knot-resolver/kres_modules/ta_signal_query.lua
+lib/knot-resolver/kres_modules/ta_update.lua
+lib/knot-resolver/kres_modules/view.lua
+lib/knot-resolver/kres_modules/workarounds.lua
+lib/knot-resolver/sandbox.lua
+lib/knot-resolver/trust_anchors.lua
+lib/knot-resolver/zonefile.lua
+lib/libkres.a
 libdata/pkgconfig/libkres.pc
-man/man8/kresd.8.gz
+man8/kresd.8
+sbin/kres-cache-gc
 sbin/kresc
 sbin/kresd
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.cluster
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.docker
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.isp
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.personal
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.splitview