Attachment #216207 for bug #247699




# Created by: Leo Vandewoestijne <freebsd@dns.company>
# $FreeBSD$

PORTNAME=	knot-resolver
DISTVERSION=	5.1.2
CATEGORIES=	dns
MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
		https://dns.company/downloads/knot-resolver/

MAINTAINER=	freebsd@dns.company
COMMENT=	Caching full resolver implementation

LICENSE=	GPLv3+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	bash:shells/bash \
		cmocka>=1.1.1:sysutils/cmocka \
		flake8:devel/py-flake8@${PY_FLAVOR} \
		lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \
		luacheck:devel/lua-luacheck \
		cmake:devel/cmake

LIB_DEPENDS=	libknot.so:dns/knot2-lib \
		libdnssec.so:dns/knot2-lib \
		libzscanner.so:dns/knot2-lib \
		libgnutls.so:security/gnutls \
		liblmdb.so:databases/lmdb \
		libluajit-5.1.so:lang/luajit-openresty \
		libuv.so:devel/libuv

RUN_DEPENDS=	lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \

USES=		compiler:c11 compiler:c++11-lang libedit libtool \
		meson ncurses ninja pkgconfig python:3.5+,build \
		shebangfix tar:xz

USE_CXXSTD=	c++11
USE_LDCONFIG=	yes
LDFLAGS+=	-L${LOCALBASE}/lib

USE_RC_SUBR=	krescachegc kresd

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/obs-build.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].*

MESON_ARGS=	--buildtype=release \
		--default-library=static \
		--libdir=${PREFIX}/lib \
		--pkg-config-path=${PREFIX}/libdata/pkgconfig \
		--prefix=${LOCALBASE} \
		-Duser=${USERS} \
		-Dgroup=${GROUPS} \
		-Dinstall_kresd_conf=enabled \
		-Dclient=enabled \
		-Dutils=enabled \
		-Dinstall_root_keys=enabled \
		-Dkeyfile_default=${ETCDIR}/root.keys \
		-Droot_hints=${ETCDIR}/root.hints

LDFLAGS+=	-L${LOCALBASE}/lib

CONFLICTS=	knot-1.* knot1-[0-6].*

SUB_FILES=	pkg-message

SUB_LIST=	USERS=${USERS} \
		GROUPS=${GROUPS} \
		RUNDIR=${RUNDIR}

OPTIONS_DEFINE=		DOCS DNSTAP DOXYGEN TRUSTANCHOR
OPTIONS_DEFAULT=	DOCS DNSTAP DOXYGEN

# docs/meson.build wants python2 or python3 - not -for example- python3.7
# So this currently is partially broken:
#DOCS_MESON_ON=			-Ddoc=enabled

DNSTAP_DESC=			dnstap support
DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
				libprotobuf-c.so:devel/protobuf-c \
				libfstrm.so:devel/fstrm
DNSTAP_PLIST_FILES=		lib/knot-resolver/kres_modules/dnstap.so
DNSTAP_MESON_ON=		-Ddnstap=enabled
DNSTAP_MESON_OFF=		-Ddnstap=disabled

DOXYGEN_IMPLIES=		DOCS
DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
				${PY_SPHINX} \
				${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}

TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
TRUSTANCHOR_USES=		lua
TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket@${LUA_FLAVOR} \
				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec@${LUA_FLAVOR}

.include <bsd.port.options.mk>

USERS=		kresd
GROUPS=		kresd
RUNDIR=		/var/run/kresd

PLIST_SUB=	USERS=${USERS} \
		GROUPS=${GROUPS} \
		RUNDIR=${RUNDIR}

OPTIONS_DEFINE=		DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
OPTIONS_DEFAULT=	DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF

DNSTAP_DESC=		dnstap support
ROOTKEYS_DESC=		install root.keys
TESTCONF_DESC=		Do config tests
TESTEXTRA_DESC=		Do extra tests
TESTUNIT_DESC=		Do unit tests
TEST_DESC=		Do tests
TRUSTANCHOR_DESC=	Trust anchor bootstrapping, management and stats

DNSTAP_LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
			libprotobuf-c.so:devel/protobuf-c \
			libfstrm.so:devel/fstrm
DNSTAP_MESON_ON=	-Ddnstap=enabled
DNSTAP_MESON_OFF=	-Ddnstap=disabled
DNSTAP_PLIST_FILES=	lib/knot-resolver/kres_modules/dnstap.so

ROOTKEYS_MESON_ON=	-Dinstall_root_keys=enabled
ROOTKEYS_MESON_OFF=	-Dinstall_root_keys=disabled
ROOTKEYS_PLIST_FILES=	${ETCDIR}/root.keys

TESTCONF_MESON_ON=	-Dconfig_tests=enabled
TESTCONF_MESON_OFF=	-Dconfig_tests=disabled

TESTEXTRA_BROKEN=	CMake Error: The source directory misses CMakeLists.txt
TESTEXTRA_BUILD_DEPENDS=git:devel/git
TESTEXTRA_USES=		cmake python:3
TESTEXTRA_MESON_ON=	-Dextra_tests=enabled \
			-Dsendmmsg=disabled
