Date: Thu, 9 Apr 2020 14:39:43 +0000 (UTC) From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531210 - in head/devel/libvirt: . files Message-ID: <202004091439.039EdhHb043224@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Thu Apr 9 14:39:42 2020 New Revision: 531210 URL: https://svnweb.freebsd.org/changeset/ports/531210 Log: devel/libvirt: update to 6.2.0 - Update to 6.2.0 - Remove GNUTLS option as now it's a strong requirement - rst2html is now required for build - Pull upstream patch that fixes libvirtd exit code so rc script works properly Added: head/devel/libvirt/files/patch-fix-waiting-for-child-processes (contents, props changed) Modified: head/devel/libvirt/Makefile head/devel/libvirt/distinfo head/devel/libvirt/pkg-plist Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Thu Apr 9 14:01:26 2020 (r531209) +++ head/devel/libvirt/Makefile Thu Apr 9 14:39:42 2020 (r531210) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 5.8.0 +PORTVERSION= 6.2.0 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -14,13 +14,15 @@ 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 GNUTLS NLS NSS QEMU READLINE SASL LIBSSH LIBSSH2 ZFS -OPTIONS_DEFAULT= GNUTLS READLINE LIBSSH LIBSSH2 ZFS +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 @@ -46,10 +48,6 @@ QEMU_CONFIGURE_WITH= qemu QEMU_RUN_DEPENDS= dmidecode:sysutils/dmidecode \ qemu-io:emulators/qemu -GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE} -GNUTLS_CONFIGURE_OFF= --without-gnutls -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls - NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CFLAGS= -I${LOCALBASE}/include @@ -77,17 +75,17 @@ ZFS_CONFIGURE_WITH= storage-zfs VARDIR= /var GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-avahi \ +CONFIGURE_ARGS+= \ --without-dbus \ --without-polkit \ --without-hal \ --without-udev \ --without-netcf \ --without-sysctl \ - --without-xen \ --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="" @@ -97,15 +95,16 @@ PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector -USES= charsetfix compiler:c++0x cpe gettext-runtime gmake libtool pathfix \ +USES= gnome charsetfix compiler:c++0x cpe gettext-runtime gmake libtool pathfix \ perl5 python: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.5008.0 +SHLIB_VER= 0.6002.0 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PORTDOCS= * SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen Modified: head/devel/libvirt/distinfo ============================================================================== --- head/devel/libvirt/distinfo Thu Apr 9 14:01:26 2020 (r531209) +++ head/devel/libvirt/distinfo Thu Apr 9 14:39:42 2020 (r531210) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570940152 -SHA256 (libvirt-5.8.0.tar.xz) = e23328289b18bdedc1e966f6c26402b2983149c660ed8bd52cda6feab0c20c55 -SIZE (libvirt-5.8.0.tar.xz) = 13129328 +TIMESTAMP = 1586333622 +SHA256 (libvirt-6.2.0.tar.xz) = aec8881f236917c4f8064918df546ed3aacd0bb8a2f312f4d37485721cce0fb1 +SIZE (libvirt-6.2.0.tar.xz) = 8307248 Added: head/devel/libvirt/files/patch-fix-waiting-for-child-processes ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libvirt/files/patch-fix-waiting-for-child-processes Thu Apr 9 14:39:42 2020 (r531210) @@ -0,0 +1,43 @@ +commit a87e4788d2ee3d74cef5679d2961689d4e4a96a3 +Author: Rafael Fonseca <r4f4rfs@gmail.com> +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 <r4f4rfs@gmail.com> + Reported-by: Marcin Krol <hawk@tld-linux.org> + Reviewed-by: Ján Tomko <jtomko@redhat.com> + Signed-off-by: Ján Tomko <jtomko@redhat.com> + +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; + } Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Thu Apr 9 14:01:26 2020 (r531209) +++ head/devel/libvirt/pkg-plist Thu Apr 9 14:39:42 2020 (r531210) @@ -134,6 +134,7 @@ share/augeas/lenses/virtvboxd.aug %%DATADIR%%/api/libvirt-api.xml %%DATADIR%%/api/libvirt-lxc-api.xml %%DATADIR%%/api/libvirt-qemu-api.xml +%%DATADIR%%/cpu_map/arm_features.xml %%DATADIR%%/cpu_map/index.xml %%DATADIR%%/cpu_map/ppc64_POWER6.xml %%DATADIR%%/cpu_map/ppc64_POWER7.xml @@ -147,15 +148,19 @@ share/augeas/lenses/virtvboxd.aug %%DATADIR%%/cpu_map/x86_Broadwell-noTSX-IBRS.xml %%DATADIR%%/cpu_map/x86_Broadwell-noTSX.xml %%DATADIR%%/cpu_map/x86_Broadwell.xml +%%DATADIR%%/cpu_map/x86_Cascadelake-Server-noTSX.xml %%DATADIR%%/cpu_map/x86_Cascadelake-Server.xml %%DATADIR%%/cpu_map/x86_Conroe.xml +%%DATADIR%%/cpu_map/x86_Dhyana.xml %%DATADIR%%/cpu_map/x86_EPYC-IBPB.xml %%DATADIR%%/cpu_map/x86_EPYC.xml %%DATADIR%%/cpu_map/x86_Haswell-IBRS.xml %%DATADIR%%/cpu_map/x86_Haswell-noTSX-IBRS.xml %%DATADIR%%/cpu_map/x86_Haswell-noTSX.xml %%DATADIR%%/cpu_map/x86_Haswell.xml +%%DATADIR%%/cpu_map/x86_Icelake-Client-noTSX.xml %%DATADIR%%/cpu_map/x86_Icelake-Client.xml +%%DATADIR%%/cpu_map/x86_Icelake-Server-noTSX.xml %%DATADIR%%/cpu_map/x86_Icelake-Server.xml %%DATADIR%%/cpu_map/x86_IvyBridge-IBRS.xml %%DATADIR%%/cpu_map/x86_IvyBridge.xml @@ -170,8 +175,10 @@ share/augeas/lenses/virtvboxd.aug %%DATADIR%%/cpu_map/x86_SandyBridge-IBRS.xml %%DATADIR%%/cpu_map/x86_SandyBridge.xml %%DATADIR%%/cpu_map/x86_Skylake-Client-IBRS.xml +%%DATADIR%%/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml %%DATADIR%%/cpu_map/x86_Skylake-Client.xml %%DATADIR%%/cpu_map/x86_Skylake-Server-IBRS.xml +%%DATADIR%%/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml %%DATADIR%%/cpu_map/x86_Skylake-Server.xml %%DATADIR%%/cpu_map/x86_Westmere-IBRS.xml %%DATADIR%%/cpu_map/x86_Westmere.xml @@ -196,6 +203,7 @@ share/augeas/lenses/virtvboxd.aug %%DATADIR%%/schemas/capability.rng %%DATADIR%%/schemas/cputypes.rng %%DATADIR%%/schemas/domain.rng +%%DATADIR%%/schemas/domainbackup.rng %%DATADIR%%/schemas/domaincaps.rng %%DATADIR%%/schemas/domaincheckpoint.rng %%DATADIR%%/schemas/domaincommon.rng
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004091439.039EdhHb043224>