Attachment #226234 for bug #256221




               --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=${KRESD_GROUP} \
               RUNDIR=${KRESD_RUNDIR} \
               USERS=${KRESD_USER}

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 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"

Return to bug 256221

Lines 59-65 MESON_ARGS= --buildtype=release \ Link Here

(-)b/dns/knot-resolver/Makefile (-15 / +19 lines)
59	--pkg-config-path=${PREFIX}/libdata/pkgconfig \	59	--pkg-config-path=${PREFIX}/libdata/pkgconfig \
60	--prefix=${LOCALBASE} \	60	--prefix=${LOCALBASE} \
61	-Dclient=enabled \	61	-Dclient=enabled \
62	-Duser=${USERS} \
63	-Dgroup=${GROUPS} \	62	-Dgroup=${GROUPS} \
64	-Dinstall_kresd_conf=enabled \	63	-Dinstall_kresd_conf=enabled \
65	-Dkeyfile_default=${ETCDIR}/root.keys \	64	-Dkeyfile_default=${ETCDIR}/root.keys \
Lines 73-89 CONFLICTS= knot-1.* knot1-[0-6].* Link Here
73		72
74	SUB_FILES= pkg-message	73	SUB_FILES= pkg-message
75		74
76	SUB_LIST= USERS=${USERS} \	75	KRESD_USER= kresd
77	GROUPS=${GROUPS} \	76	KRESD_GROUP= kresd
78	RUNDIR=${RUNDIR}	77	KRESD_RUNDIR= /var/run/kresd
		78
		79	SUB_LIST= GROUPS=${KRESD_GROUP} \
		80	RUNDIR=${KRESD_RUNDIR} \
		81	USERS=${KRESD_USER}
		82
		83	USERS= ${KRESD_USER}
		84	GROUPS= ${KRESD_GROUP}
		85	RUNDIR= ${KRESD_RUNDIR}
79		86
80	USERS= kresd	87	PLIST_SUB= GROUPS=${GROUPS} \
81	GROUPS= kresd	88	RUNDIR=${RUNDIR} \
82	RUNDIR= /var/run/kresd	89	USERS=$USERS}
83		90
84	PLIST_SUB= USERS=${USERS} \	91	PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md
85	GROUPS=${GROUPS} \	92	PORTEXAMPLES= config.cluster config.docker config.internal config.isp \
86	RUNDIR=${RUNDIR}	93	config.personal config.privacy config.splitview
87		94
88	OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA	95	OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
89	OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT	96	OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT
Lines 114-120 TESTCONF_MESON_OFF= -Dconfig_tests=disabled Link Here
114	TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt	121	TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt
115	TESTEXTRA_BUILD_DEPENDS= git:devel/git	122	TESTEXTRA_BUILD_DEPENDS= git:devel/git
116	TESTEXTRA_USES= cmake python:3	123	TESTEXTRA_USES= cmake python:3
117	TESTEXTRA_MESON_ON= -Dextra_tests=enabled -Dsendmmsg=disabled	124	TESTEXTRA_MESON_ON= -Dextra_tests=enabled \
		125	-Dsendmmsg=disabled
118	TESTEXTRA_MESON_OFF= -Dextra_tests=disabled	126	TESTEXTRA_MESON_OFF= -Dextra_tests=disabled
119		127
120	TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka	128	TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka
Lines 124-133 TESTUNIT_MESON_OFF= -Dunit_tests=disabled Link Here
124	TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled	132	TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled
125	TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled	133	TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled
126		134
127	PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md
128	PORTEXAMPLES= config.cluster config.docker config.internal config.isp \
129	config.personal config.privacy config.splitview
130
131	STRIP_TARGETS= sbin/kres-cache-gc \	135	STRIP_TARGETS= sbin/kres-cache-gc \
132	sbin/kresc \	136	sbin/kresc \
133	sbin/kresd \	137	sbin/kresd \