Attachment #139006 for bug #185163

View | Details | Raw Unified | Return to bug 185163
Collapse All | Expand All

Lines 179-184 Link Here

(-)UIDs (+1 lines)
179	redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin	179	redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin
180	_flowd:*:542:542::0:0:flowd privilege separation user:/var/empty:/usr/sbin/nologin	180	_flowd:*:542:542::0:0:flowd privilege separation user:/var/empty:/usr/sbin/nologin
181	ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh	181	ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
		182	knot:*:553:553::0:0:Knot DNS:/nonexistent:/usr/sbin/nologin
182	qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin	183	qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin
183	ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh	184	ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh
184	messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin	185	messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin

Lines 171-176 Link Here

(-)GIDs (+1 lines)
171	redis:*:535:	171	redis:*:535:
172	_flowd:*:542:	172	_flowd:*:542:
173	ejabberd:*:543:	173	ejabberd:*:543:
		174	knot:*:553:
174	qtss:*:554:	175	qtss:*:554:
175	ircdru:*:555:	176	ircdru:*:555:
176	messagebus:*:556:	177	messagebus:*:556:

Lines 2-8 Link Here

(-)dns/knot/Makefile (-5 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= knot	4	PORTNAME= knot
5	DISTVERSION= 1.3.3	5	DISTVERSION= 1.3.4
6	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
7	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \	7	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
8	http://dns-lab.com/downloads/knot-dns/	8	http://dns-lab.com/downloads/knot-dns/
Lines 22-41 Link Here
22	USE_OPENSSL= yes	22	USE_OPENSSL= yes
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24		24
		25	CONFIGURE_ARGS+=--with-storage=/var/db/knot
		26	CONFIGURE_ARGS+=--with-rundir=/var/run/knot
		27
25	SUB_FILES= pkg-message	28	SUB_FILES= pkg-message
26		29
27	USE_RC_SUBR= ${PORTNAME}d	30	USE_RC_SUBR= ${PORTNAME}
28		31
29	INFO= knot	32	INFO= knot
30		33
31	PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS	34	PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
32		35
33	OPTIONS_DEFINE= DOCS	36	USERS= knot
		37	GROUPS= knot
34		38
		39	SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}"
		40
35	post-install:	41	post-install:
36	@${MKDIR} ${STAGEDIR}${ETCDIR}	42	${MKDIR} ${STAGEDIR}${ETCDIR}
37	${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}	43	${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
38	@${MKDIR} ${STAGEDIR}${DOCSDIR}	44	${MKDIR} ${STAGEDIR}${DOCSDIR}
39	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/	45	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
40		46
41	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)dns/knot/distinfo (-2 / +2 lines)
1	SHA256 (knot-1.3.3.tar.gz) = 70f5237871a92cd8a777c73b80b6ac339212ea084d4adfaf314388be704027b4	1	SHA256 (knot-1.3.4.tar.gz) = 0e15fb93de9eb2b8cb5d25c2239566462858125cb1b8455fc744835589212399
2	SIZE (knot-1.3.3.tar.gz) = 1148233	2	SIZE (knot-1.3.4.tar.gz) = 1208147




name=knot
rcvar=knot_enable

extra_commands="reload"
reload_cmd="${name}_reload"
status_cmd="${name}_status"
stop_cmd="${name}_stop"

load_rc_config ${name}

: ${knot_enable:=NO}
: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}

command=%%PREFIX%%/sbin/knotd
command_args="-c ${knot_config} -d"
control=%%PREFIX%%/sbin/knotc
pidfile=/var/run/knot/knot.pid

command_args="-c ${knot_config} -w start"
required_files=${knot_config}

extra_commands=reload
reload_cmd="${name}_reload"
start_precmd="${name}_prestart"

knot_prestart()
{
	if [ ! -d /var/run/knot ]; then
		install -d -o %%USERS%% -g %%GROUPS%% /var/run/knot
	fi
	
	if [ ! -d /var/db/knot ]; then
		install -d -o %%USERS%% -g %%GROUPS%% /var/db/knot
	fi

	${control} -c ${knot_config} checkconf
}

knot_reload()
{
	echo "Reloading ${name}."
	${control} -c ${knot_config} reload
}
knot_status() {
	${command} -c ${knot_config} status
	}
knot_stop() {
	echo "Stopping ${name}."
	${command} -c ${knot_config} stop
	}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: knot
# REQUIRE: SERVERS cleanvar
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable knot:
#
# knot_enable="YES":	Set to NO by default.
#			Set it to YES to enable knot.
# knot_config="":	Set to %%PREFIX%%/etc/knot/knot.conf
#			by default.

. /etc/rc.subr

name=knot
rcvar=knot_enable

extra_commands="reload"
reload_cmd="${name}_reload"
status_cmd="${name}_status"
stop_cmd="${name}_stop"

load_rc_config ${name}

: ${knot_enable:="NO"}
: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}

command=%%PREFIX%%/sbin/${name}c
procname=%%PREFIX%%/sbin/${name}d
pidfile=/var/run/${name}.pid

command_args="-c ${knot_config} -w start"
required_files=${knot_config}

knot_reload() {
	echo "Reloading ${name}."
	${command} -c ${knot_config} reload
	}
knot_status() {
	${command} -c ${knot_config} status
	}
knot_stop() {
	echo "Stopping ${name}."
	${command} -c ${knot_config} stop
	}

run_rc_command "$1"

Line 0 Link Here

(-)dns/knot/files/patch-src-Makefile.in (+11 lines)
	1	--- src/Makefile.in.orig 2013-12-24 09:39:02.671817934 -0600
	2	+++ src/Makefile.in 2013-12-24 09:39:11.577816555 -0600
	3	@@ -1979,8 +1979,6 @@
	4	# Create storage and run-time directories
	5	install-data-hook:
	6	$(INSTALL) -d $(DESTDIR)/@config_dir@
	7	- $(INSTALL) -d $(DESTDIR)/@run_dir@
	8	- $(INSTALL) -d $(DESTDIR)/@storage_dir@
	9
	10	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	11	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 17-23 Link Here