TESTEXTRA_MESON_OFF=	-Dextra_tests=disabled

TESTUNIT_BUILD_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
TESTUNIT_MESON_ON=	-Dunit_tests=enabled
TESTUNIT_MESON_OFF=	-Dunit_tests=disabled

TRUSTANCHOR_MESON_ON=	-Dmanaged_ta=enabled
TRUSTANCHOR_MESON_OFF=	-Dmanaged_ta=disabled

PORTDOCS=	AUTHORS COPYING CodingStyle NEWS README.md
PORTEXAMPLES=	config.cluster config.docker config.internal config.isp \
		config.personal config.privacy config.splitview

STRIP_TARGETS=	sbin/kres-cache-gc \
		sbin/kresc \
		sbin/kresd \
		lib/knot-resolver/ahocorasick.so \
		lib/knot-resolver/kres_modules/bogus_log.so \
		lib/knot-resolver/kres_modules/dnstap.so \
		lib/knot-resolver/kres_modules/edns_keepalive.so \
		lib/knot-resolver/kres_modules/hints.so \
		lib/knot-resolver/kres_modules/lib/knot-resolver/kres_modules/nsid.so \
		lib/knot-resolver/kres_modules/refuse_nord.so \
		lib/knot-resolver/kres_modules/stats.so

pre-install:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${MKDIR} ${STAGEDIR}${RUNDIR}

pre-install-TEST-on: do-test

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
.for STRIP_TGT in ${STRIP_TARGETS}
	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
	fi
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)dns/knot-resolver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589914626	1	TIMESTAMP = 1593645886
2	SHA256 (knot-resolver-5.1.1.tar.xz) = f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e	2	SHA256 (knot-resolver-5.1.2.tar.xz) = caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836
3	SIZE (knot-resolver-5.1.1.tar.xz) = 1744544	3	SIZE (knot-resolver-5.1.2.tar.xz) = 1749236




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: krescachegc
# REQUIRE: SERVERS cleanvar
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable knot-resolver:
#
# krescachegc_enable="YES":	Set to YES to enable krescachegc.
#				Set to NO by default.
# krescachegc_millis="1000":	Set to garbage collect interval in milliseconds
#				Set to 1000 by default.
#

. /etc/rc.subr

name=krescachegc
rcvar=krescachegc_enable

load_rc_config ${name}

# set defaults

krescachegc_enable=${krescachegc_enable:-"NO"}
krescachegc_millis=${krescachegc_millis:-"1000"}

pidfile="%%RUNDIR%%/${name}.pid"
procname="%%PREFIX%%/sbin/kres-cache-gc"

command=/usr/sbin/daemon
command_args="-c -f -r -P ${pidfile} -u %%USERS%% -- ${procname} -c %%RUNDIR%% -d ${krescachegc_millis}"

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: kresd
# REQUIRE: NETWORKING
# BEFORE: SERVERS
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable knot-resolver:
#
# kresd_enable="YES":	Set to YES to enable kresd.
#			Set to NO by default.
# kresd_config="":	Set to %%ETCDIR%%/kresd.conf
#			by default.
#

. /etc/rc.subr

name=kresd
rcvar=kresd_enable

load_rc_config ${name}

# set defaults

kresd_enable=${kresd_enable:-"NO"}
kresd_config=${kresd_config:-"%%ETCDIR%%/${name}.conf"}

pidfile="%%RUNDIR%%/${name}.pid"
procname="%%PREFIX%%/sbin/${name}"
required_files="${kresd_config}"

command="/usr/sbin/daemon"
command_args="-c -f -S -r -P ${pidfile} -- ${procname} -c ${kresd_config} -n -q %%RUNDIR%%"

run_rc_command "$1"




--- etc/meson.build.orig	2020-07-03 22:08:58.026241000 +0200
+++ etc/meson.build	2020-07-03 22:09:08.794204000 +0200
@@ -7,9 +7,9 @@
   etc_files += 'root.hints'
 endif
 
-if managed_ta
+#if managed_ta
   etc_files += 'icann-ca.pem'
-endif
+#endif
 
 if install_root_keys
   root_keys_path = keyfile_default.split('/')

Added Link Here

(-)dns/knot-resolver/files/patch-meson.build (+11 lines)
1	--- meson.build.orig 2020-07-01 14:27:52.000000000 +0200
2	+++ meson.build 2020-07-03 22:04:51.271036000 +0200
3	@@ -47,7 +47,7 @@
4	prefix = get_option('prefix')
5	data_dir = join_paths(prefix, get_option('datadir'), 'knot-resolver')
6	doc_dir = join_paths(prefix, get_option('datadir'), 'doc', 'knot-resolver')
7	-examples_dir = join_paths(doc_dir, 'examples')
8	+examples_dir = join_paths(prefix, 'share', 'examples', 'knot-resolver')
9	etc_dir = join_paths(prefix, get_option('sysconfdir'), 'knot-resolver')
10	lib_dir = join_paths(prefix, get_option('libdir'), 'knot-resolver')
11	modules_dir = join_paths(lib_dir, 'kres_modules')




