Attachment #208483 for bug #241349

Lines 2-8 Link Here

(-)Makefile (-2 / +3 lines)
2		2
3	PORTNAME= kea	3	PORTNAME= kea
4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}	4	PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}
5	PORTREVISION= 0	5	PORTREVISION= 1
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= ISC/kea/${ISCVERSION}	7	MASTER_SITES= ISC/kea/${ISCVERSION}
8	DISTNAME= ${PORTNAME}-${ISCVERSION}	8	DISTNAME= ${PORTNAME}-${ISCVERSION}
Lines 16-21 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
16	LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \	16	LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \
17	libboost_system.so:devel/boost-libs	17	libboost_system.so:devel/boost-libs
18		18
		19	USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe
		20
19	# ISC releases things like 1.4.0-P1, which our versioning doesn't like	21	# ISC releases things like 1.4.0-P1, which our versioning doesn't like
20	ISCVERSION= 1.6.0	22	ISCVERSION= 1.6.0
21		23
Lines 25-31 CPE_VERSION= ${ISCVERSION:C/-.*//} Link Here
25	CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}	27	CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
26	.endif	28	.endif
27		29
28	USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe
29	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
30	USE_RC_SUBR= ${PORTNAME}	31	USE_RC_SUBR= ${PORTNAME}
31	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes




#
# PROVIDE: kea
# REQUIRE: netif routing
# KEYWORD: nojail shutdown

#
# Add the following to /etc/rc.conf[.local] to enable this service


. /etc/rc.subr

name=kea
desc="Kea DHCP Server"
rcvar=kea_enable
required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
extra_commands="reload"
start_precmd="kea_start_precmd"
stop_cmd="kea_cmd stop"
status_cmd="kea_cmd status"
reload_cmd="kea_cmd reload"

load_rc_config $name
{

	command_args="start"
}

kea_enable=${kea_enable:-"NO"}
{

command="%%PREFIX%%/sbin/keactrl"
required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
extra_commands=reload
start_precmd=command_args=start
stop_cmd="$command stop"
status_cmd="$command status"
reload_cmd="$command reload"

load_rc_config $name
: ${kea_enable="NO"}
run_rc_command "$1"




--- src/bin/keactrl/keactrl.in.orig	2019-10-19 21:50:45 UTC
+++ src/bin/keactrl/keactrl.in
@@ -517,8 +517,8 @@ ${args}" 1
 
     status)
         if [ -t 1 ]; then
-            inactive="\e[91minactive\e[0m"
-            active="\e[92mactive\e[0m"
+            inactive="\033[91minactive\033[0m"
+            active="\033[92mactive\033[0m"
         else
             inactive="inactive"
             active="active"




@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
@sample %%ETCDIR%%/kea-dhcp4.conf.sample
@sample %%ETCDIR%%/kea-dhcp6.conf.sample
@sample %%ETCDIR%%/keactrl.conf.sample
include/kea/asiodns/asiodns_messages.h
include/kea/asiodns/io_fetch.h
include/kea/asiodns/logger.h

%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
%%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh
%%DATADIR%%/scripts/pgsql/wipe_data.sh
@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
@sample %%ETCDIR%%/kea-dhcp4.conf.sample
@sample %%ETCDIR%%/kea-dhcp6.conf.sample
@sample %%ETCDIR%%/keactrl.conf.sample
@dir /var/db/kea
@dir /var/run/kea

Return to bug 241349

Lines 3-9 Link Here

(-)files/kea.in (-21 / +13 lines)
3	#	3	#
4	# PROVIDE: kea	4	# PROVIDE: kea
5	# REQUIRE: netif routing	5	# REQUIRE: netif routing
6	# KEYWORD: nojail	6	# KEYWORD: nojail shutdown
7		7
8	#	8	#
9	# Add the following to /etc/rc.conf[.local] to enable this service	9	# Add the following to /etc/rc.conf[.local] to enable this service
Lines 13-40 Link Here
13		13
14	. /etc/rc.subr	14	. /etc/rc.subr
15		15
16	name="kea"	16	name=kea
17	rcvar="${name}_enable"	17	desc="Kea DHCP Server"
18	command="%%PREFIX%%/sbin/keactrl"	18	rcvar=kea_enable
19	required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
20	extra_commands="reload"
21	start_precmd="kea_start_precmd"
22	stop_cmd="kea_cmd stop"
23	status_cmd="kea_cmd status"
24	reload_cmd="kea_cmd reload"
25		19
26	kea_start_precmd()	20	load_rc_config $name
27	{
28
29	command_args="start"
30	}
31		21
32	kea_cmd()	22	kea_enable=${kea_enable:-"NO"}
33	{
34		23
35	$command $1	24	command="%%PREFIX%%/sbin/keactrl"
36	}	25	required_files="%%PREFIX%%/etc/${name}/keactrl.conf"
		26	extra_commands=reload
		27	start_precmd=command_args=start
		28	stop_cmd="$command stop"
		29	status_cmd="$command status"
		30	reload_cmd="$command reload"
37		31
38	load_rc_config $name
39	: ${kea_enable="NO"}
40	run_rc_command "$1"	32	run_rc_command "$1"

Added Link Here

(-)files/patch-src_bin_keactrl_keactrl.in (+13 lines)
1	--- src/bin/keactrl/keactrl.in.orig 2019-10-19 21:50:45 UTC
2	+++ src/bin/keactrl/keactrl.in
3	@@ -517,8 +517,8 @@ ${args}" 1
4
5	status)
6	if [ -t 1 ]; then
7	- inactive="\e[91minactive\e[0m"
8	- active="\e[92mactive\e[0m"
9	+ inactive="\033[91minactive\033[0m"
10	+ active="\033[92mactive\033[0m"
11	else
12	inactive="inactive"
13	active="active"

Lines 1-3 Link Here

(-)pkg-plist (-5 / +5 lines)
		1	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
		2	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
		3	@sample %%ETCDIR%%/kea-dhcp4.conf.sample
		4	@sample %%ETCDIR%%/kea-dhcp6.conf.sample
		5	@sample %%ETCDIR%%/keactrl.conf.sample
1	include/kea/asiodns/asiodns_messages.h	6	include/kea/asiodns/asiodns_messages.h
2	include/kea/asiodns/io_fetch.h	7	include/kea/asiodns/io_fetch.h
3	include/kea/asiodns/logger.h	8	include/kea/asiodns/logger.h
Lines 517-526 sbin/keactrl Link Here
517	%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh	522	%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
518	%%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh	523	%%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh
519	%%DATADIR%%/scripts/pgsql/wipe_data.sh	524	%%DATADIR%%/scripts/pgsql/wipe_data.sh
520	@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
521	@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
522	@sample %%ETCDIR%%/kea-dhcp4.conf.sample
523	@sample %%ETCDIR%%/kea-dhcp6.conf.sample
524	@sample %%ETCDIR%%/keactrl.conf.sample
525	@dir /var/db/kea	525	@dir /var/db/kea
526	@dir /var/run/kea	526	@dir /var/run/kea