[packages/libvirt] up to 5.1.0

[atler]

commit 51dab576405bffbd6adddfb0cee5a36465a09945
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Mar 7 00:52:34 2019 +0100

    up to 5.1.0

 libvirt-qemu-acl.patch | 21 ++++++++++-----------
 libvirt.spec           | 10 +++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 2dd310c..e623bd4 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -43,12 +43,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	5.0.0
+Version:	5.1.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5:	b67b226b8f22fbe86991daec5d71ef82
+# Source0-md5:	74c6c2e90ca9c94d9255eec338615a0c
 Source1:	%{name}.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
@@ -568,8 +568,8 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
 %endif
 %if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \
-	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \
 %endif
 
 %find_lang %{name}
@@ -879,5 +879,5 @@ fi
 %if %{with wireshark}
 %files -n wireshark-libvirt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so
+%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so
 %endif
diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 178d29c..c321962 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -30,19 +30,18 @@ diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu.conf l
  # The default SASL configuration file is located in /etc/sasl/
  # When running libvirtd unprivileged, it may be desirable to
  # override the configs in this location. Set this parameter to
-diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.c	2016-07-27 14:39:35.000000000 +0200
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c	2016-08-17 12:40:28.000000000 +0200
-@@ -425,7 +425,8 @@
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
--
+diff -ur libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_conf.c
+--- libvirt-5.1.0.orig/src/qemu/qemu_conf.c	2019-02-26 00:24:59.015183201 +0100
++++ libvirt-5.1.0/src/qemu/qemu_conf.c	2019-03-07 00:31:31.736955745 +0100
+@@ -471,6 +471,8 @@
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
++        return -1;
  
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-         goto cleanup;
+     return 0;
+ }
 diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
 --- libvirt-2.1.0.orig/src/qemu/qemu_conf.h	2016-07-27 14:39:35.000000000 +0200
 +++ libvirt-2.1.0/src/qemu/qemu_conf.h	2016-08-17 12:37:00.000000000 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/51dab576405bffbd6adddfb0cee5a36465a09945