[
{ type: install
  message: <<EOM

  Please consult the documentation:
   - man kresd
   - https://knot-resolver.readthedocs.io/

  To run as daemon see:
   - https://knot-resolver.readthedocs.io/en/latest/daemon.html

  If upgrading:
   - https://knot-resolver.readthedocs.io/en/latest/upgrading.html
EOM
}
]

Lines 1-4 Link Here

(-)dns/knot-resolver/pkg-descr (-2 / +8 lines)
1	The Knot DNS Resolver is a caching full resolver implementation,	1	Knot Resolver is a caching DNS resolver scalable from huge resolver
2	including both a resolver library and a daemon.	2	farms down to home network routers.
		3	Knot Resolver is a modern resolver implementation designed for
		4	scalability, resiliency, and flexibility. Its design is
		5	different from other resolvers: The core architecture is tiny and
		6	efficient, and most of the rich features are implemented as
		7	optional modules, which limits attack surface and improves
		8	performance.
3		9
4	WWW: https://www.knot-resolver.cz/	10	WWW: https://www.knot-resolver.cz/




@sample %%ETCDIR%%/kresd.conf
%%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
include/libkres/cdb_lmdb.h
include/libkres/defines.h
include/libkres/dnssec.h
include/libkres/impl.h
include/libkres/iterate.h
include/libkres/layer.h
include/libkres/lru.h
include/libkres/map.h
include/libkres/module.h
include/libkres/nsec.h
include/libkres/nsec3.h
include/libkres/nsrep.h
include/libkres/pack.h
include/libkres/queue.h
include/libkres/resolve.h
include/libkres/rplan.h
include/libkres/signature.h
include/libkres/ta.h
include/libkres/trie.h
include/libkres/utils.h
include/libkres/zonecut.h
lib/knot-resolver/ahocorasick.so
lib/knot-resolver/distro-preconfig.lua
lib/knot-resolver/kluautil.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/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.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/refuse_nord.so
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/watchdog.lua
lib/knot-resolver/kres_modules/workarounds.lua
lib/knot-resolver/postconfig.lua
lib/knot-resolver/sandbox.lua
lib/knot-resolver/trust_anchors.lua
lib/knot-resolver/upgrade-4-to-5.lua
lib/knot-resolver/zonefile.lua
lib/libkres.a
libdata/pkgconfig/libkres.pc
man/man8/kresd.8.gz
sbin/kres-cache-gc
sbin/kresc
sbin/kresd
@dir(%%USERS%%,%%GROUPS%%,0755) %%ETCDIR%%
@dir(%%USERS%%,%%GROUPS%%,0755) %%RUNDIR%%
%%PORTDOCS%%%%DOCSDIR%%/examples/config.internal
%%PORTDOCS%%%%DOCSDIR%%/examples/config.isp
%%PORTDOCS%%%%DOCSDIR%%/examples/config.personal
%%PORTDOCS%%%%DOCSDIR%%/examples/config.privacy
%%PORTDOCS%%%%DOCSDIR%%/examples/config.splitview

Return to bug 247699

Lines 1-131 Link Here

(-)dns/knot-resolver/Makefile (-56 / +83 lines)
1	# Created by: Leo Vandewoestijne <freebsd@dns.company>	1	# Created by: Leo Vandewoestijne <freebsd@dns.company>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= knot-resolver	4	PORTNAME= knot-resolver
5	DISTVERSION= 5.1.1	5	DISTVERSION= 5.1.2
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \	7	MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
8	https://dns.company/downloads/knot-resolver/	8	https://dns.company/downloads/knot-resolver/
9		9
10	MAINTAINER= freebsd@dns.company	10	MAINTAINER= freebsd@dns.company
11	COMMENT= Caching full resolver implementation	11	COMMENT= Caching full resolver implementation
12		12
13	LICENSE= GPLv3+	13	LICENSE= GPLv3+
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	BUILD_DEPENDS= bash:shells/bash \	16	BUILD_DEPENDS= bash:shells/bash \
17	cmocka>=1.1.1:sysutils/cmocka \
18	flake8:devel/py-flake8@${PY_FLAVOR} \	17	flake8:devel/py-flake8@${PY_FLAVOR} \
19	luacheck:devel/lua-luacheck	18	lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \
20		19	luacheck:devel/lua-luacheck \
21	LIB_DEPENDS= libgnutls.so:security/gnutls \	20	cmake:devel/cmake
22	libknot.so:dns/knot2-lib \	21
		22	LIB_DEPENDS= libknot.so:dns/knot2-lib \
		23	libdnssec.so:dns/knot2-lib \
		24	libzscanner.so:dns/knot2-lib \
		25	libgnutls.so:security/gnutls \
