diff options
-rw-r--r-- | sysutils/cbsd/Makefile | 3 | ||||
-rw-r--r-- | sysutils/cbsd/distinfo | 6 | ||||
-rw-r--r-- | sysutils/cbsd/files/cbsdd.in | 2 | ||||
-rw-r--r-- | sysutils/cbsd/files/patch-jailctl-bsetup-tui | 11 | ||||
-rw-r--r-- | sysutils/cbsd/files/patch-jailctl-jsetup-tui | 11 |
5 files changed, 5 insertions, 28 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 34c1dd66bd8d..34cf6b806522 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 11.0.6 -PORTREVISION= 1 +PORTVERSION= 11.0.7 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index 718d933c269e..09cbd067f218 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -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 diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index fa6bdb7f34e0..75c715a0132b 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -66,7 +66,7 @@ cbsdd_prestart() { %%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 } diff --git a/sysutils/cbsd/files/patch-jailctl-bsetup-tui b/sysutils/cbsd/files/patch-jailctl-bsetup-tui deleted file mode 100644 index 8fd22fb061d9..000000000000 --- a/sysutils/cbsd/files/patch-jailctl-bsetup-tui +++ /dev/null @@ -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} diff --git a/sysutils/cbsd/files/patch-jailctl-jsetup-tui b/sysutils/cbsd/files/patch-jailctl-jsetup-tui deleted file mode 100644 index c46921b3dbc5..000000000000 --- a/sysutils/cbsd/files/patch-jailctl-jsetup-tui +++ /dev/null @@ -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 |