Attachment #226904 for bug #257553




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

PORTNAME=	knot-resolver
DISTVERSION=	5.4.0
PORTREVISION=	1
CATEGORIES=	dns
MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \

		scripts/coverage_c_combine.sh \
		scripts/coverage_env.sh \
		scripts/gen-cdefs.sh \
		scripts/gen-pgp-keyblock.sh \
		scripts/get-date.sh \
		scripts/luacov_gen_empty.sh \
		scripts/make-archive.sh \
		scripts/make-distrofiles.sh \
		scripts/make-doc.sh \
		scripts/make-obs.sh \
		scripts/obs-build.sh \
		scripts/run-pylint.sh \
		scripts/run-scanbuild-with-args.sh \
		scripts/test-config.sh \
		scripts/test-integration-prepare.sh \
		scripts/update-authors.sh \
		scripts/update-root-hints.sh

MESON_ARGS=	--buildtype=release \

		--pkg-config-path=${PREFIX}/libdata/pkgconfig \
		--prefix=${LOCALBASE} \
		-Dclient=enabled \
		-Duser=${USERS} \
		-Dgroup=${GROUPS} \
		-Dinstall_kresd_conf=enabled \
		-Dkeyfile_default=${ETCDIR}/root.keys \


SUB_FILES=	pkg-message

KRESD_USER=	kresd
KRESD_GROUP=	kresd
KRESD_RUNDIR=	/var/run/kresd

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

USERS=		${KRESD_USER}
GROUPS=		${KRESD_GROUP}
RUNDIR=		${KRESD_RUNDIR}

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

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

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

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

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 \

Lines 1-3 Link Here

(-)b/dns/knot-resolver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1614684836	1	TIMESTAMP = 1627893046
2	SHA256 (knot-resolver-5.3.0.tar.xz) = fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e	2	SHA256 (knot-resolver-5.4.0.tar.xz) = 534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
3	SIZE (knot-resolver-5.3.0.tar.xz) = 1865456	3	SIZE (knot-resolver-5.4.0.tar.xz) = 1894392

Lines 20-26 rcvar=krescachegc_enable Link Here

(-)b/dns/knot-resolver/files/krescachegc.in (-2 / +1 lines)
20	load_rc_config ${name}	20	load_rc_config ${name}
21		21
22	# set defaults	22	# set defaults
23
24	krescachegc_enable=${krescachegc_enable:-"NO"}	23	krescachegc_enable=${krescachegc_enable:-"NO"}
25	krescachegc_millis=${krescachegc_millis:-"1000"}	24	krescachegc_millis=${krescachegc_millis:-"1000"}
26		25
Lines 28-33 pidfile="%%RUNDIR%%/${name}.pid" Link Here
28	procname="%%PREFIX%%/sbin/kres-cache-gc"	27	procname="%%PREFIX%%/sbin/kres-cache-gc"
29		28
30	command=/usr/sbin/daemon	29	command=/usr/sbin/daemon
31	command_args="-c -f -r -P ${pidfile} -u %%USERS%% -- ${procname} -c %%RUNDIR%% -d ${krescachegc_millis}"	30	command_args="-c -f -S -r -P ${pidfile} -T ${name} -u %%USERS%% -- ${procname} -d ${krescachegc_millis}"
32		31
33	run_rc_command "$1"	32	run_rc_command "$1"

Lines 21-35 rcvar=kresd_enable Link Here

(-)b/dns/knot-resolver/files/kresd.in (-3 / +33 lines)
21	load_rc_config ${name}	21	load_rc_config ${name}
22		22
23	# set defaults	23	# set defaults
24
25	kresd_enable=${kresd_enable:-"NO"}	24	kresd_enable=${kresd_enable:-"NO"}
26	kresd_config=${kresd_config:-"%%ETCDIR%%/${name}.conf"}	25	kresd_config=${kresd_config:-"%%ETCDIR%%/${name}.conf"}
		26	kresd_user="%%USERS%%"
		27	kresd_group="%%GROUPS%%"
		28	kresd_rundir="/var/run/${name}"
