- Update to 10.2.0

- Start of integration  with libxo
- jimport: opportunity to set alternative IP for imported jail via
newip= argument
- fixes for resource leaks in cbsdsh/cbsd_fwatch
- bhyve: when you create FreeBSD VM via FreeBSD-from-jail profile, you
can specify a size of swap partition
- bhyve: opportunity to create a virtual machine through FreeBSD-from-jail
profile on ZFS filesystem
- Initial XEN support

PR:		ports/202344
Submitted by:	<olevole@olevole.ru> (maintainer)
This commit is contained in:
Veniamin Gvozdikov 2015-08-15 12:22:55 +00:00
parent 07cf05be91
commit 0168a5ee42
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=394317
3 changed files with 8 additions and 43 deletions

View file

@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= cbsd
PORTVERSION= 10.1.4
PORTVERSION= 10.2.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= olevole@olevole.ru
@ -20,6 +19,7 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 \
USE_GITHUB= yes
GH_ACCOUNT= olevole
USES= libedit
USE_RC_SUBR= cbsdd cbsdrsyncd
SUB_FILES= pkg-message
@ -36,6 +36,10 @@ GROUPS= ${PORTNAME}
IGNORE= does not support FreeBSD versions < 10.0
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
LIB_DEPENDS+= libxo.so:${PORTSDIR}/devel/libxo
.endif
do-install:
@${ECHO} "Installing in ${CBSD_HOME}"
${MKDIR} ${STAGEDIR}${CBSD_HOME}

View file

@ -1,2 +1,2 @@
SHA256 (olevole-cbsd-v10.1.4_GH0.tar.gz) = 5f43b415ee0d6ff805e0af83b2f1c1fb5cc84573f06f5900ee3721fe552ef3ec
SIZE (olevole-cbsd-v10.1.4_GH0.tar.gz) = 486257
SHA256 (olevole-cbsd-v10.2.0_GH0.tar.gz) = dc545eec5e999d9fd5dc8753a9c6f57c76cc26ff1e2e6d7b9f0db7b56bbadeb7
SIZE (olevole-cbsd-v10.2.0_GH0.tar.gz) = 519467

View file

@ -1,39 +0,0 @@
--- bin/cbsdsh/cbsd_fwatch.c.orig 2015-02-05 17:33:24.019144000 +0300
+++ bin/cbsdsh/cbsd_fwatch.c 2015-02-05 16:57:53.000000000 +0300
@@ -95,7 +95,6 @@
return 1;
}
-
if ((fd = open(watchfile, O_RDONLY)) == -1) {
out2fmt_flush("Cannot open: %s\n", watchfile);
ckfree(watchfile);
@@ -117,6 +116,7 @@
out2fmt_flush("kevent\n");
close(fd);
ckfree(watchfile);
+ close(kq);
return 1;
}
@@ -134,9 +134,12 @@
out2fmt_flush("kevent\n");
close(fd);
ckfree(watchfile);
+ close(kq);
return 1;
}
+ close(kq);
+
if (nev != 0) {
if (ev.fflags & NOTE_DELETE) {
out2fmt_flush("deleted\n");
@@ -173,5 +176,7 @@
ev.fflags &= ~NOTE_REVOKE;
}
}
+
+ ckfree(watchfile);
return 0;
}