23	liblmdb.so:databases/lmdb \	26	liblmdb.so:databases/lmdb \
24	libluajit-5.1.so:lang/luajit-openresty \	27	libluajit-5.1.so:lang/luajit-openresty \
25	libuv.so:devel/libuv	28	libuv.so:devel/libuv
26		29
27	USES= compiler:c11 compiler:c++11-lang libedit libtool meson \	30	RUN_DEPENDS= lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \
28	ncurses ninja pkgconfig python shebangfix tar:xz	31
		32	USES= compiler:c11 compiler:c++11-lang libedit libtool \
		33	meson ncurses ninja pkgconfig python:3.5+,build \
		34	shebangfix tar:xz
		35
29	USE_CXXSTD= c++11	36	USE_CXXSTD= c++11
30	USE_LDCONFIG= yes
31	LDFLAGS+= -L${LOCALBASE}/lib
32		37
33	SUB_FILES= pkg-message	38	USE_RC_SUBR= krescachegc kresd
34		39
35	SHEBANG_FILES= scripts/bench.sh \	40	SHEBANG_FILES= scripts/bench.sh \
36	scripts/build-in-obs.sh \	41	scripts/build-in-obs.sh \
37	scripts/coverage_c_combine.sh \	42	scripts/coverage_c_combine.sh \
38	scripts/coverage_env.sh \	43	scripts/coverage_env.sh \
39	scripts/gen-cdefs.sh \	44	scripts/gen-cdefs.sh \
40	scripts/get-date.sh \	45	scripts/get-date.sh \
41	scripts/get-scanbuild-args.sh \	46	scripts/get-scanbuild-args.sh \
42	scripts/luacov_gen_empty.sh \	47	scripts/luacov_gen_empty.sh \
43	scripts/make-dev-archive.sh \	48	scripts/make-dev-archive.sh \
44	scripts/make-distrofiles.sh \	49	scripts/make-distrofiles.sh \
45	scripts/make-doc.sh \	50	scripts/make-doc.sh \
46	scripts/make-srpm.sh \	51	scripts/make-srpm.sh \
47	scripts/obs-build.sh \	52	scripts/obs-build.sh \
48	scripts/run-pylint.sh \	53	scripts/run-pylint.sh \
49	scripts/test-config.sh \	54	scripts/test-config.sh \
50	scripts/test-integration-prepare.sh \	55	scripts/test-integration-prepare.sh \
51	scripts/update-root-hints.sh	56	scripts/update-root-hints.sh
52		57
53	CONFLICTS= knot-1.* knot1-[0-6].*
54
55	MESON_ARGS= --buildtype=release \	58	MESON_ARGS= --buildtype=release \
56	--default-library=static \	59	--default-library=static \
		60	--libdir=${PREFIX}/lib \
		61	--pkg-config-path=${PREFIX}/libdata/pkgconfig \
