import libvirt-dbus-1.3.0-2.module+el8.3.0+6423+e4cb6418

This commit is contained in:
CentOS Sources 2020-07-28 07:00:58 -04:00 committed by Stepan Oksanichenko
parent 97901ea311
commit a664a3090c
4 changed files with 15 additions and 52 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libvirt-dbus-1.2.0.tar.xz SOURCES/libvirt-dbus-1.3.0.tar.xz

View File

@ -1 +1 @@
6a7f476bc8343256e69f34642df6070be4e37b6c SOURCES/libvirt-dbus-1.2.0.tar.xz 14e62f4491467874deac075f247a1f1c2db5ca1c SOURCES/libvirt-dbus-1.3.0.tar.xz

View File

@ -1,44 +0,0 @@
From 68b2ff91b88fd2588db1770addab2f2ccf5a1aa8 Mon Sep 17 00:00:00 2001
Message-Id: <68b2ff91b88fd2588db1770addab2f2ccf5a1aa8@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 7 Jan 2019 14:12:15 +0100
Subject: [PATCH] util: fix virtDBusUtilDecodeUUID
This function is supposed to convert ASCII character into its hex
representation, however the current implementation was wrong because
the first comparison would be false for all printable characters. In
most cases it worked but for example '$' which is 0x24 in HEX would be
incorrectly converted to 0x2[ which is obviously wrong.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1647823
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit f70ba7cb4dc08052f025f0217cc54a2ff36bc69d)
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
src/util.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/util.c b/src/util.c
index 8c822f2..31ee959 100644
--- a/src/util.c
+++ b/src/util.c
@@ -182,11 +182,12 @@ virtDBusUtilDecodeUUID(const gchar *uuid)
}
static guchar
-virtDBusUtilNumToHexchar(const guchar c)
+virtDBusUtilNumToHexchar(const guchar n)
{
+ guchar c = n & 0x0f;
if (c < 10)
return '0' + c;
- return 'a' + (c & 0x0f) - 10;
+ return 'a' + c - 10;
}
static guchar
--
2.20.1

View File

@ -6,14 +6,12 @@
%global system_user libvirtdbus %global system_user libvirtdbus
Name: libvirt-dbus Name: libvirt-dbus
Version: 1.2.0 Version: 1.3.0
Release: 3%{?dist}%{?extra_release} Release: 2%{?dist}%{?extra_release}
Summary: libvirt D-Bus API binding Summary: libvirt D-Bus API binding
License: LGPLv2+ License: LGPLv2+
URL: https://libvirt.org/ URL: https://libvirt.org/
Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz
Patch1: libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch
BuildRequires: git BuildRequires: git
BuildRequires: gcc BuildRequires: gcc
@ -35,7 +33,12 @@ Requires(pre): shadow-utils
This package provides D-Bus API for libvirt This package provides D-Bus API for libvirt
%prep %prep
%autosetup -S git %autosetup -S git_am -N
git config gc.auto 0
%autopatch
%build %build
%configure %configure
@ -54,7 +57,7 @@ exit 0
%files %files
%doc README.md HACKING.md AUTHORS NEWS %doc README.md HACKING.md AUTHORS NEWS
%license COPYING %license COPYING
%{_bindir}/libvirt-dbus %{_sbindir}/libvirt-dbus
%{_datadir}/dbus-1/services/org.libvirt.service %{_datadir}/dbus-1/services/org.libvirt.service
%{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system-services/org.libvirt.service
%{_datadir}/dbus-1/system.d/org.libvirt.conf %{_datadir}/dbus-1/system.d/org.libvirt.conf
@ -63,6 +66,10 @@ exit 0
%{_mandir}/man8/libvirt-dbus.8* %{_mandir}/man8/libvirt-dbus.8*
%changelog %changelog
* Mon Apr 27 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.3.0
- Resolves: bz#1810193
(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
* Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com> - 1.2.0-3 * Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com> - 1.2.0-3
- Rebuild all virt packages to fix RHEL's upgrade path - Rebuild all virt packages to fix RHEL's upgrade path
- Resolves: rhbz#1695587 - Resolves: rhbz#1695587