diff --git a/check-for-disk-type-correctly.patch b/check-for-disk-type-correctly.patch deleted file mode 100644 index 1ee4a3d..0000000 --- a/check-for-disk-type-correctly.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3918dbd84e4951b43f93fbf50ef52be00274850c Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -Date: Mon, 9 Mar 2020 16:40:57 +0100 -Subject: [PATCH] virDomainDiskTranslateSourcePool: Check for disk type - correctly - -When rewriting the virDomainDiskTranslateSourcePool() function in -v6.1.0-rc1~184 a typo was introduced. Previously, we allowed -startup policy only for those volumes which translated to -VIR_STORAGE_TYPE_FILE. But starting with the referenced commit, -the value we checked for was changed to VIR_STORAGE_VOL_FILE -which comes from a different enum and has a different value too. -This is wrong, because virStorageSourceGetActualType() returns a -value from the original enum. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1811728 - -Signed-off-by: Michal Privoznik -Reviewed-by: Peter Krempa ---- - src/conf/domain_conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c -index d8471acd2d..d2d97daf80 100644 ---- a/src/conf/domain_conf.c -+++ b/src/conf/domain_conf.c -@@ -31856,7 +31856,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) - } - - if (def->startupPolicy != 0 && -- virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) { -+ virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'startupPolicy' is only valid for " - "'file' type volume")); --- -2.25.1 - diff --git a/libvirt.spec b/libvirt.spec index c9f33aa..fffe156 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -217,8 +217,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 6.1.0 -Release: 2%{?dist} +Version: 6.2.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -226,7 +226,6 @@ URL: https://libvirt.org/ %define mainturl stable_updates/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -Patch0001: check-for-disk-type-correctly.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1974,6 +1973,9 @@ exit 0 %changelog +* Thu Apr 02 2020 Cole Robinson - 6.2.0-1 +- Update to version 6.2.0 + * Tue Mar 24 2020 Felipe Borges - 6.1.0-2 - Check for disk type correctly in virDomainDiskTranslateSourcePool diff --git a/sources b/sources index d16f7e2..40b80dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-6.1.0.tar.xz) = 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606 +SHA512 (libvirt-6.2.0.tar.xz) = 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4