Index: head/devel/libvirt/Makefile =================================================================== --- head/devel/libvirt/Makefile (revision 534847) +++ head/devel/libvirt/Makefile (revision 534848) @@ -1,190 +1,190 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 6.2.0 +PORTVERSION= 6.3.0 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ MAINTAINER= novel@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities LICENSE= LGPL3 LIB_DEPENDS= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= dnsmasq:dns/dnsmasq \ rst2html:textproc/py-docutils \ xsltproc:textproc/libxslt RUN_DEPENDS= dnsmasq:dns/dnsmasq OPTIONS_DEFINE= DOCS NLS NSS QEMU READLINE SASL LIBSSH LIBSSH2 ZFS OPTIONS_DEFAULT= READLINE LIBSSH LIBSSH2 ZFS OPTIONS_DEFINE_amd64= XEN .if exists(/usr/sbin/bhyve) OPTIONS_DEFINE_amd64+= BHYVE OPTIONS_DEFAULT_amd64+= BHYVE .else PLIST_SUB+= BHYVE="@comment " SUB_LIST+= BHYVE="@comment " CONFIGURE_ARGS+= --without-bhyve .endif QEMU_DESC= QEMU driver BHYVE_DESC= bhyve driver XEN_DESC= Xen support via libxl NSS_DESC= Name Service Switch plugin LIBSSH_DESC= libssh remote transport LIBSSH2_DESC= libssh2 remote transport ZFS_DESC= ZFS storage driver OPTIONS_SUB= yes BHYVE_CONFIGURE_WITH= bhyve QEMU_CONFIGURE_WITH= qemu QEMU_RUN_DEPENDS= dmidecode:sysutils/dmidecode \ qemu-io:emulators/qemu NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CFLAGS= -I${LOCALBASE}/include NSS_CONFIGURE_WITH= nss-plugin READLINE_CONFIGURE_WITH= readline READLINE_USES= readline SASL_CONFIGURE_WITH= sasl=${LOCALBASE} SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 XEN_CONFIGURE_WITH= libxl XEN_CFLAGS= -I${LOCALBASE}/include XEN_LIB_DEPENDS= libxenlight.so:sysutils/xen-tools LIBSSH_CONFIGURE_WITH= libssh LIBSSH_LIB_DEPENDS= libssh.so:security/libssh LIBSSH2_CONFIGURE_WITH= ssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 ZFS_CONFIGURE_WITH= storage-zfs VARDIR= /var GNU_CONFIGURE= yes CONFIGURE_ARGS+= \ --without-dbus \ --without-polkit \ --without-hal \ --without-udev \ --without-netcf \ --without-sysctl \ --without-login-shell \ --without-wireshark-dissector \ --localstatedir=${VARDIR} CONFIGURE_OUTSOURCE=yes # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" # limit production release x.x.x PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector USES= gnome charsetfix compiler:c++0x cpe gettext-runtime gmake libtool pathfix \ perl5 python:3.6+,build pkgconfig shebangfix tar:xz USE_GNOME= glib20 USE_RC_SUBR= libvirtd virtlogd CPE_VENDOR= redhat USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check -SHLIB_VER= 0.6002.0 +SHLIB_VER= 0.6003.0 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PORTDOCS= * SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen SUB_FILES= pkg-message .include .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS} LIB_DEPENDS+= libyajl.so:devel/yajl CONFIGURE_ARGS+= --with-yajl .else CONFIGURE_ARGS+= --without-yajl .endif .if !${PLIST_SUB:MXEN} PLIST_SUB+= XEN="@comment " .endif CONF_FILES= \ bhyve.conf \ libvirt-admin.conf \ libvirt.conf \ libvirtd.conf \ libxl.conf \ qemu.conf \ virtbhyved.conf \ virtlockd.conf \ virtlogd.conf \ virtnetworkd.conf \ virtproxyd.conf \ virtqemud.conf \ virtsecretd.conf \ virtstoraged.conf \ virtvboxd.conf \ virtxend.conf post-patch: @${REINPLACE_CMD} -e 's|$$(LN_S) ../default.xml default.xml|true|' \ -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \ ${WRKSRC}/src/Makefile.in post-install: @${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart @${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS ChangeLog INSTALL NEWS README ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ log/libvirt/uml \ log/libvirt/qemu \ log/libvirt/lxc \ lib/libvirt/boot \ lib/libvirt/lockd/files \ lib/libvirt/images \ lib/libvirt/dnsmasq \ lib/libvirt/filesystems \ lib/libvirt/network \ lib/libvirt/qemu/channel/target \ cache/libvirt/qemu @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}" .endfor .for file in ${CONF_FILES} @if test -f ${STAGEDIR}${ETCDIR}/${file}; then \ ${MV} ${STAGEDIR}${ETCDIR}/${file} \ ${STAGEDIR}${ETCDIR}/${file}.sample; fi .endfor .include .if ${ARCH} == amd64 || ${ARCH} == i386 RUN_DEPENDS+= dmidecode:sysutils/dmidecode .endif .include Index: head/devel/libvirt/distinfo =================================================================== --- head/devel/libvirt/distinfo (revision 534847) +++ head/devel/libvirt/distinfo (revision 534848) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586333622 -SHA256 (libvirt-6.2.0.tar.xz) = aec8881f236917c4f8064918df546ed3aacd0bb8a2f312f4d37485721cce0fb1 -SIZE (libvirt-6.2.0.tar.xz) = 8307248 +TIMESTAMP = 1589102559 +SHA256 (libvirt-6.3.0.tar.xz) = 74069438d34082336e99a88146349e21130552b96efc3b7c562f6878127996f5 +SIZE (libvirt-6.3.0.tar.xz) = 8442636 Index: head/devel/libvirt/files/patch-fix-waiting-for-child-processes =================================================================== --- head/devel/libvirt/files/patch-fix-waiting-for-child-processes (revision 534847) +++ head/devel/libvirt/files/patch-fix-waiting-for-child-processes (nonexistent) @@ -1,43 +0,0 @@ -commit a87e4788d2ee3d74cef5679d2961689d4e4a96a3 -Author: Rafael Fonseca -Date: Wed Apr 8 14:12:54 2020 +0200 - - util: virdaemon: fix waiting for child processes - - Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0 - (success), so comparing that to `pid` will always be false and the - parent will report failure with: - - error : main:851 : Failed to fork as daemon: No such file or directory - - even though the grandchild process is succesfully running. Note that the - errno message is misleading: it was last set when trying to find a - restart state file. - - Signed-off-by: Rafael Fonseca - Reported-by: Marcin Krol - Reviewed-by: Ján Tomko - Signed-off-by: Ján Tomko - -diff --git src/util/virdaemon.c src/util/virdaemon.c -index 5d92c7def7..99530fd146 100644 ---- src/util/virdaemon.c -+++ src/util/virdaemon.c -@@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0) - default: - { - /* parent */ -- int got, exitstatus = 0; -+ int exitstatus = 0; - int ret; - char status; - - VIR_FORCE_CLOSE(statuspipe[1]); - - /* We wait to make sure the first child forked successfully */ -- if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 || -- got != pid || -+ if (virProcessWait(pid, &exitstatus, 0) < 0 || - exitstatus != 0) { - goto error; - } Property changes on: head/devel/libvirt/files/patch-fix-waiting-for-child-processes ___________________________________________________________________ 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