Attachment #144619 for bug #191844




# $FreeBSD: head/sysutils/cbsd/Makefile 361426 2014-07-10 07:39:26Z koobs $

PORTNAME=	cbsd
PORTVERSION=	10.0.6
PORTREVISION=	2
CATEGORIES=	sysutils

MAINTAINER=	olevole@olevole.ru


USE_GITHUB=	yes
GH_ACCOUNT=	olevole
GH_COMMIT=	cac57bb

USE_RC_SUBR=	cbsdd cbsdrsyncd


RUN_DEPENDS+=	sysrc:${PORTSDIR}/sysutils/sysrc
.endif

do-install:
	@${ECHO} "Installing in ${CBSD_HOME}"
	${MKDIR} ${STAGEDIR}${CBSD_HOME}
	${CP} -R ${WRKSRC}/* ${STAGEDIR}${CBSD_HOME}
	@${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin

post-install:
	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \
	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
	@${FIND} ${STAGEDIR}${CBSD_HOME} -type d | ${SORT} -r | \

Lines 1-2 Link Here

(-)cbsd/distinfo (-2 / +2 lines)
1	SHA256 (cbsd-10.0.5.tar.gz) = d34b61ed9056ce8df6db6f283c6a78185f41ce25bde8d3f7321a12de9a041676	1	SHA256 (cbsd-10.0.6.tar.gz) = 378a0f04abb562eb21b985034f4b74d0ff2e57161800b3c9e748e0ff4633736a
2	SIZE (cbsd-10.0.5.tar.gz) = 358951	2	SIZE (cbsd-10.0.6.tar.gz) = 383249




globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}

if [ ! -f ${globalconf} ]; then
	echo "cbsd: no such ${globalconf}";
	exit 1
fi

if [ ! -f ${inventory} ]; then
	echo "cbsd: no such ${inventory}";
	exit 1
fi

if [ ! -f ${mdtools} ]; then
	echo "cbsd: no such ${mdtools}";
	exit 1
fi

if [ ! -f ${subr} ]; then
	echo "cbsd: no such ${subr}";
	exit 1
fi

if [ ! -f ${localcbsdconf} ]; then
	echo "cbsd: no such ${localcbsdconf}";
	exit 1
fi

. ${globalconf}


start_precmd=${name}_prestart
stop_precmd=${name}_prestop
stop_cmd=${name}_stop

command="${toolsdir}/cbsdd"
pidfile="/var/run/$name.pid"
command_args="&"

cbsdd_prestart() {
	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
	%%PREFIX%%/bin/cbsd sysinv mode=update
	%%PREFIX%%/bin/cbsd netinv

	. ${inventory}

	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
	/usr/sbin/daemon ${rcddir}/jails-astart start
}

cbsdd_prestop()
{
	${rcddir}/jails-astart stop
	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
}

cbsdd_stop()
{
	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} )
}

run_rc_command "$1"

Line 0 Link Here

(-)cbsd/pkg-plist-chunk (+7 lines)
	1	@mode 500
	2	@group cbsd
	3	@owner cbsd
	4	bin/cbsd
	5	@owner
	6	@group
	7	@mode

Return to bug 191844

Lines 1-8 Link Here

(-)cbsd/Makefile (-3 / +10 lines)
1	# $FreeBSD: head/sysutils/cbsd/Makefile 361426 2014-07-10 07:39:26Z koobs $	1	# $FreeBSD: head/sysutils/cbsd/Makefile 361426 2014-07-10 07:39:26Z koobs $
2		2
3	PORTNAME= cbsd	3	PORTNAME= cbsd
4	PORTVERSION= 10.0.5	4	PORTVERSION= 10.0.6
5	PORTREVISION= 2
6	CATEGORIES= sysutils	5	CATEGORIES= sysutils
7		6
8	MAINTAINER= olevole@olevole.ru	7	MAINTAINER= olevole@olevole.ru
Lines 18-24 Link Here
18		17
19	USE_GITHUB= yes	18	USE_GITHUB= yes
20	GH_ACCOUNT= olevole	19	GH_ACCOUNT= olevole
21	GH_COMMIT= 01f481c	20	GH_COMMIT= cac57bb
22		21
23	USE_RC_SUBR= cbsdd cbsdrsyncd	22	USE_RC_SUBR= cbsdd cbsdrsyncd
24		23
Lines 40-46 Link Here
40	RUN_DEPENDS+= sysrc:${PORTSDIR}/sysutils/sysrc	39	RUN_DEPENDS+= sysrc:${PORTSDIR}/sysutils/sysrc
41	.endif	40	.endif
42		41
		42	do-install:
		43	@${ECHO} "Installing in ${CBSD_HOME}"
		44	${MKDIR} ${STAGEDIR}${CBSD_HOME}
		45	${CP} -R ${WRKSRC}/* ${STAGEDIR}${CBSD_HOME}
		46	@${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
		47	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
		48
43	post-install:	49	post-install:
		50	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
44	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d \| ${SORT} \| \	51	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d \| ${SORT} \| \
45	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}	52	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
46	@${FIND} ${STAGEDIR}${CBSD_HOME} -type d \| ${SORT} -r \| \	53	@${FIND} ${STAGEDIR}${CBSD_HOME} -type d \| ${SORT} -r \| \

Lines 20-47 Link Here

(-)cbsd/files/cbsdd.in (-19 / +26 lines)
20	globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}	20	globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
21		21
22	if [ ! -f ${globalconf} ]; then	22	if [ ! -f ${globalconf} ]; then
23	echo "cbsd: no such ${globalconf}";	23	echo "cbsd: no such ${globalconf}";
24	exit 1	24	exit 1
25	fi	25	fi
26		26
27	if [ ! -f ${inventory} ]; then	27	if [ ! -f ${inventory} ]; then
28	echo "cbsd: no such ${inventory}";	28	echo "cbsd: no such ${inventory}";
29	exit 1	29	exit 1
30	fi	30	fi
31		31
32	if [ ! -f ${mdtools} ]; then	32	if [ ! -f ${mdtools} ]; then
33	echo "cbsd: no such ${mdtools}";	33	echo "cbsd: no such ${mdtools}";
34	exit 1	34	exit 1
35	fi	35	fi
36		36
37	if [ ! -f ${subr} ]; then	37	if [ ! -f ${subr} ]; then
38	echo "cbsd: no such ${subr}";	38	echo "cbsd: no such ${subr}";
39	exit 1	39	exit 1
40	fi	40	fi
41		41
42	if [ ! -f ${localcbsdconf} ]; then	42	if [ ! -f ${localcbsdconf} ]; then
43	echo "cbsd: no such ${localcbsdconf}";	43	echo "cbsd: no such ${localcbsdconf}";
44	exit 1	44	exit 1
45	fi	45	fi
46		46
47	. ${globalconf}	47	. ${globalconf}
Lines 53-77 Link Here
53		53
54	start_precmd=${name}_prestart	54	start_precmd=${name}_prestart
55	stop_precmd=${name}_prestop	55	stop_precmd=${name}_prestop
		56	stop_cmd=${name}_stop
56		57
57	command="${sbindir}/cbsdd"	58	command="${toolsdir}/cbsdd"
58	pidfile="/var/run/$name.pid"	59	pidfile="/var/run/$name.pid"
		60	command_args="&"
59		61
60	cbsdd_prestart() {	62	cbsdd_prestart() {
61	find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;	63	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
62	%%PREFIX%%/bin/cbsd sysinv mode=update	64	%%PREFIX%%/bin/cbsd sysinv mode=update
63	%%PREFIX%%/bin/cbsd netinv	65	%%PREFIX%%/bin/cbsd netinv
64		66
65	. ${inventory}	67	. ${inventory}
66		68
67	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton	69	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
68	/usr/sbin/daemon ${rcddir}/jails-astart start	70	/usr/sbin/daemon ${rcddir}/jails-astart start
69	}	71	}
70		72
71	cbsdd_prestop()	73	cbsdd_prestop()
72	{	74	{
73	${rcddir}/jails-astart stop	75	${rcddir}/jails-astart stop
74	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff	76	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
		77	}
		78
		79	cbsdd_stop()
		80	{
		81	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} )
75	}	82	}
76		83
77	run_rc_command "$1"	84	run_rc_command "$1"