Index: head/sysutils/cbsd/Makefile =================================================================== --- head/sysutils/cbsd/Makefile (revision 432352) +++ head/sysutils/cbsd/Makefile (revision 432353) @@ -1,47 +1,46 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 11.0.6 -PORTREVISION= 1 +PORTVERSION= 11.0.7 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru COMMENT= Yet another FreeBSD Jail and Bhyve Management Utility LICENSE= BSD2CLAUSE RUN_DEPENDS= rsync:net/rsync \ sudo:security/sudo \ sqlite3:databases/sqlite3 LIB_DEPENDS= libssh2.so:security/libssh2 \ libsqlite3.so:databases/sqlite3 USE_GITHUB= yes GH_ACCOUNT= olevole USES= libedit USE_RC_SUBR= cbsdd cbsdrsyncd SUB_FILES= pkg-message PLIST_FILES+= man/man8/cbsd.8.gz CBSD_HOME?= ${PREFIX}/cbsd USERS= ${PORTNAME} GROUPS= ${PORTNAME} do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} ${CP} -a ${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} @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig @${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd .include Index: head/sysutils/cbsd/distinfo =================================================================== --- head/sysutils/cbsd/distinfo (revision 432352) +++ head/sysutils/cbsd/distinfo (revision 432353) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480333820 -SHA256 (olevole-cbsd-11.0.6_GH0.tar.gz) = 1f41a181daf1fa488c55fc5bcf75b58625462201b95fabcacd2a18ce3e6fa012 -SIZE (olevole-cbsd-11.0.6_GH0.tar.gz) = 2299216 +TIMESTAMP = 1485167406 +SHA256 (olevole-cbsd-11.0.7_GH0.tar.gz) = 98d28db70bcb8dbc169b18852deb47e83546929c4ab6343355e477e1334bca4c +SIZE (olevole-cbsd-11.0.7_GH0.tar.gz) = 4264071 Index: head/sysutils/cbsd/files/patch-jailctl-bsetup-tui =================================================================== --- head/sysutils/cbsd/files/patch-jailctl-bsetup-tui (revision 432352) +++ head/sysutils/cbsd/files/patch-jailctl-bsetup-tui (nonexistent) @@ -1,11 +0,0 @@ ---- jailctl/bsetup-tui.orig 2016-11-28 11:22:21 UTC -+++ jailctl/bsetup-tui -@@ -54,7 +54,7 @@ commit() - fi - - [ "${VAL}" = "${OVAL}" ] && continue -- bset mode=quiet jname=${_oldjname} $i=\"${VAL}\" -+ bset mode=quiet jname=${_oldjname} $i="${VAL}" - done - - [ "${_oldjname}" != "${_newjname}" -a -n "${_newjname}" ] && cbsd brename old=${_oldjname} new=${_newjname} Property changes on: head/sysutils/cbsd/files/patch-jailctl-bsetup-tui ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cbsd/files/patch-jailctl-jsetup-tui =================================================================== --- head/sysutils/cbsd/files/patch-jailctl-jsetup-tui (revision 432352) +++ head/sysutils/cbsd/files/patch-jailctl-jsetup-tui (nonexistent) @@ -1,11 +0,0 @@ ---- jailctl/jsetup-tui.orig 2016-11-28 11:22:21 UTC -+++ jailctl/jsetup-tui -@@ -34,7 +34,7 @@ commit() - fi - [ "${VAL}" = "${OVAL}" ] && continue - echo "jset mode=quiet jname=${_oldjname} $i=\"${VAL}\"" -- jset mode=quiet jname=${_oldjname} $i=\"${VAL}\" -+ jset mode=quiet jname=${_oldjname} $i="${VAL}" - done - - if [ "${_oldjname}" != "${_newjname}" -a -n "${_newjname}" ]; then Property changes on: head/sysutils/cbsd/files/patch-jailctl-jsetup-tui ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cbsd/files/cbsdd.in =================================================================== --- head/sysutils/cbsd/files/cbsdd.in (revision 432352) +++ head/sysutils/cbsd/files/cbsdd.in (revision 432353) @@ -1,109 +1,109 @@ #!/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}" export NO_CBSD_HISTORY=yes globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"} if [ ! -f ${globalconf} ]; then echo "cbsd: no such ${globalconf}"; 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} . ${mdtools} . ${subr} . ${localcbsdconf} start_precmd=${name}_prestart stop_precmd=${name}_prestop stop_cmd=${name}_stop status_cmd="${name}_status" reload_cmd=${name}_reload extra_commands="reload" command="${toolsdir}/cbsdd" pidfile="/var/run/$name.pid" command_args="&" cbsdd_prestart() { %%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1 . ${distdir}/initenv.subr . ${inventory} %%PREFIX%%/bin/cbsd sysinv mode=update %%PREFIX%%/bin/cbsd netinv update_netinfo env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory} - + ${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'" [ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton /usr/sbin/daemon -f ${rcddir}/jails-astart start } cbsdd_prestop() { ${rcddir}/jails-astart stop [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff } cbsdd_stop() { if [ -f "${pidfile}" ]; then kill -9 $( /bin/cat ${pidfile} ) /bin/rm -f ${pidfile} fi } cbsdd_reload() { if [ -f "${pidfile}" ]; then kill -9 $( /bin/cat ${pidfile} ) > /dev/null 2>&1 /bin/rm -f ${pidfile} fi run_rc_command "start" exit 0 } cbsdd_status() { if [ -f "${pidfile}" ]; then pids=$( /bin/cat ${pidfile} ) echo "${name} is running as pid ${pids}." else echo "${name} is not running." return 1 fi } run_rc_command "$1"