(-)dns/knot/files/pkg-message.in (-1 / +1 lines)
17	#	17	#
18	# ----- startup ----------------------------------------------------	18	# ----- startup ----------------------------------------------------
19	#	19	#
20	%%PREFIX%%/etc/rc.d/knotd start	20	%%PREFIX%%/etc/rc.d/knot start
21	#	21	#
22	####################################################################	22	####################################################################
23		23

Lines 1-4 Link Here

(-)dns/knot/pkg-plist (-6 / +1 lines)
1	@unexec if cmp -s %B/knot.sample.conf %B/knot.conf; then rm -f %B/knot.conf; fi	1	@unexec if cmp -s %D/%%ETCDIR%%/knot.sample.conf %D/%%ETCDIR%%/knot.conf; then rm -f %D/%%ETCDIR%%/knot.conf; fi
2	%%ETCDIR%%/knot.sample.conf	2	%%ETCDIR%%/knot.sample.conf
3	@exec [ -f %B/knot.conf ] \|\| cp %B/%f %B/knot.conf	3	@exec [ -f %B/knot.conf ] \|\| cp %B/%f %B/knot.conf
4	%%ETCDIR%%/example.com.zone	4	%%ETCDIR%%/example.com.zone
Lines 9-19 Link Here
9	man/man8/knotc.8.gz	9	man/man8/knotc.8.gz
10	man/man8/knotd.8.gz	10	man/man8/knotd.8.gz
11	@dirrmtry %%ETCDIR%%	11	@dirrmtry %%ETCDIR%%
12	@dirrmtry var/run/knot
13	@dirrmtry var/run
14	@dirrmtry var/lib/knot
15	@dirrmtry var/lib
16	@dirrmtry var
17	bin/kdig	12	bin/kdig
18	bin/khost	13	bin/khost
19	bin/knsupdate	14	bin/knsupdate

Return to bug 185163

Lines 18-50 Link Here

(-)dns/knot/files/knot.in (-20 / +26 lines)
18	name=knot	18	name=knot
19	rcvar=knot_enable	19	rcvar=knot_enable
20		20
21	extra_commands="reload"
22	reload_cmd="${name}_reload"
23	status_cmd="${name}_status"
24	stop_cmd="${name}_stop"
25
26	load_rc_config ${name}	21	load_rc_config ${name}
27		22
28	: ${knot_enable:="NO"}	23	: ${knot_enable:=NO}
29	: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}	24	: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
30		25
31	command=%%PREFIX%%/sbin/${name}c	26	command=%%PREFIX%%/sbin/knotd
32	procname=%%PREFIX%%/sbin/${name}d	27	command_args="-c ${knot_config} -d"
33	pidfile=/var/run/${name}.pid	28	control=%%PREFIX%%/sbin/knotc
		29	pidfile=/var/run/knot/knot.pid
34		30
35	command_args="-c ${knot_config} -w start"
36	required_files=${knot_config}	31	required_files=${knot_config}
37		32
38	knot_reload() {	33	extra_commands=reload
		34	reload_cmd="${name}_reload"
		35	start_precmd="${name}_prestart"
		36
		37	knot_prestart()
		38	{
		39	if [ ! -d /var/run/knot ]; then
		40	install -d -o %%USERS%% -g %%GROUPS%% /var/run/knot
		41	fi
		42
		43	if [ ! -d /var/db/knot ]; then
		44	install -d -o %%USERS%% -g %%GROUPS%% /var/db/knot
		45	fi
		46
		47	${control} -c ${knot_config} checkconf
		48	}
		49
		50	knot_reload()
		51	{
39	echo "Reloading ${name}."	52	echo "Reloading ${name}."
40	${command} -c ${knot_config} reload	53	${control} -c ${knot_config} reload
41	}	54	}
42	knot_status() {
43	${command} -c ${knot_config} status
44	}
45	knot_stop() {
46	echo "Stopping ${name}."
47	${command} -c ${knot_config} stop
48	}
49		55
50	run_rc_command "$1"	56	run_rc_command "$1"

Lines 1-50 Link Here

(-)dns/knot/files/knotd.in (-50 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: knot
6	# REQUIRE: SERVERS cleanvar
7	# KEYWORD: shutdown
8	#
9	# Add the following lines to /etc/rc.conf to enable knot:
10	#
11	# knot_enable="YES": Set to NO by default.
12	# Set it to YES to enable knot.
13	# knot_config="": Set to %%PREFIX%%/etc/knot/knot.conf
14	# by default.
15
16	. /etc/rc.subr
17
18	name=knot
19	rcvar=knot_enable
20
21	extra_commands="reload"
22	reload_cmd="${name}_reload"
23	status_cmd="${name}_status"
24	stop_cmd="${name}_stop"
25
26	load_rc_config ${name}
27
28	: ${knot_enable:="NO"}
29	: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
30
31	command=%%PREFIX%%/sbin/${name}c
32	procname=%%PREFIX%%/sbin/${name}d
33	pidfile=/var/run/${name}.pid
34
35	command_args="-c ${knot_config} -w start"
36	required_files=${knot_config}
37
38	knot_reload() {
39	echo "Reloading ${name}."
40	${command} -c ${knot_config} reload
41	}
42	knot_status() {
43	${command} -c ${knot_config} status
44	}
45	knot_stop() {
46	echo "Stopping ${name}."
47	${command} -c ${knot_config} stop
48	}
49
50	run_rc_command "$1"