svn commit: r365082 - in head/sysutils/cbsd: . files

[Veniamin Gvozdikov]

Author: vg
Date: Sat Aug 16 14:39:58 2014
New Revision: 365082
URL: http://svnweb.freebsd.org/changeset/ports/365082
QAT: https://qat.redports.org/buildarchive/r365082/

Log:
  - Update to 10.0.7
  - fixes for incorrect ZFS fs name in jcoldmigrate
  - jail start via taskd
  - bhyve: support for VM auto start
  - bhyve: add virtio RNG for FreeBSD 10.1+
  
  PR:		192662
  Submitted by:	olevole at olevole.ru (maintainer)

Modified:
  head/sysutils/cbsd/Makefile
  head/sysutils/cbsd/distinfo
  head/sysutils/cbsd/files/cbsdd.in
  head/sysutils/cbsd/files/cbsdrsyncd.in

Modified: head/sysutils/cbsd/Makefile
==============================================================================
--- head/sysutils/cbsd/Makefile	Sat Aug 16 14:31:59 2014	(r365081)
+++ head/sysutils/cbsd/Makefile	Sat Aug 16 14:39:58 2014	(r365082)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-PORTVERSION=	10.0.6
+PORTVERSION=	10.0.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole at olevole.ru
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libssh2.so:${PORTSDIR}/secu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	olevole
-GH_COMMIT=	cac57bb
+GH_COMMIT=	74d433e
 
 USE_RC_SUBR=	cbsdd cbsdrsyncd
 

Modified: head/sysutils/cbsd/distinfo
==============================================================================
--- head/sysutils/cbsd/distinfo	Sat Aug 16 14:31:59 2014	(r365081)
+++ head/sysutils/cbsd/distinfo	Sat Aug 16 14:39:58 2014	(r365082)
@@ -1,2 +1,2 @@
-SHA256 (cbsd-10.0.6.tar.gz) = 378a0f04abb562eb21b985034f4b74d0ff2e57161800b3c9e748e0ff4633736a
-SIZE (cbsd-10.0.6.tar.gz) = 383249
+SHA256 (cbsd-10.0.7.tar.gz) = b910bf77128764e8fcb5a09c009ff4efc9554faf96c9d5ee5ff1621147709c6d
+SIZE (cbsd-10.0.7.tar.gz) = 399325

Modified: head/sysutils/cbsd/files/cbsdd.in
==============================================================================
--- head/sysutils/cbsd/files/cbsdd.in	Sat Aug 16 14:31:59 2014	(r365081)
+++ head/sysutils/cbsd/files/cbsdd.in	Sat Aug 16 14:39:58 2014	(r365082)
@@ -60,6 +60,7 @@ pidfile="/var/run/$name.pid"
 command_args="&"
 
 cbsdd_prestart() {
+	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
 	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
@@ -67,7 +68,7 @@ cbsdd_prestart() {
 	. ${inventory}
 
 	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
-	/usr/sbin/daemon ${rcddir}/jails-astart start
+	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()

Modified: head/sysutils/cbsd/files/cbsdrsyncd.in
==============================================================================
--- head/sysutils/cbsd/files/cbsdrsyncd.in	Sat Aug 16 14:31:59 2014	(r365081)
+++ head/sysutils/cbsd/files/cbsdrsyncd.in	Sat Aug 16 14:39:58 2014	(r365082)
@@ -10,6 +10,7 @@
 #
 
 . /etc/rc.subr
+. /etc/rc.conf
 
 name="cbsdrsyncd"
 rcvar=cbsdrsyncd_enable
@@ -17,7 +18,7 @@ rcvar=cbsdrsyncd_enable
 command="%%PREFIX%%/bin/rsync"
 command_args="--daemon"
 pidfile="/var/run/$name.pid"
-required_files="${cbsd_workdir}/etc/$name.conf"
+required_files="${cbsd_workdir}/etc/rsyncd.conf"
 
 # read configuration and set defaults
 load_rc_config "$name"