Index: head/sysutils/cbsd/Makefile =================================================================== --- head/sysutils/cbsd/Makefile (revision 345674) +++ head/sysutils/cbsd/Makefile (revision 345675) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 10.0.2 +PORTVERSION= 10.0.3 CATEGORIES= sysutils MASTER_SITES= http://www.bsdstore.ru/downloads/ \ GH MAINTAINER= olevole@olevole.ru COMMENT= Yet another FreeBSD Jail Management Utility LICENSE= BSD2CLAUSE RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync \ sudo:${PORTSDIR}/security/sudo \ sqlite3:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 USE_GITHUB= yes GH_ACCOUNT= olevole GH_PROJECT= cbsd -GH_COMMIT= 6e05bd1 +GH_COMMIT= 2bb261e USE_RC_SUBR= cbsdd cbsdrsyncd SUB_FILES= pkg-message PLIST_FILES+= man/man8/cbsd.8.gz CBSD_HOME?= ${PREFIX}/cbsd .include USERS= ${PORTNAME} GROUPS= ${PORTNAME} .if ${OSVERSION} < 901000 IGNORE= does not work on FreeBSD < 9.1 .endif .if ${OSVERSION} < 902001 RUN_DEPENDS+= sysrc:${PORTSDIR}/sysutils/sysrc .endif post-install: @${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${CBSD_HOME} -type d | ${SORT} -r | \ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .include Index: head/sysutils/cbsd/distinfo =================================================================== --- head/sysutils/cbsd/distinfo (revision 345674) +++ head/sysutils/cbsd/distinfo (revision 345675) @@ -1,2 +1,2 @@ -SHA256 (cbsd-10.0.2.tar.gz) = 3cce46368bcd0e9e5c4f8aec8219059fcc71b0709155d5dfb029d7b9a1ed4547 -SIZE (cbsd-10.0.2.tar.gz) = 325560 +SHA256 (cbsd-10.0.3.tar.gz) = 42c51fcfb2144d6bcebb808024908f2aef9fa5d338bdccbe6e27e83fdd89cb1a +SIZE (cbsd-10.0.3.tar.gz) = 328334 Index: head/sysutils/cbsd/files/cbsdd.in =================================================================== --- head/sysutils/cbsd/files/cbsdd.in (revision 345674) +++ head/sysutils/cbsd/files/cbsdd.in (revision 345675) @@ -1,60 +1,75 @@ #!/bin/sh # # PROVIDE: cbsdd # REQUIRE: LOGIN FILESYSTEMS sshd # KEYWORD: shutdown # # cbsdd_enable="YES" # . /etc/rc.subr name=cbsdd rcvar=cbsdd_enable load_rc_config $name : ${cbsdd_enable="NO"} export workdir="${cbsd_workdir}" globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"} if [ ! -f ${globalconf} ]; then echo "cbsd: no such ${globalconf}"; exit 1 fi -. ${globalconf} -. ${inventory} -. ${mdtools} -. ${subr} +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} +. ${inventory} +. ${mdtools} +. ${subr} . ${localcbsdconf} start_precmd=${name}_prestart stop_precmd=${name}_prestop command="${sbindir}/cbsdd" pidfile="/var/run/$name.pid" cbsdd_prestart() { find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \; %%PREFIX%%/bin/cbsd sysinv mode=update . ${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 } run_rc_command "$1" Index: head/sysutils/cbsd/files/cbsdrsyncd.in =================================================================== --- head/sysutils/cbsd/files/cbsdrsyncd.in (revision 345674) +++ head/sysutils/cbsd/files/cbsdrsyncd.in (revision 345675) @@ -1,27 +1,26 @@ #!/bin/sh # PROVIDE: cbsdrsyncd # REQUIRE: LOGIN # KEYWORD: shutdown # cbsdrsyncd_enable="YES" # cbsdrsyncd_flags="" # # See rsync(1) for cbsdrsyncd_flags # . /etc/rc.subr -. /etc/rc.conf name="cbsdrsyncd" rcvar=cbsdrsyncd_enable command="%%PREFIX%%/bin/rsync" command_args="--daemon" pidfile="/var/run/$name.pid" required_files="${cbsd_workdir}/etc/$name.conf" # read configuration and set defaults load_rc_config "$name" : ${cbsdrsyncd_enable="NO"} run_rc_command "$1"