From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 8 Apr 2020 00:03:22 +0000 (+0200)
Subject: - fix from upstream for shared daemon startup code
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=2765e4210c7a86244e673b4ee183a616ddb2db1a;p=packages%2Flibvirt.git

- fix from upstream for shared daemon startup code
---

diff --git a/libvirt-daemon-fix.patch b/libvirt-daemon-fix.patch
new file mode 100644
index 0000000..4b32700
--- /dev/null
+++ b/libvirt-daemon-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c
+index 5d92c7def7..99530fd146 100644
+--- a/src/util/virdaemon.c
++++ b/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;
+             }
diff --git a/libvirt.spec b/libvirt.spec
index f1eaa55..a8c571d 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -44,7 +44,7 @@ Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
 Version:	6.2.0
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
@@ -62,6 +62,7 @@ Patch1:		%{name}-qemu-acl.patch
 Patch2:		%{name}-udevadm-settle.patch
 Patch3:		bashisms.patch
 Patch4:		%{name}-sysctl-dir.patch
+Patch5:		%{name}-daemon-fix.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -449,6 +450,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}