aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvg <vg@FreeBSD.org>2014-08-16 22:39:58 +0800
committervg <vg@FreeBSD.org>2014-08-16 22:39:58 +0800
commit30fecd2b963e877ef49fd812e04e6daf4f0ce0ac (patch)
tree1bfdcb8256c5cef34cb9aa54804d49eda6089dc3
parent6960689cb30ba28c4bb55c06dd8681c136c074bd (diff)
downloadfreebsd-ports-gnome-30fecd2b963e877ef49fd812e04e6daf4f0ce0ac.tar.gz
freebsd-ports-gnome-30fecd2b963e877ef49fd812e04e6daf4f0ce0ac.tar.zst
freebsd-ports-gnome-30fecd2b963e877ef49fd812e04e6daf4f0ce0ac.zip
- 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@olevole.ru (maintainer)
-rw-r--r--sysutils/cbsd/Makefile4
-rw-r--r--sysutils/cbsd/distinfo4
-rw-r--r--sysutils/cbsd/files/cbsdd.in3
-rw-r--r--sysutils/cbsd/files/cbsdrsyncd.in3
4 files changed, 8 insertions, 6 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 95da9110fa56..5e2c55c18052 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cbsd
-PORTVERSION= 10.0.6
+PORTVERSION= 10.0.7
CATEGORIES= sysutils
MAINTAINER= olevole@olevole.ru
@@ -17,7 +17,7 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 \
USE_GITHUB= yes
GH_ACCOUNT= olevole
-GH_COMMIT= cac57bb
+GH_COMMIT= 74d433e
USE_RC_SUBR= cbsdd cbsdrsyncd
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 8b9a040e2183..8ef3b3c42968 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -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
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index eeda220ad335..b8df5acdd434 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -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()
diff --git a/sysutils/cbsd/files/cbsdrsyncd.in b/sysutils/cbsd/files/cbsdrsyncd.in
index fe554dd9dbe2..02d74d5ba6c2 100644
--- a/sysutils/cbsd/files/cbsdrsyncd.in
+++ b/sysutils/cbsd/files/cbsdrsyncd.in
@@ -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"