Accepting request 583090 from home:jfehlig:branches:Virtualization

- Update to libvirt 4.1.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    72adaf2f-revert-qemu-monitor-error-report.patch,
    71d56a39-nodedev-fix-parse-PCI-address.patch,
    68eed56b-conf-smbios-oem-strings.patch,
    76977061-qemu-smbios-oem-strings.patch,
    0c710a37-libxl-resume-lock-on-mig-failure.patch,
    759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
    c2dc6698-fix-deadlock-obtaining-hostname.patch,
    c391e07e-libxl-clock-settings.patch,
    ef71caea-libxl-memalign.patch,
    suse-apparmor-signal.patch

OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674

libvirt.spec

@@ -171,10 +171,10 @@
 
 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        4.0.0
+Version:        4.1.0
 Release:        0
 Summary:        Library providing a simple virtualization API
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 
 Requires:       %{name}-daemon = %{version}-%{release}
@@ -317,16 +317,7 @@ Source5:        suse-qemu-domain-hook.py
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         72adaf2f-revert-qemu-monitor-error-report.patch
-Patch1:         71d56a39-nodedev-fix-parse-PCI-address.patch
-Patch2:         68eed56b-conf-smbios-oem-strings.patch
-Patch3:         76977061-qemu-smbios-oem-strings.patch
-Patch4:         0c710a37-libxl-resume-lock-on-mig-failure.patch
-Patch5:         6b3d716e-keycodemap-py3.patch
-Patch6:         759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch
-Patch7:         c2dc6698-fix-deadlock-obtaining-hostname.patch
-Patch8:         c391e07e-libxl-clock-settings.patch
-Patch9:         ef71caea-libxl-memalign.patch
+Patch0:         6b3d716e-keycodemap-py3.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -350,15 +341,14 @@ Patch205:       suse-libvirtd-service-xen.patch
 Patch206:       suse-qemu-conf.patch
 Patch207:       suse-ovmf-paths.patch
 Patch208:       suse-apparmor-libnl-paths.patch
-Patch209:       suse-apparmor-signal.patch
-Patch210:       support-managed-pci-xen-driver.patch
-Patch211:       xen-sxpr-disk-type.patch
-Patch212:       libxl-support-block-script.patch
-Patch213:       apparmor-no-mount.patch
-Patch214:       qemu-apparmor-screenshot.patch
-Patch215:       libvirt-suse-netcontrol.patch
-Patch216:       lxc-wait-after-eth-del.patch
-Patch217:       libxl-qemu-emulator-caps.patch
+Patch209:       support-managed-pci-xen-driver.patch
+Patch210:       xen-sxpr-disk-type.patch
+Patch211:       libxl-support-block-script.patch
+Patch212:       apparmor-no-mount.patch
+Patch213:       qemu-apparmor-screenshot.patch
+Patch214:       libvirt-suse-netcontrol.patch
+Patch215:       lxc-wait-after-eth-del.patch
+Patch216:       libxl-qemu-emulator-caps.patch
 # SLES-Only patches
 %if ! 0%{?is_opensuse}
 Patch400:       virt-create-rootfs.patch
@@ -840,6 +830,9 @@ Requires:       gettext-runtime
 # Needed by virt-pki-validate script.
 Requires:       cyrus-sasl
 Requires:       gnutls
+%if %{with_bash_completion}
+Requires:       %{name}-bash-completion = %{version}-%{release}
+%endif
 
 %description client
 The client binaries needed to access the virtualization
@@ -863,10 +856,22 @@ Summary:        Set of tools to control libvirt daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       readline
+%if %{with_bash_completion}
+Requires:       %{name}-bash-completion = %{version}-%{release}
+%endif
 
 %description admin
 The client side utilities to control the libvirt daemon.
 
+%if %{with_bash_completion}
+%package bash-completion
+Summary:        Bash completion script
+Group:          Development/Libraries/C and C++
+
+%description bash-completion
+Bash completion script stub.
+%endif
+
 %package devel
 Summary:        Libraries, includes, etc. to compile with the libvirt library
 Group:          Development/Libraries/C and C++
@@ -915,19 +920,10 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-# it is submodule in git
+# 6b3d716e-keycodemap-py3.patch patches the keycodemapdb git submodule
 pushd src/keycodemapdb
-%patch5 -p1
+%patch0 -p1
 popd
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 %patch100 -p1
 %patch101 -p1
 %patch150 -p1
@@ -956,7 +952,6 @@ popd
 %patch214 -p1
 %patch215 -p1
 %patch216 -p1
-%patch217 -p1
 %if ! 0%{?is_opensuse}
 %patch400 -p1
 %endif
@@ -1305,20 +1300,20 @@ fi
 
 %pre daemon
 %{_bindir}/getent group libvirt >/dev/null || %{_sbindir}/groupadd -r libvirt
-%service_add_pre libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket
+%service_add_pre libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
 
 %post daemon
 /sbin/ldconfig
 %if %{with_apparmor}
 %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd
 %endif
-%service_add_post libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket
+%service_add_post libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
 %{fillup_only -n libvirtd}
 %{fillup_only -n virtlockd}
 %{fillup_only -n virtlogd}
 
 %preun daemon
-%service_del_preun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket
+%service_del_preun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
 
 %postun daemon
 /sbin/ldconfig
@@ -1329,7 +1324,7 @@ if test $1 -eq 0 ; then
     done
     /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
-   %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket
+   %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
 
 %posttrans daemon
 # All connection drivers should be installed post transaction.
@@ -1390,8 +1385,10 @@ fi
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
+%{_unitdir}/virtlogd-admin.socket
 %{_unitdir}/virtlockd.service
 %{_unitdir}/virtlockd.socket
+%{_unitdir}/virtlockd-admin.socket
 %{_sbindir}/rclibvirtd
 %{_sbindir}/rcvirtlogd
 %{_sbindir}/rcvirtlockd
@@ -1414,7 +1411,7 @@ fi
 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
 %{_datadir}/systemtap/tapset/libvirt_functions.stp
 %if %{with_bash_completion}
-%{_datadir}/bash-completion/completions/vsh
+%{_datadir}/bash-completion/completions/virsh
 %endif
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
@@ -1683,6 +1680,14 @@ fi
 %files admin
 %doc %{_mandir}/man1/virt-admin.1*
 %{_bindir}/virt-admin
+%if %{with_bash_completion}
+%{_datadir}/bash-completion/completions/virt-admin
+%endif
+
+%if %{with_bash_completion}
+%files bash-completion
+%{_datadir}/bash-completion/completions/vsh
+%endif
 
 %files devel
 %{_libdir}/libvirt.so