up to 5.0.0

- uml driver dropped by upstream

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0a870fd9361435aeef6711212c7fd1ebaf7ce422..60aa717c743ee2b2f53ad878f8ef1afee99dceb3 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -20,26 +20,17 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/daemon/libvirtd.conf
  
  # Change the authentication scheme for TLS sockets.
 diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/daemon/Makefile.am libvirt-2.5.0/daemon/Makefile.am
---- libvirt-2.5.0.orig/src/remote/Makefile.inc.am      2016-11-30 13:57:30.000000000 +0100
-+++ libvirt-2.5.0/src/remote/Makefile.inc.am   2016-12-20 12:56:04.000000000 +0100
-@@ -532,13 +532,13 @@
+--- libvirt-5.0.0.orig/src/remote/Makefile.inc.am      2019-01-16 21:04:18.767020575 +0100
++++ libvirt-5.0.0/src/remote/Makefile.inc.am   2019-01-16 21:04:28.563492731 +0100
+@@ -242,7 +242,7 @@
+ # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
- install-sasl:
--      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
--              $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+              $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+-sasldir = $(sysconfdir)/sasl2
++sasldir = $(sysconfdir)/sasl
  
- uninstall-sasl:
--      rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
--      rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+      rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+      rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- else ! WITH_SASL
- install-data-sasl:
- uninstall-data-sasl:
+ install-sasl:
+       $(MKDIR_P) $(DESTDIR)$(sasldir)
 --- libvirt-3.5.0/docs/auth.html.in.orig       2017-08-01 17:26:35.217739874 +0200
 +++ libvirt-3.5.0/docs/auth.html.in    2017-08-01 17:29:07.364404805 +0200
 @@ -267,7 +267,7 @@

diff --git a/libvirt.spec b/libvirt.spec
index 9a5ed6ce7552a4c356f1632600efc9ce0ac52646..2dd310c93f39adda8113c15bc60f7ed477a6e657 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -13,7 +13,6 @@
 %bcond_without openvz          # OpenVZ support
 %bcond_without phyp            # PHYP support
 %bcond_without qemu            # Qemu support
-%bcond_without uml             # UML support
 %bcond_without vbox            # VirtualBox support
 %bcond_without vmware          # VMware Workstation/Player support
 %bcond_with    vserver         # Support for Linux-VServer guests
@@ -44,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:       4.10.0
+Version:       5.0.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: f85067e830bd89db08b7b7ffa75db6ef
+# Source0-md5: b67b226b8f22fbe86991daec5d71ef82
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch
@@ -124,6 +123,7 @@ Obsoletes:  libvirt-daemon-esx
 Obsoletes:     libvirt-daemon-hyperv
 Obsoletes:     libvirt-daemon-openvz
 Obsoletes:     libvirt-daemon-phyp
+Obsoletes:     libvirt-daemon-uml
 Obsoletes:     libvirt-daemon-vbox
 Obsoletes:     libvirt-daemon-vmware
 Obsoletes:     libvirt-daemon-xen
@@ -366,21 +366,6 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
-%package daemon-uml
-Summary:       Server side driver required to run UML guests
-Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości UML
-Group:         Libraries
-Requires:      %{name}-daemon = %{version}-%{release}
-Provides:      libvirt(hypervisor)
-
-%description daemon-uml
-Server side driver required to manage the virtualization capabilities
-of UML.
-
-%description daemon-uml -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji UML.
-
 %package client
 Summary:       Client side utilities of the libvirt library
 Summary(pl.UTF-8):     Narzędzia klienckie do biblioteki libvirt
@@ -412,7 +397,6 @@ Requires:   %{name}-daemon = %{version}-%{release}
 %{?with_libxl:Requires:        %{name}-daemon-libxl = %{version}-%{release}}
 Requires:      %{name}-daemon-lxc = %{version}-%{release}
 Requires:      %{name}-daemon-qemu = %{version}-%{release}
-%{?with_uml:Requires:  %{name}-daemon-uml = %{version}-%{release}}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -548,7 +532,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        --with-sasl \
        --with-selinux \
        --with-udev \
-       %{__with_without uml} \
        %{__with_without vbox vbox %{_libdir}/VirtualBox} \
        --with-virtualport \
        %{__with_without vmware} \
@@ -841,16 +824,6 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %endif
 
-%if %{with uml}
-%files daemon-uml
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
-%attr(700,root,root) %dir /var/lib/libvirt/uml
-%attr(700,root,root) %dir /var/run/libvirt/uml
-%attr(700,root,root) %dir /var/log/libvirt/uml
-%endif
-
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests