[packages/libvirt] - updated to 6.4.0 - updated sasl patch - added bash-completions-dir patch (if completions dir is sp

qboosh qboosh at pld-linux.org
Sun Jun 21 21:14:27 CEST 2020


commit 1c850183f2b7ab4bcef4eaa77041d5e968d3dda3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 21 21:15:33 2020 +0200

    - updated to 6.4.0
    - updated sasl patch
    - added bash-completions-dir patch (if completions dir is specified to configure, don't BR bash-completions)

 libvirt-bash-completions-dir.patch |  24 +++
 libvirt-sasl.patch                 |  48 ++---
 libvirt.spec                       | 389 ++++++++++++++++++++++++++-----------
 3 files changed, 307 insertions(+), 154 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 858108e..a1bdf92 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,9 +1,12 @@
 # TODO:
 # - parallels-sdk >= 7.0.22?
 # - virtuozzo storage?
+# - mm-ctl (https://github.com/tfukushima/mm-ctl ?)
+# - numad (https://pagure.io/numad/ or https://github.com/yhaenggi/numad/releases ?)
+# - vstorage, vstorage-mount
 # - pldize virtlockd.init
 # - update vserver patch, if anybody needs it
-# - package firewalld zone definition
+# - package firewalld zone definition (see files)
 #
 # Conditional build:
 # - virtualization
@@ -12,12 +15,10 @@
 %bcond_without	libxl		# libxenlight support
 %bcond_without	lxc		# LXC support
 %bcond_without	openvz		# OpenVZ support
-%bcond_without	phyp		# PHYP support
 %bcond_without	qemu		# Qemu support
 %bcond_without	vbox		# VirtualBox support
 %bcond_without	vmware		# VMware Workstation/Player support
 %bcond_with	vserver		# Support for Linux-VServer guests
-%bcond_without	xenapi		# Xen API (Citrix XenServer) support
 # - storage
 %bcond_without	ceph		# RADOS BD (Ceph) storage support
 %bcond_without	glusterfs	# GlusterFS storage support
@@ -35,61 +36,64 @@
 %undefine	with_qemu
 %endif
 
-# Xen is available only on x86 and ia64
-%ifnarch %{ix86} %{x8664} ia64
-%undefine	with_xenapi
+# Xen supported architectures
+%ifnarch %{ix86} %{x8664} %{arm} aarch64
 %undefine	with_libxl
 %endif
 
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	5.6.0
-Release:	5
+Version:	6.4.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5:	e818bb25ead24119925781b7519a8401
+Source0:	https://libvirt.org/sources/libvirt-%{version}.tar.xz
+# Source0-md5:	a14cfce86474d4f039a27ce140b176e7
 Source1:	%{name}.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
+Patch1:		%{name}-bash-completions-dir.patch
 Patch2:		%{name}-qemu-acl.patch
 Patch4:		%{name}-udevadm-settle.patch
 Patch5:		vserver.patch
 Patch6:		bashisms.patch
-URL:		http://www.libvirt.org/
+URL:		https://www.libvirt.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	avahi-devel >= 0.6.0
-BuildRequires:	bash-completion >= 2.0
 %{?with_ceph:BuildRequires:	ceph-devel}
 BuildRequires:	curl-devel >= 7.18.0
-BuildRequires:	cyrus-sasl-devel
+BuildRequires:	cyrus-sasl-devel >= 2.1.26
 BuildRequires:	dbus-devel >= 1.0.0
 BuildRequires:	device-mapper-devel >= 1.0.0
+# rst2html5 rst2man
+BuildRequires:	docutils
 BuildRequires:	gawk
 BuildRequires:	gcc >= 6:4.4
 BuildRequires:	gettext-tools >= 0.17
+BuildRequires:	glib2-devel >= 1:2.48.0
 %{?with_glusterfs:BuildRequires:	glusterfs-devel >= 3.4.1}
-BuildRequires:	gnutls-devel >= 2.2.0
+BuildRequires:	gnutls-devel >= 3.2.0
 BuildRequires:	libapparmor-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libcap-ng-devel >= 0.4.0
 BuildRequires:	libfuse-devel >= 2.8.6
 BuildRequires:	libgcrypt-devel
+BuildRequires:	libiscsi-devel >= 1.18.0
 BuildRequires:	libnl-devel >= 3.2
-BuildRequires:	libpcap-devel >= 1.0.0
+BuildRequires:	libpcap-devel >= 1.5.0
 BuildRequires:	libselinux-devel >= 2.5
 BuildRequires:	libssh-devel >= 0.7
 BuildRequires:	libssh2-devel >= 1.3
 BuildRequires:	libtool
-%{?with_xenapi:BuildRequires:	libxenserver-devel}
-BuildRequires:	libxml2-devel >= 1:2.6.0
+BuildRequires:	libxml2-devel >= 1:2.9.1
+BuildRequires:	libxml2-progs >= 1:2.9.1
 BuildRequires:	libxslt-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	ncurses-devel
 %{?with_netcf:BuildRequires:	netcf-devel >= 0.2.0}
 BuildRequires:	numactl-devel
@@ -98,34 +102,37 @@ BuildRequires:	parted-devel >= 1.8.0
 BuildRequires:	pkgconfig
 %{?with_polkit:BuildRequires:	polkit}
 %{?with_polkit:BuildRequires:	polkit-devel >= 0.90}
+BuildRequires:	python3 >= 1:3.0
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.627
+BuildRequires:	rpmbuild(macros) >= 1.673
 %{?with_sanlock:BuildRequires:	sanlock-devel >= 0.8}
 BuildRequires:	systemd-devel
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
-BuildRequires:	udev-devel >= 1:218
-%{?with_wireshark:BuildRequires:	wireshark-devel >= 1.11.3}
-%{?with_libxl:BuildRequires:	xen-devel >= 4.4}
+BuildRequires:	udev-devel >= 1:219
+%{?with_wireshark:BuildRequires:	wireshark-devel >= 2.4.0}
+%{?with_libxl:BuildRequires:	xen-devel >= 4.6}
 # For disk driver
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10.0
+BuildRequires:	yajl-devel >= 2.0.3
 Requires:	curl-libs >= 7.18.0
-Requires:	device-mapper >= 1.0.0
+Requires:	cyrus-sasl-libs >= 2.1.26
+Requires:	device-mapper-libs >= 1.0.0
+Requires:	glib2 >= 1:2.48.0
 Requires:	libcap-ng >= 0.4.0
 Requires:	libnl >= 3.2
-Requires:	libpcap >= 1.0.0
+Requires:	libpcap >= 1.5.0
 Requires:	libselinux >= 2.5
 Requires:	libssh >= 0.7
 Requires:	libssh2 >= 1.3
-Requires:	libxml2 >= 1:2.6.0
+Requires:	libxml2 >= 1:2.9.1
 %{?with_hyperv:Requires:	openwsman-libs >= 2.2.3}
+Requires:	yajl >= 2.0.3
 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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -157,34 +164,24 @@ Ten pakiet zawiera podstawowe biblioteki oraz plik konfiguracyjny.
 
 %package -n bash-completion-%{name}
 Summary:        bash-completion for libvirt
+Summary(pl.UTF-8):	Bashowe dopełnianie składni poleceń libvirt
 Group:          Applications/Shells
-Requires:       bash-completion
-%if "%{_rpmversion}" >= "5"
+Requires:       bash-completion >= 2.0
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:      noarch
 %endif
 
 %description -n bash-completion-%{name}
 This package provides bash-completion for libvirt.
 
+%description -n bash-completion-%{name} -l pl.UTF-8
+Ten pakiet zapewnia bashowe dopełnianie składni dla poleceń libvirt.
+
 %package devel
 Summary:	Development files for programs using libvirt
 Summary(pl.UTF-8):	Pliki programistyczne do programów wykorzystujących libvirt
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	audit-libs-devel
-Requires:	curl-devel >= 7.18.0
-Requires:	dbus-devel >= 1.0.0
-Requires:	device-mapper-devel >= 1.0.0
-Requires:	gnutls-devel >= 2.2.0
-Requires:	libapparmor-devel
-Requires:	libcap-ng-devel >= 0.4.0
-Requires:	libgcrypt-devel
-Requires:	libnl-devel >= 3.2
-Requires:	libpcap-devel >= 1.0.0
-Requires:	libselinux-devel >= 2.5
-Requires:	libxml2-devel >= 1:2.6.0
-Requires:	numactl-devel
-%{?with_hyperv:Requires:	openwsman-devel >= 2.2.3}
 
 %description devel
 Libvirt is a C toolkit to interact with the virtualization
@@ -220,6 +217,20 @@ obecnych wersji Linuksa.
 Ten pakiet zawiera biblioteki statyczne do tworzenia programów
 wykorzystujących bibliotekę libvirt.
 
+%package doc
+Summary:	Documentation for libvirt
+Summary(pl.UTF-8):	Dokumentacja do libvirt
+Group:		Documentation
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:      noarch
+%endif
+
+%description doc
+Documentation for libvirt.
+
+%description doc -l pl.UTF-8
+Dokumentacja do libvirt.
+
 %package lock-sanlock
 Summary:	Sanlock lock manager plugin for libvirt
 Summary(pl.UTF-8):	Zarządca blokad sanlock dla biblioteki libvirt
@@ -236,32 +247,34 @@ Zarządca blokad sanlock dla biblioteki libvirt.
 Summary:	Server side daemon and supporting files for libvirt library
 Summary(pl.UTF-8):	Demon działający po stronie serwera oraz pliki wspierające dla biblioteki libvirt
 Group:		Applications/System
+Requires(post):	systemd-units
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	systemd-units
+Requires(preun):	systemd-units
 Requires:	%{name} = %{version}-%{release}
-Requires:	avahi-libs >= 0.6.0
+Requires:	device-mapper >= 1.0.0
 Requires:	iproute2
 Requires:	libblkid >= 2.17
+# iscsi-direct driver
+Requires:	libiscsi >= 1.18.0
 %{?with_netcf:Requires:	netcf >= 0.2.0}
 Requires:	parted-libs >= 1.8.0
 Requires:	rc-scripts
 # Needed for probing the power management features of the host.
 Requires:	pm-utils
 Requires:	systemd-units >= 37-0.10
-Requires:	udev-libs >= 1:218
+Requires:	udev-libs >= 1:219
 Requires:	util-linux
 Requires:	virtual(module-tools)
 Requires:	xorg-lib-libpciaccess >= 0.10.0
-Requires(post):	systemd-units
-Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	systemd-units
-Requires(preun):	systemd-units
 Suggests:	bridge-utils
-Suggests:	cyrus-sasl
-Suggests:	cyrus-sasl-digest-md5
+Suggests:	cyrus-sasl >= 2.1.26
+Suggests:	cyrus-sasl-digest-md5 >= 2.1.26
 Suggests:	dmidecode
 Suggests:	dnsmasq >= 2.41
 Suggests:	ebtables
 Suggests:	gawk
-Suggests:	glusterfs-client >= 2.0.1
+Suggests:	glusterfs-client >= 3.4.1
 Suggests:	iptables
 Suggests:	iptables
 Suggests:	libcgroup
@@ -316,8 +329,9 @@ Summary:	Server side driver required to run XEN guests (xenlight)
 Summary(pl.UTF-8):	Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
 Group:		Libraries
 Requires:	%{name}-daemon = %{version}-%{release}
-Requires:	xen >= 4.4
+Requires:	xen >= 4.6
 Provides:	libvirt(hypervisor)
+Obsoletes:	libvirt-daemon-xen
 
 %description daemon-libxl
 Server side driver required to manage the virtualization capabilities
@@ -364,19 +378,35 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
+%package daemon-vbox
+Summary:	Server side driver required to run VirtalBox guests
+Summary(pl.UTF-8):	Sterownik wymagany po stronie serwera do uruchamiania gości VirtalBox
+Group:		Libraries
+Requires:	%{name}-daemon = %{version}-%{release}
+Requires:	VirtualBox >= 5.2
+Provides:	libvirt(hypervisor)
+
+%description daemon-vbox
+Server side driver required to manage the virtualization capabilities
+of VirtualBox.
+
+%description daemon-vbox -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji VirtualBoksa.
+
 %package client
 Summary:	Client side utilities of the libvirt library
 Summary(pl.UTF-8):	Narzędzia klienckie do biblioteki libvirt
 Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
-Requires:	gettext >= 0.18.1.1-6
-Requires:	gnutls >= 2.2.0
-Requires:	netcat-openbsd
-Requires:	rc-scripts
 Requires(post):	systemd-units
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	systemd-units
 Requires(preun):	systemd-units
+Requires:	%{name} = %{version}-%{release}
+Requires:	gettext >= 0.18.1.1-6
+Requires:	gnutls >= 3.2.0
+Requires:	netcat-openbsd
+Requires:	rc-scripts
 
 %description client
 Client binaries needed to access to the virtualization capabilities of
@@ -426,7 +456,7 @@ Sondy systemtap/dtrace dla libvirt.
 Summary:	Wireshark dissector module for libvirt packets
 Summary(pl.UTF-8):	Moduł sekcji Wiresharka do pakietów libvirt
 Group:		Libraries
-Requires:	wireshark >= 1.11.3
+Requires:	wireshark >= 2.4.0
 
 %description -n wireshark-libvirt
 Wireshark dissector module for libvirt packets.
@@ -437,6 +467,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch4 -p1
 %{?with_vserver:%patch5 -p1}
@@ -448,48 +479,54 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
-%configure \
+install -d build
+cd build
+../%configure \
 	PVCREATE=/sbin/pvcreate \
 	VGCREATE=/sbin/vgcreate \
 	LVCREATE=/sbin/lvcreate \
 	PVREMOVE=/sbin/pvremove \
 	VGREMOVE=/sbin/vgremove \
 	LVREMOVE=/sbin/lvremove \
-	VGCHANGE=/sbin/vgchange \
 	LVCHANGE=/sbin/lvchange \
+	VGCHANGE=/sbin/vgchange \
 	  VGSCAN=/sbin/vgscan   \
 	     PVS=/sbin/pvs      \
 	     VGS=/sbin/vgs      \
 	     LVS=/sbin/lvs      \
 	      TC=/sbin/tc \
 	   BRCTL=/sbin/brctl    \
+	AUGPARSE=/usr/bin/augparse \
 	ISCSIADM=/sbin/iscsiadm	\
 	SHOWMOUNT=/usr/sbin/showmount \
 	MOUNT=/bin/mount \
 	UMOUNT=/bin/umount \
 	MKFS=/sbin/mkfs \
 	SHOWMOUNT=/usr/sbin/showmount \
+	IP_PATH=/sbin/ip \
 	IPTABLES_PATH=/usr/sbin/iptables \
 	IP6TABLES_PATH=/usr/sbin/ip6tables \
 	EBTABLES_PATH=/usr/sbin/ebtables \
 	ISCSIADM=/sbin/iscsiadm \
+	DMIDECODE=/usr/sbin/dmidecode \
 	DNSMASQ=/usr/sbin/dnsmasq \
 	RADVD=/usr/sbin/radvd \
 	UDEVADM=/sbin/udevadm \
 	MODPROBE=/sbin/modprobe \
-	SCRUB=/usr/bin/scrub \
+	RMMOD=/sbin/rmmod \
+	MMCTL=/usr/sbin/mm-ctl \
 	OVSVSCTL=/usr/bin/ovs-vsctl \
+	SCRUB=/usr/bin/scrub \
 	NUMAD=/usr/bin/numad \
+	QEMU_BRIDGE_HELPER=%{_libexecdir}/qemu-bridge-helper \
+	QEMU_PR_HELPER=/usr/bin/qemu-pr-helper \
 	SHEEPDOGCLI=/usr/sbin/collie \
 	ZFS=/usr/sbin/zfs \
 	ZPOOL=/usr/sbin/zpool \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
 	--with-bash-completion \
-	--with-bash-completions-dir=/etc/bash_completion.d \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-html-subdir=%{name} \
+	--with-bash-completions-dir=%{bash_compdir} \
 	--with-init-script=systemd \
 	--with-packager="PLD-Linux" \
 	--with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
@@ -506,7 +543,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	--with-storage-sheepdog \
 	--with-apparmor \
 	--with-audit \
-	--with-avahi \
 	%{__with_without systemtap dtrace} \
 	%{__with_without esx} \
 	--with-driver-modules \
@@ -521,7 +557,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	--with-numactl \
 	--with-numad \
 	%{__with_without openvz} \
-	%{__with_without phyp} \
 	%{__with_without polkit} \
 	%{__with_without qemu} \
 	%{__with_without sanlock} \
@@ -532,7 +567,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	--with-virtualport \
 	%{__with_without vmware} \
 	%{!?with_wireshark:--without-wireshark-dissector} \
-	%{__with_without xenapi} \
 	--x-libraries=%{_libdir}
 
 %{__make} \
@@ -543,9 +577,9 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install \
-	DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
+%{__make} -C build install \
 	SYSTEMD_UNIT_DIR=%{systemdunitdir} \
+	sasldir=%{_sysconfdir}/sasl \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
@@ -609,7 +643,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README.md
+%doc AUTHORS ChangeLog NEWS README.rst
 %dir %{_sysconfdir}/libvirt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
@@ -632,9 +666,9 @@ fi
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-/etc/bash_completion.d/virsh
-/etc/bash_completion.d/virt-admin
-/etc/bash_completion.d/vsh
+%{bash_compdir}/virsh
+%{bash_compdir}/virt-admin
+%{bash_compdir}/vsh
 
 %files devel
 %defattr(644,root,root,755)
@@ -643,7 +677,6 @@ fi
 %{?with_lxc:%attr(755,root,root) %{_libdir}/libvirt-lxc.so}
 %attr(755,root,root) %{_libdir}/libvirt-qemu.so
 %{_datadir}/%{name}/api
-%{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
 %{_pkgconfigdir}/libvirt-admin.pc
@@ -659,6 +692,12 @@ fi
 %{?with_lxc:%{_libdir}/libvirt-lxc.a}
 %{_libdir}/libvirt-qemu.a
 
+%files doc
+%defattr(644,root,root,755)
+%dir %{_docdir}/libvirt
+%{_docdir}/libvirt/examples
+%{_docdir}/libvirt/html
+
 %if %{with sanlock}
 %files lock-sanlock
 %defattr(644,root,root,755)
@@ -675,22 +714,36 @@ fi
 
 %files daemon
 %defattr(644,root,root,755)
-%doc docs/*.xml
-%dir %attr(700,root,root) %{_sysconfdir}/libvirt/nwfilter
-%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu
-%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks
-%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtinterfaced.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlogd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnetworkd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnodedevd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnwfilterd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtproxyd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtsecretd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtstoraged.conf
+%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu
+%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml
+%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+%dir %attr(700,root,root) %{_sysconfdir}/libvirt/nwfilter
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/nwfilter/*.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/libvirt.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirtd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtinterfaced
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlogd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtnetworkd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtnodedevd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtnwfilterd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtproxyd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtsecretd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtstoraged
 %attr(754,root,root) /etc/rc.d/init.d/libvirtd
 %{systemdunitdir}/libvirtd.service
 %{systemdunitdir}/libvirtd.socket
@@ -699,28 +752,103 @@ fi
 %{systemdunitdir}/libvirtd-tcp.socket
 %{systemdunitdir}/libvirtd-tls.socket
 %{systemdunitdir}/virt-guest-shutdown.target
+%{systemdunitdir}/virtinterfaced.service
+%{systemdunitdir}/virtinterfaced.socket
+%{systemdunitdir}/virtinterfaced-admin.socket
+%{systemdunitdir}/virtinterfaced-ro.socket
 %{systemdunitdir}/virtlockd.service
 %{systemdunitdir}/virtlockd.socket
 %{systemdunitdir}/virtlockd-admin.socket
 %{systemdunitdir}/virtlogd.service
 %{systemdunitdir}/virtlogd.socket
 %{systemdunitdir}/virtlogd-admin.socket
+%{systemdunitdir}/virtnetworkd.service
+%{systemdunitdir}/virtnetworkd.socket
+%{systemdunitdir}/virtnetworkd-admin.socket
+%{systemdunitdir}/virtnetworkd-ro.socket
+%{systemdunitdir}/virtnodedevd.service
+%{systemdunitdir}/virtnodedevd.socket
+%{systemdunitdir}/virtnodedevd-admin.socket
+%{systemdunitdir}/virtnodedevd-ro.socket
+%{systemdunitdir}/virtnwfilterd.service
+%{systemdunitdir}/virtnwfilterd.socket
+%{systemdunitdir}/virtnwfilterd-admin.socket
+%{systemdunitdir}/virtnwfilterd-ro.socket
+%{systemdunitdir}/virtproxyd.service
+%{systemdunitdir}/virtproxyd.socket
+%{systemdunitdir}/virtproxyd-admin.socket
+%{systemdunitdir}/virtproxyd-ro.socket
+%{systemdunitdir}/virtproxyd-tcp.socket
+%{systemdunitdir}/virtproxyd-tls.socket
+%{systemdunitdir}/virtsecretd.service
+%{systemdunitdir}/virtsecretd.socket
+%{systemdunitdir}/virtsecretd-admin.socket
+%{systemdunitdir}/virtsecretd-ro.socket
+%{systemdunitdir}/virtstoraged.service
+%{systemdunitdir}/virtstoraged.socket
+%{systemdunitdir}/virtstoraged-admin.socket
+%{systemdunitdir}/virtstoraged-ro.socket
 %config(noreplace) %verify(not md5 mtime size) /usr/lib/sysctl.d/60-libvirtd.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
-%attr(755,root,root) %{_libexecdir}/libvirt_iohelper
-%attr(755,root,root) %{_libexecdir}/libvirt_parthelper
-%attr(755,root,root) %{_libexecdir}/virt-aa-helper
 %attr(755,root,root) %{_sbindir}/libvirtd
+%attr(755,root,root) %{_sbindir}/virtinterfaced
 %attr(755,root,root) %{_sbindir}/virtlockd
 %attr(755,root,root) %{_sbindir}/virtlogd
+%attr(755,root,root) %{_sbindir}/virtnetworkd
+%attr(755,root,root) %{_sbindir}/virtnodedevd
+%attr(755,root,root) %{_sbindir}/virtnwfilterd
+%attr(755,root,root) %{_sbindir}/virtproxyd
+%attr(755,root,root) %{_sbindir}/virtsecretd
+%attr(755,root,root) %{_sbindir}/virtstoraged
+%attr(755,root,root) %{_libexecdir}/libvirt_iohelper
+%attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper
+%attr(755,root,root) %{_libexecdir}/libvirt_parthelper
+%attr(755,root,root) %{_libexecdir}/virt-aa-helper
+# TODO:
+#%{_libdir}/firewalld/zones/libvirt.xml
+%dir %{_libdir}/libvirt/connection-driver
+%{?with_netcf:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so}
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
+%dir %{_libdir}/libvirt/lock-driver
+%attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
+%dir %{_libdir}/libvirt/storage-backend
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
+# mpath requires libdevmapper, but libvirt itself requires it too
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+%dir %{_libdir}/libvirt/storage-file
+%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
+%{_datadir}/augeas/lenses/virtinterfaced.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/virtlogd.aug
+%{_datadir}/augeas/lenses/virtnetworkd.aug
+%{_datadir}/augeas/lenses/virtnodedevd.aug
+%{_datadir}/augeas/lenses/virtnwfilterd.aug
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/virtsecretd.aug
+%{_datadir}/augeas/lenses/virtstoraged.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{?with_qemu:%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug}
+%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
+%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
+%{_datadir}/libvirt/cpu_map
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
@@ -740,30 +868,6 @@ fi
 %dir /var/run/libvirt
 %dir /var/run/libvirt/network
 %{systemdtmpfilesdir}/%{name}.conf
-%attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper
-%dir %{_libdir}/libvirt/connection-driver
-%{_datadir}/libvirt/cpu_map
-%{?with_netcf:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so}
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
-%dir %{_libdir}/libvirt/lock-driver
-%attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
-%dir %{_libdir}/libvirt/storage-backend
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
-# mpath requires libdevmapper, but libvirt itself requires it too
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so
-%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
-%dir %{_libdir}/libvirt/storage-file
-%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
 
 %if %{with glusterfs}
 %files daemon-storage-gluster
@@ -784,10 +888,19 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtxend.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.libxl
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtxend
+%{systemdunitdir}/virtxend.service
+%{systemdunitdir}/virtxend.socket
+%{systemdunitdir}/virtxend-admin.socket
+%{systemdunitdir}/virtxend-ro.socket
+%attr(755,root,root) %{_sbindir}/virtxend
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/virtxend.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_virtxend.aug
 %attr(700,root,root) %dir /var/lib/libvirt/libxl
 %attr(700,root,root) %dir /var/run/libvirt/libxl
 %attr(700,root,root) %dir /var/log/libvirt/libxl
@@ -797,30 +910,66 @@ fi
 %files daemon-lxc
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/lxc.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlxcd.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlxcd
+%{systemdunitdir}/virtlxcd.service
+%{systemdunitdir}/virtlxcd.socket
+%{systemdunitdir}/virtlxcd-admin.socket
+%{systemdunitdir}/virtlxcd-ro.socket
+%attr(755,root,root) %{_sbindir}/virtlxcd
+%attr(755,root,root) %{_libexecdir}/libvirt_lxc
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
+%{_datadir}/augeas/lenses/libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/virtlxcd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
 %attr(700,root,root) %dir /var/lib/libvirt/lxc
 %attr(700,root,root) %dir /var/run/libvirt/lxc
 %attr(700,root,root) %dir /var/log/libvirt/lxc
-%{_datadir}/augeas/lenses/libvirtd_lxc.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%attr(755,root,root) %{_libexecdir}/libvirt_lxc
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
 %endif
 
 %if %{with qemu}
 %files daemon-qemu
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/virt-qemu-run
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtqemud.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf}
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtqemud
+%{systemdunitdir}/virtqemud.service
+%{systemdunitdir}/virtqemud.socket
+%{systemdunitdir}/virtqemud-admin.socket
+%{systemdunitdir}/virtqemud-ro.socket
+%attr(755,root,root) %{_sbindir}/virtqemud
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/virtqemud.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
+%{_mandir}/man1/virt-qemu-run.1*
 %attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu
 %attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu
 %attr(700,root,root) %dir /var/log/libvirt/qemu
 %attr(700,root,root) %dir /var/run/libvirt/qemu
-%{_datadir}/augeas/lenses/libvirtd_qemu.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
+%endif
+
+%if %{with vbox}
+%files daemon-vbox
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtvboxd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtvboxd
+%{systemdunitdir}/virtvboxd.service
+%{systemdunitdir}/virtvboxd.socket
+%{systemdunitdir}/virtvboxd-admin.socket
+%{systemdunitdir}/virtvboxd-ro.socket
+%attr(755,root,root) %{_sbindir}/virtvboxd
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
+%{_datadir}/augeas/lenses/virtvboxd.aug
+%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
 %endif
 
 %files client
@@ -831,10 +980,12 @@ fi
 %attr(755,root,root) %{_bindir}/virsh
 %attr(755,root,root) %{_bindir}/virt-admin
 %attr(755,root,root) %{_bindir}/virt-host-validate
+# TODO: %attr(4754,root,virtlogin) and virtlogin group to access binary
 %attr(4755,root,root) %{_bindir}/virt-login-shell
 %attr(755,root,root) %{_bindir}/virt-xml-validate
 %attr(755,root,root) %{_bindir}/virt-pki-validate
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
+%attr(754,root,root) %{_libexecdir}/virt-login-shell-helper
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-admin.1*
 %{_mandir}/man1/virt-host-validate.1*
@@ -846,7 +997,9 @@ fi
 %{_datadir}/libvirt/schemas/capability.rng
 %{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domainbackup.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
+%{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
 %{_datadir}/libvirt/schemas/domainsnapshot.rng
 %{_datadir}/libvirt/schemas/interface.rng
diff --git a/libvirt-bash-completions-dir.patch b/libvirt-bash-completions-dir.patch
new file mode 100644
index 0000000..47af4d9
--- /dev/null
+++ b/libvirt-bash-completions-dir.patch
@@ -0,0 +1,24 @@
+--- libvirt-6.4.0/m4/virt-bash-completion.m4.orig	2019-11-26 22:17:34.576588169 +0100
++++ libvirt-6.4.0/m4/virt-bash-completion.m4	2020-06-21 11:00:05.173640478 +0200
+@@ -37,11 +37,12 @@
+     fi
+   fi
+ 
+-  LIBVIRT_CHECK_PKG([BASH_COMPLETION], [bash-completion], [2.0])
++  AM_CONDITIONAL([WITH_BASH_COMPLETION], [false])
+ 
+   if test "x$with_bash_completion" = "xyes" ; then
+     if test "x$with_bash_completions_dir" = "xcheck"; then
+       AC_MSG_CHECKING([for bash-completions directory])
++      LIBVIRT_CHECK_PKG([BASH_COMPLETION], [bash-completion], [2.0])
+       BASH_COMPLETIONS_DIR="$($PKG_CONFIG --variable=completionsdir bash-completion)"
+       AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
+ 
+@@ -59,6 +60,7 @@
+       AC_MSG_ERROR([bash-completions-dir must be used only with valid path])
+     else
+       BASH_COMPLETIONS_DIR=$with_bash_completions_dir
++      AM_CONDITIONAL([WITH_BASH_COMPLETION], [true])
+     fi
+     AC_SUBST([BASH_COMPLETIONS_DIR])
+   fi
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0f1b8af..81f9b91 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,58 +1,34 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/daemon/libvirtd.conf libvirt-2.5.0/daemon/libvirtd.conf
---- libvirt-2.5.0.orig/src/remote/libvirtd.conf	2016-06-27 16:12:20.000000000 +0200
-+++ libvirt-2.5.0/src/remote/libvirtd.conf	2016-12-20 12:56:04.000000000 +0100
-@@ -123,7 +123,7 @@
+--- libvirt-6.4.0/src/remote/libvirtd.conf.in.orig	2020-05-27 22:17:10.347644118 +0200
++++ libvirt-6.4.0/src/remote/libvirtd.conf.in	2020-06-21 10:22:08.342641796 +0200
+@@ -134,7 +134,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
--#          controlled from /etc/sasl2/libvirt.conf. For the TCP
-+#          controlled from /etc/sasl/libvirt.conf. For the TCP
+-#          controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
++#          controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -154,7 +154,7 @@
+@@ -166,7 +166,7 @@
  # If you don't enable SASL, then all TCP traffic is cleartext.
  # Don't do this outside of a dev/test scenario. For real world
  # use, always enable SASL and use the GSSAPI or DIGEST-MD5
--# mechanism in /etc/sasl2/libvirt.conf
-+# mechanism in /etc/sasl/libvirt.conf
+-# mechanism in @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
  #auth_tcp = "sasl"
  
  # 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-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
--sasldir = $(sysconfdir)/sasl2
-+sasldir = $(sysconfdir)/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 @@
+--- libvirt-6.4.0/docs/auth.html.in.orig	2020-06-11 07:49:02.932714864 +0200
++++ libvirt-6.4.0/docs/auth.html.in	2020-06-21 10:23:05.598998279 +0200
+@@ -275,7 +275,7 @@
      <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
- config change is rquired to enable plain password auth. This is done by
+ config change is required to enable plain password auth. This is done by
 -editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
 +editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
---- libvirt-3.5.0/docs/auth.html.orig	2017-08-01 17:26:35.217739874 +0200
-+++ libvirt-3.5.0/docs/auth.html	2017-08-01 17:29:16.164404704 +0200
-@@ -265,7 +265,7 @@
-         <p>
- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
- config change is rquired to enable plain password auth. This is done by
--editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
- parameter to <code>scram-sha-1</code>.
-     </p>
-         <p>
 diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/src/qemu/qemu.conf libvirt-2.5.0/src/qemu/qemu.conf
 --- libvirt-2.5.0.orig/src/qemu/qemu.conf	2016-11-29 10:47:58.000000000 +0100
 +++ libvirt-2.5.0/src/qemu/qemu.conf	2016-12-20 12:56:04.000000000 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/1c850183f2b7ab4bcef4eaa77041d5e968d3dda3



More information about the pld-cvs-commit mailing list