27		29
28	pidfile="%%RUNDIR%%/${name}.pid"	30	pidfile="${kresd_rundir}/${name}.pid"
29	procname="%%PREFIX%%/sbin/${name}"	31	procname="%%PREFIX%%/sbin/${name}"
30	required_files="${kresd_config}"	32	required_files="${kresd_config}"
31		33
		34	start_cmd="${name}_start"
		35	stop_cmd="${name}_stop"
		36
32	command="/usr/sbin/daemon"	37	command="/usr/sbin/daemon"
33	command_args="-c -f -S -r -P ${pidfile} -- ${procname} -c ${kresd_config} -n -q %%RUNDIR%%"	38	command_args="-c -f -S -r -P ${pidfile} -T ${name} -- ${procname} -c ${kresd_config} -n -q ${kresd_rundir}"
		39
		40	kresd_start() {
		41	if [ ! -d /var/run/${name} ]; then
		42	install -d -o ${kresd_user} -g ${kresd_group} -m 700 ${kresd_rundir}
		43	fi
		44	if [ ! -f "${pidfile}" ]; then
		45	echo "starting ${name}..." && \
		46	${command} ${command_args}
		47	echo -e "\e[1A\e[K${name} started."
		48	else
		49	echo "${name} already seems to be running."
		50	fi
		51	}
		52
		53	kresd_stop() {
		54	if [ -f "${pidfile}" ]; then
		55	echo "stopping ${name}..." && \
		56	for pid in `ps waux \| grep ${procname} \| grep daemon \| awk '{print $2}'`; do \
		57	kill -TERM $pid
		58	done
		59	echo -e "\e[1A\e[K${name} stopped."
		60	else
		61	echo "${name} seems to be not running."
		62	fi
		63	}
34		64
35	run_rc_command "$1"	65	run_rc_command "$1"

Lines 10-15 include/libkres/dnssec.h Link Here

(-)b/dns/knot-resolver/pkg-plist (+1 lines)
10	include/libkres/impl.h	10	include/libkres/impl.h
11	include/libkres/iterate.h	11	include/libkres/iterate.h
12	include/libkres/layer.h	12	include/libkres/layer.h
		13	include/libkres/log.h
13	include/libkres/lru.h	14	include/libkres/lru.h
14	include/libkres/map.h	15	include/libkres/map.h
15	include/libkres/module.h	16	include/libkres/module.h

Return to bug 257553

Lines 1-7 Link Here

(-)b/dns/knot-resolver/Makefile (-20 / +25 lines)
1	# Created by: Leo Vandewoestijne <freebsd@dns.company>	1	# Created by: Leo Vandewoestijne <freebsd@dns.company>
2		2
3	PORTNAME= knot-resolver	3	PORTNAME= knot-resolver
4	DISTVERSION= 5.3.0	4	DISTVERSION= 5.4.0
5	PORTREVISION= 1	5	PORTREVISION= 1
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/ \
Lines 42-57 SHEBANG_FILES= scripts/bench.sh \ Link Here
42	scripts/coverage_c_combine.sh \	42	scripts/coverage_c_combine.sh \
43	scripts/coverage_env.sh \	43	scripts/coverage_env.sh \
44	scripts/gen-cdefs.sh \	44	scripts/gen-cdefs.sh \
		45	scripts/gen-pgp-keyblock.sh \
45	scripts/get-date.sh \	46	scripts/get-date.sh \
46	scripts/luacov_gen_empty.sh \	47	scripts/luacov_gen_empty.sh \
47	scripts/make-dev-archive.sh \	48	scripts/make-archive.sh \
48	scripts/make-distrofiles.sh \
49	scripts/make-doc.sh \	49	scripts/make-doc.sh \
50	scripts/make-srpm.sh \	50	scripts/make-obs.sh \
51	scripts/obs-build.sh \
52	scripts/run-pylint.sh \	51	scripts/run-pylint.sh \
		52	scripts/run-scanbuild-with-args.sh \
53	scripts/test-config.sh \	53	scripts/test-config.sh \
54	scripts/test-integration-prepare.sh \	54	scripts/test-integration-prepare.sh \
		55	scripts/update-authors.sh \
55	scripts/update-root-hints.sh	56	scripts/update-root-hints.sh
56		57
57	MESON_ARGS= --buildtype=release \	58	MESON_ARGS= --buildtype=release \
Lines 60-66 MESON_ARGS= --buildtype=release \ Link Here
60	--pkg-config-path=${PREFIX}/libdata/pkgconfig \	61	--pkg-config-path=${PREFIX}/libdata/pkgconfig \
61	--prefix=${LOCALBASE} \	62	--prefix=${LOCALBASE} \
62	-Dclient=enabled \	63	-Dclient=enabled \
63	-Duser=${USERS} \
64	-Dgroup=${GROUPS} \	64	-Dgroup=${GROUPS} \
65	-Dinstall_kresd_conf=enabled \	65	-Dinstall_kresd_conf=enabled \
66	-Dkeyfile_default=${ETCDIR}/root.keys \	66	-Dkeyfile_default=${ETCDIR}/root.keys \
Lines 74-90 CONFLICTS= knot-1.* knot1-[0-6].* Link Here
74		74
75	SUB_FILES= pkg-message	75	SUB_FILES= pkg-message
76		76
77	SUB_LIST= USERS=${USERS} \	77	KRESD_USER= kresd
78	GROUPS=${GROUPS} \	78	KRESD_GROUP= kresd
79	RUNDIR=${RUNDIR}	79	KRESD_RUNDIR= /var/run/kresd
		80
		81	SUB_LIST= GROUPS=${GROUPS} \
		82	RUNDIR=${RUNDIR} \
		83	USERS=${USERS}
		84
		85	USERS= ${KRESD_USER}
		86	GROUPS= ${KRESD_GROUP}
		87	RUNDIR= ${KRESD_RUNDIR}
80		88
81	USERS= kresd	89	PLIST_SUB= GROUPS=${GROUPS} \
82	GROUPS= kresd	90	RUNDIR=${RUNDIR} \
83	RUNDIR= /var/run/kresd	91	USERS=${USERS}
84		92
85	PLIST_SUB= USERS=${USERS} \	93	PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md
86	GROUPS=${GROUPS} \	94	PORTEXAMPLES= config.cluster config.docker config.internal config.isp \
87	RUNDIR=${RUNDIR}	95	config.personal config.privacy config.splitview
88		96
89	OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA	97	OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
90	OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT	98	OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT
Lines 115-121 TESTCONF_MESON_OFF= -Dconfig_tests=disabled Link Here
115	TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt	123	TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt
116	TESTEXTRA_BUILD_DEPENDS= git:devel/git	124	TESTEXTRA_BUILD_DEPENDS= git:devel/git
117	TESTEXTRA_USES= cmake python:3	125	TESTEXTRA_USES= cmake python:3
118	TESTEXTRA_MESON_ON= -Dextra_tests=enabled -Dsendmmsg=disabled	126	TESTEXTRA_MESON_ON= -Dextra_tests=enabled \
		127	-Dsendmmsg=disabled
119	TESTEXTRA_MESON_OFF= -Dextra_tests=disabled	128	TESTEXTRA_MESON_OFF= -Dextra_tests=disabled
120		129
121	TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka	130	TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka
Lines 125-134 TESTUNIT_MESON_OFF= -Dunit_tests=disabled Link Here
125	TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled	134	TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled
126	TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled	135	TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled
127		136
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
131
132	STRIP_TARGETS= sbin/kres-cache-gc \	137	STRIP_TARGETS= sbin/kres-cache-gc \
133	sbin/kresc \	138	sbin/kresc \
134	sbin/kresd \	139	sbin/kresd \