57	--prefix=${LOCALBASE} \	62	--prefix=${LOCALBASE} \
58	-Duser=${USERS} \	63	-Duser=${USERS} \
59	-Dgroup=${GROUPS} \	64	-Dgroup=${GROUPS} \
60	-Dinstall_kresd_conf=enabled \	65	-Dinstall_kresd_conf=enabled \
61	-Dclient=enabled \	66	-Dclient=enabled \
62	-Dutils=enabled \	67	-Dutils=enabled \
63	-Dinstall_root_keys=enabled \
64	-Dkeyfile_default=${ETCDIR}/root.keys \	68	-Dkeyfile_default=${ETCDIR}/root.keys \
65	-Dmanaged_ta=enabled \	69	-Droot_hints=${ETCDIR}/root.hints
66	-Droot_hints=${ETCDIR}/root.hints \	70
67	-Dunit_tests=enabled	71	LDFLAGS+= -L${LOCALBASE}/lib
68		72
69	# --libdir=${PREFIX}/lib	73	CONFLICTS= knot-1.* knot1-[0-6].*
70	# --pkg-config-path=${PREFIX}/libdata/pkgconfig	74
71	# lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb	75	SUB_FILES= pkg-message
72	# -Dlmdb_CFLAGS=-I${PREFIX}/include \ # doesn't help	76
73	# -Dlmdb_LIBS=-llmdb # doesn't help	77	SUB_LIST= USERS=${USERS} \
74	# -Dconfig_tests=enabled \ # complains about missing cqueues lua package	78	GROUPS=${GROUPS} \
75	# -Dextra_tests=enabled \ # also requires -Dsendmmsg=disabled	79	RUNDIR=${RUNDIR}
76
77	OPTIONS_DEFINE= DOCS DNSTAP DOXYGEN TRUSTANCHOR
78	OPTIONS_DEFAULT= DOCS DNSTAP DOXYGEN
79
80	# docs/meson.build wants python2 or python3 - not -for example- python3.7
81	# So this currently is partially broken:
82	#DOCS_MESON_ON= -Ddoc=enabled
83
84	DNSTAP_DESC= dnstap support
85	DNSTAP_LIB_DEPENDS= libprotobuf.so:devel/protobuf \
86	libprotobuf-c.so:devel/protobuf-c \
87	libfstrm.so:devel/fstrm
88	DNSTAP_PLIST_FILES= lib/knot-resolver/kres_modules/dnstap.so
89	DNSTAP_MESON_ON= -Ddnstap=enabled
90	DNSTAP_MESON_OFF= -Ddnstap=disabled
91
92	DOXYGEN_IMPLIES= DOCS
93	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \
94	${PY_SPHINX} \
95	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
96
97	TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats
98	TRUSTANCHOR_USES= lua
99	TRUSTANCHOR_BUILD_DEPENDS= ${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket@${LUA_FLAVOR} \
100	${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec@${LUA_FLAVOR}
101
102	.include <bsd.port.options.mk>
103		80
104	USERS= kresd	81	USERS= kresd
105	GROUPS= ${USERS}	82	GROUPS= kresd
		83	RUNDIR= /var/run/kresd
		84
		85	PLIST_SUB= USERS=${USERS} \
		86	GROUPS=${GROUPS} \
		87	RUNDIR=${RUNDIR}
		88
		89	OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
		90	OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF
		91
		92	DNSTAP_DESC= dnstap support
		93	ROOTKEYS_DESC= install root.keys
		94	TESTCONF_DESC= Do config tests
		95	TESTEXTRA_DESC= Do extra tests
		96	TESTUNIT_DESC= Do unit tests
		97	TEST_DESC= Do tests
		98	TRUSTANCHOR_DESC= Trust anchor bootstrapping, management and stats
		99
		100	DNSTAP_LIB_DEPENDS= libprotobuf.so:devel/protobuf \
		101	libprotobuf-c.so:devel/protobuf-c \
		102	libfstrm.so:devel/fstrm
		103	DNSTAP_MESON_ON= -Ddnstap=enabled
		104	DNSTAP_MESON_OFF= -Ddnstap=disabled
		105	DNSTAP_PLIST_FILES= lib/knot-resolver/kres_modules/dnstap.so
		106
		107	ROOTKEYS_MESON_ON= -Dinstall_root_keys=enabled
		108	ROOTKEYS_MESON_OFF= -Dinstall_root_keys=disabled
		109	ROOTKEYS_PLIST_FILES= ${ETCDIR}/root.keys
		110
		111	TESTCONF_MESON_ON= -Dconfig_tests=enabled
		112	TESTCONF_MESON_OFF= -Dconfig_tests=disabled
		113
		114	TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt
		115	TESTEXTRA_BUILD_DEPENDS=git:devel/git
		116	TESTEXTRA_USES= cmake python:3
		117	TESTEXTRA_MESON_ON= -Dextra_tests=enabled \
		118	-Dsendmmsg=disabled
		119	TESTEXTRA_MESON_OFF= -Dextra_tests=disabled
		120
		121	TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka
		122	TESTUNIT_MESON_ON= -Dunit_tests=enabled
		123	TESTUNIT_MESON_OFF= -Dunit_tests=disabled
		124
		125	TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled
		126	TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled
106		127
107	PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md	128	PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md
		129	PORTEXAMPLES= config.cluster config.docker config.internal config.isp \
		130	config.personal config.privacy config.splitview
108		131
109	STRIP_TARGETS= sbin/kresd \	132	STRIP_TARGETS= sbin/kres-cache-gc \
110	sbin/kresc \	133	sbin/kresc \
		134	sbin/kresd \
111	lib/knot-resolver/ahocorasick.so \	135	lib/knot-resolver/ahocorasick.so \
112	lib/knot-resolver/kres_modules/bogus_log.so \	136	lib/knot-resolver/kres_modules/bogus_log.so \
113	lib/knot-resolver/kres_modules/dnstap.so \	137	lib/knot-resolver/kres_modules/dnstap.so \
114	lib/knot-resolver/kres_modules/edns_keepalive.so \	138	lib/knot-resolver/kres_modules/edns_keepalive.so \
115	lib/knot-resolver/kres_modules/hints.so \	139	lib/knot-resolver/kres_modules/hints.so \
116	lib/knot-resolver/kres_modules/lib/knot-resolver/kres_modules/nsid.so \	140	lib/knot-resolver/kres_modules/lib/knot-resolver/kres_modules/nsid.so \
117	lib/knot-resolver/kres_modules/refuse_nord.so \	141	lib/knot-resolver/kres_modules/refuse_nord.so \
118	lib/knot-resolver/kres_modules/stats.so	142	lib/knot-resolver/kres_modules/stats.so
119		143
		144	pre-install:
		145	${MKDIR} ${STAGEDIR}${DOCSDIR}
		146	${MKDIR} ${STAGEDIR}${RUNDIR}
		147
120	pre-install-TEST-on: do-test	148	pre-install-TEST-on: do-test
121		149
122	post-install:	150	post-install:
123	@${MKDIR} ${STAGEDIR}${DOCSDIR}
124	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/	151	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
125	.for STRIP_TGT in ${STRIP_TARGETS}	152	.for STRIP_TGT in ${STRIP_TARGETS}
126	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \	153	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
127	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \	154	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
128	fi	155	fi
129	.endfor	156	.endfor
130		157
131	.include <bsd.port.mk>	158	.include <bsd.port.mk>

Added Link Here

(-)dns/knot-resolver/files/krescachegc.in (+35 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: krescachegc
6	# REQUIRE: SERVERS cleanvar
7	# KEYWORD: shutdown
8	#
9	# Add the following lines to /etc/rc.conf to enable knot-resolver:
10	#
11	# krescachegc_enable="YES": Set to YES to enable krescachegc.
12	# Set to NO by default.
13	# krescachegc_millis="1000": Set to garbage collect interval in milliseconds
14	# Set to 1000 by default.
15	#
16
17	. /etc/rc.subr
18
19	name=krescachegc
20	rcvar=krescachegc_enable
21
22	load_rc_config ${name}
23
24	# set defaults
25
26	krescachegc_enable=${krescachegc_enable:-"NO"}
27	krescachegc_millis=${krescachegc_millis:-"1000"}
28
29	pidfile="%%RUNDIR%%/${name}.pid"
30	procname="%%PREFIX%%/sbin/kres-cache-gc"
31
32	command=/usr/sbin/daemon
33	command_args="-c -f -r -P ${pidfile} -u %%USERS%% -- ${procname} -c %%RUNDIR%% -d ${krescachegc_millis}"
34
35	run_rc_command "$1"

Added Link Here

(-)dns/knot-resolver/files/kresd.in (+37 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: kresd
6	# REQUIRE: NETWORKING
7	# BEFORE: SERVERS
8	# KEYWORD: shutdown
9	#
10	# Add the following lines to /etc/rc.conf to enable knot-resolver:
11	#
12	# kresd_enable="YES": Set to YES to enable kresd.
13	# Set to NO by default.
14	# kresd_config="": Set to %%ETCDIR%%/kresd.conf
15	# by default.
16	#
17
18	. /etc/rc.subr
19
20	name=kresd
21	rcvar=kresd_enable
22
23	load_rc_config ${name}
24
25	# set defaults
26
27	kresd_enable=${kresd_enable:-"NO"}
28	kresd_config=${kresd_config:-"%%ETCDIR%%/${name}.conf"}
29
30	pidfile="%%RUNDIR%%/${name}.pid"
31	procname="%%PREFIX%%/sbin/${name}"
32	required_files="${kresd_config}"
33
34	command="/usr/sbin/daemon"
35	command_args="-c -f -S -r -P ${pidfile} -- ${procname} -c ${kresd_config} -n -q %%RUNDIR%%"
36
37	run_rc_command "$1"

Added Link Here

(-)dns/knot-resolver/files/patch-etc_meson.build (+14 lines)
1	--- etc/meson.build.orig 2020-07-03 22:08:58.026241000 +0200
2	+++ etc/meson.build 2020-07-03 22:09:08.794204000 +0200
3	@@ -7,9 +7,9 @@
4	etc_files += 'root.hints'
5	endif
6
7	-if managed_ta
8	+#if managed_ta
9	etc_files += 'icann-ca.pem'
10	-endif
11	+#endif
12
13	if install_root_keys
14	root_keys_path = keyfile_default.split('/')

Lines 1-16 Link Here

(-)dns/knot-resolver/files/pkg-message.in (-4 / +1 lines)
1	[	1	[
2	{ type: install	2	{ type: install
3	message: <<EOM	3	message: <<EOM
4		4
5	Please consult the documentation:	5	Please consult the documentation:
6	- man kresd	6	- man kresd
7	- https://knot-resolver.readthedocs.io/	7	- https://knot-resolver.readthedocs.io/
8		8
9	To run as daemon see:
10	- https://knot-resolver.readthedocs.io/en/latest/daemon.html
11
12	If upgrading:	9	If upgrading:
13	- https://knot-resolver.readthedocs.io/en/stable/upgrading.html	10	- https://knot-resolver.readthedocs.io/en/latest/upgrading.html
14	EOM	11	EOM
15	}	12	}
16	]	13	]

Lines 1-100 Link Here

(-)dns/knot-resolver/pkg-plist (-9 / +3 lines)
		1	@sample %%ETCDIR%%/kresd.conf
1	%%ETCDIR%%/icann-ca.pem	2	%%ETCDIR%%/icann-ca.pem
2	%%ETCDIR%%/kresd.conf
3	%%ETCDIR%%/root.hints	3	%%ETCDIR%%/root.hints
4	%%ETCDIR%%/root.keys
5	include/libkres/api.h	4	include/libkres/api.h
6	include/libkres/array.h	5	include/libkres/array.h
7	include/libkres/cdb_api.h	6	include/libkres/cdb_api.h
8	include/libkres/cdb_lmdb.h	7	include/libkres/cdb_lmdb.h
9	include/libkres/defines.h	8	include/libkres/defines.h
10	include/libkres/dnssec.h	9	include/libkres/dnssec.h
11	include/libkres/impl.h	10	include/libkres/impl.h
12	include/libkres/iterate.h	11	include/libkres/iterate.h
13	include/libkres/layer.h	12	include/libkres/layer.h
14	include/libkres/lru.h	13	include/libkres/lru.h
15	include/libkres/map.h	14	include/libkres/map.h
16	include/libkres/module.h	15	include/libkres/module.h
17	include/libkres/nsec.h	16	include/libkres/nsec.h
18	include/libkres/nsec3.h	17	include/libkres/nsec3.h
19	include/libkres/nsrep.h	18	include/libkres/nsrep.h
20	include/libkres/pack.h	19	include/libkres/pack.h
21	include/libkres/queue.h	20	include/libkres/queue.h
22	include/libkres/resolve.h	21	include/libkres/resolve.h
23	include/libkres/rplan.h	22	include/libkres/rplan.h
24	include/libkres/signature.h	23	include/libkres/signature.h
25	include/libkres/ta.h	24	include/libkres/ta.h
26	include/libkres/trie.h	25	include/libkres/trie.h
27	include/libkres/utils.h	26	include/libkres/utils.h
28	include/libkres/zonecut.h	27	include/libkres/zonecut.h
29	lib/knot-resolver/ahocorasick.so	28	lib/knot-resolver/ahocorasick.so
30	lib/knot-resolver/distro-preconfig.lua	29	lib/knot-resolver/distro-preconfig.lua
31	lib/knot-resolver/kluautil.lua	30	lib/knot-resolver/kluautil.lua
32	lib/knot-resolver/kres-gen.lua	31	lib/knot-resolver/kres-gen.lua
33	lib/knot-resolver/kres.lua	32	lib/knot-resolver/kres.lua
34	lib/knot-resolver/kres_modules/bogus_log.so	33	lib/knot-resolver/kres_modules/bogus_log.so
35	lib/knot-resolver/kres_modules/daf.lua	34	lib/knot-resolver/kres_modules/daf.lua
36	lib/knot-resolver/kres_modules/daf/daf.js	35	lib/knot-resolver/kres_modules/daf/daf.js
37	lib/knot-resolver/kres_modules/detect_time_jump.lua	36	lib/knot-resolver/kres_modules/detect_time_jump.lua
38	lib/knot-resolver/kres_modules/detect_time_skew.lua	37	lib/knot-resolver/kres_modules/detect_time_skew.lua
39	lib/knot-resolver/kres_modules/dns64.lua	38	lib/knot-resolver/kres_modules/dns64.lua
40	lib/knot-resolver/kres_modules/edns_keepalive.so	39	lib/knot-resolver/kres_modules/edns_keepalive.so
41	lib/knot-resolver/kres_modules/etcd.lua	40	lib/knot-resolver/kres_modules/etcd.lua
42	lib/knot-resolver/kres_modules/experimental_dot_auth.lua	41	lib/knot-resolver/kres_modules/experimental_dot_auth.lua
43	lib/knot-resolver/kres_modules/graphite.lua	42	lib/knot-resolver/kres_modules/graphite.lua
44	lib/knot-resolver/kres_modules/hints.so	43	lib/knot-resolver/kres_modules/hints.so
45	lib/knot-resolver/kres_modules/http.lua	44	lib/knot-resolver/kres_modules/http.lua
46	lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css	45	lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css
47	lib/knot-resolver/kres_modules/http/bootstrap.min.css	46	lib/knot-resolver/kres_modules/http/bootstrap.min.css
48	lib/knot-resolver/kres_modules/http/bootstrap.min.js	47	lib/knot-resolver/kres_modules/http/bootstrap.min.js
49	lib/knot-resolver/kres_modules/http/d3.js	48	lib/knot-resolver/kres_modules/http/d3.js
50	lib/knot-resolver/kres_modules/http/datamaps.world.min.js	49	lib/knot-resolver/kres_modules/http/datamaps.world.min.js
51	lib/knot-resolver/kres_modules/http/dygraph.min.js	50	lib/knot-resolver/kres_modules/http/dygraph.min.js
52	lib/knot-resolver/kres_modules/http/epoch.css	51	lib/knot-resolver/kres_modules/http/epoch.css
53	lib/knot-resolver/kres_modules/http/epoch.js	52	lib/knot-resolver/kres_modules/http/epoch.js
54	lib/knot-resolver/kres_modules/http/favicon.ico	53	lib/knot-resolver/kres_modules/http/favicon.ico
55	lib/knot-resolver/kres_modules/http/glyphicons-halflings-regular.woff2	54	lib/knot-resolver/kres_modules/http/glyphicons-halflings-regular.woff2
56	lib/knot-resolver/kres_modules/http/jquery.js	55	lib/knot-resolver/kres_modules/http/jquery.js
57	lib/knot-resolver/kres_modules/http/kresd.css	56	lib/knot-resolver/kres_modules/http/kresd.css
58	lib/knot-resolver/kres_modules/http/kresd.js	57	lib/knot-resolver/kres_modules/http/kresd.js
59	lib/knot-resolver/kres_modules/http/main.tpl	58	lib/knot-resolver/kres_modules/http/main.tpl
60	lib/knot-resolver/kres_modules/http/selectize.bootstrap3.css	59	lib/knot-resolver/kres_modules/http/selectize.bootstrap3.css
61	lib/knot-resolver/kres_modules/http/selectize.min.js	60	lib/knot-resolver/kres_modules/http/selectize.min.js
62	lib/knot-resolver/kres_modules/http/topojson.js	61	lib/knot-resolver/kres_modules/http/topojson.js
63	lib/knot-resolver/kres_modules/http_doh.lua	62	lib/knot-resolver/kres_modules/http_doh.lua
64	lib/knot-resolver/kres_modules/http_tls_cert.lua	63	lib/knot-resolver/kres_modules/http_tls_cert.lua
65	lib/knot-resolver/kres_modules/http_trace.lua	64	lib/knot-resolver/kres_modules/http_trace.lua
66	lib/knot-resolver/kres_modules/nsid.so	65	lib/knot-resolver/kres_modules/nsid.so
67	lib/knot-resolver/kres_modules/policy.lua	66	lib/knot-resolver/kres_modules/policy.lua
68	lib/knot-resolver/kres_modules/predict.lua	67	lib/knot-resolver/kres_modules/predict.lua
69	lib/knot-resolver/kres_modules/prefill.lua	68	lib/knot-resolver/kres_modules/prefill.lua
70	lib/knot-resolver/kres_modules/priming.lua	69	lib/knot-resolver/kres_modules/priming.lua
71	lib/knot-resolver/kres_modules/prometheus.lua	70	lib/knot-resolver/kres_modules/prometheus.lua
72	lib/knot-resolver/kres_modules/rebinding.lua	71	lib/knot-resolver/kres_modules/rebinding.lua
73	lib/knot-resolver/kres_modules/refuse_nord.so	72	lib/knot-resolver/kres_modules/refuse_nord.so
74	lib/knot-resolver/kres_modules/renumber.lua	73	lib/knot-resolver/kres_modules/renumber.lua
75	lib/knot-resolver/kres_modules/serve_stale.lua	74	lib/knot-resolver/kres_modules/serve_stale.lua
76	lib/knot-resolver/kres_modules/stats.so	75	lib/knot-resolver/kres_modules/stats.so
77	lib/knot-resolver/kres_modules/ta_sentinel.lua	76	lib/knot-resolver/kres_modules/ta_sentinel.lua
78	lib/knot-resolver/kres_modules/ta_signal_query.lua	77	lib/knot-resolver/kres_modules/ta_signal_query.lua
79	lib/knot-resolver/kres_modules/ta_update.lua	78	lib/knot-resolver/kres_modules/ta_update.lua
80	lib/knot-resolver/kres_modules/view.lua	79	lib/knot-resolver/kres_modules/view.lua
81	lib/knot-resolver/kres_modules/watchdog.lua	80	lib/knot-resolver/kres_modules/watchdog.lua
82	lib/knot-resolver/kres_modules/workarounds.lua	81	lib/knot-resolver/kres_modules/workarounds.lua
83	lib/knot-resolver/postconfig.lua	82	lib/knot-resolver/postconfig.lua
84	lib/knot-resolver/sandbox.lua	83	lib/knot-resolver/sandbox.lua
85	lib/knot-resolver/trust_anchors.lua	84	lib/knot-resolver/trust_anchors.lua
86	lib/knot-resolver/upgrade-4-to-5.lua	85	lib/knot-resolver/upgrade-4-to-5.lua
87	lib/knot-resolver/zonefile.lua	86	lib/knot-resolver/zonefile.lua
88	lib/libkres.a	87	lib/libkres.a
89	libdata/pkgconfig/libkres.pc	88	libdata/pkgconfig/libkres.pc
90	man/man8/kresd.8.gz	89	man/man8/kresd.8.gz
91	sbin/kres-cache-gc	90	sbin/kres-cache-gc
92	sbin/kresc	91	sbin/kresc
93	sbin/kresd	92	sbin/kresd
94	%%PORTDOCS%%%%DOCSDIR%%/examples/config.cluster	93	@dir(%%USERS%%,%%GROUPS%%,0755) %%ETCDIR%%
95	%%PORTDOCS%%%%DOCSDIR%%/examples/config.docker	94	@dir(%%USERS%%,%%GROUPS%%,0755) %%RUNDIR%%
96	%%PORTDOCS%%%%DOCSDIR%%/examples/config.internal
97	%%PORTDOCS%%%%DOCSDIR%%/examples/config.isp
98	%%PORTDOCS%%%%DOCSDIR%%/examples/config.personal
99	%%PORTDOCS%%%%DOCSDIR%%/examples/config.privacy
100	%%PORTDOCS%%%%DOCSDIR%%/examples/config.splitview