From 3c07904ee988718271ee132f41a539ea368f699c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 06:55:07 -0500 Subject: [PATCH] import libvirt-dbus-1.3.0-2.module+el8.3.0+6423+e4cb6418 --- .gitignore | 2 +- .libvirt-dbus.metadata | 2 +- ...dbus-util-fix-virtDBusUtilDecodeUUID.patch | 44 ------------------- SPECS/libvirt-dbus.spec | 19 +++++--- 4 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 SOURCES/libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch diff --git a/.gitignore b/.gitignore index e463050..06f7b7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvirt-dbus-1.2.0.tar.xz +SOURCES/libvirt-dbus-1.3.0.tar.xz diff --git a/.libvirt-dbus.metadata b/.libvirt-dbus.metadata index 6e57f86..6bf403d 100644 --- a/.libvirt-dbus.metadata +++ b/.libvirt-dbus.metadata @@ -1 +1 @@ -6a7f476bc8343256e69f34642df6070be4e37b6c SOURCES/libvirt-dbus-1.2.0.tar.xz +14e62f4491467874deac075f247a1f1c2db5ca1c SOURCES/libvirt-dbus-1.3.0.tar.xz diff --git a/SOURCES/libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch b/SOURCES/libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch deleted file mode 100644 index cdd7a90..0000000 --- a/SOURCES/libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 68b2ff91b88fd2588db1770addab2f2ccf5a1aa8 Mon Sep 17 00:00:00 2001 -Message-Id: <68b2ff91b88fd2588db1770addab2f2ccf5a1aa8@dist-git> -From: Pavel Hrdina -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 -(cherry picked from commit f70ba7cb4dc08052f025f0217cc54a2ff36bc69d) -Reviewed-by: Andrea Bolognani -Signed-off-by: Pavel Hrdina ---- - 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 - diff --git a/SPECS/libvirt-dbus.spec b/SPECS/libvirt-dbus.spec index 29e6e18..6698f53 100644 --- a/SPECS/libvirt-dbus.spec +++ b/SPECS/libvirt-dbus.spec @@ -6,14 +6,12 @@ %global system_user libvirtdbus Name: libvirt-dbus -Version: 1.2.0 -Release: 3%{?dist}%{?extra_release} +Version: 1.3.0 +Release: 2%{?dist}%{?extra_release} Summary: libvirt D-Bus API binding License: LGPLv2+ URL: https://libvirt.org/ Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz -Patch1: libvirt-dbus-util-fix-virtDBusUtilDecodeUUID.patch - BuildRequires: git BuildRequires: gcc @@ -35,7 +33,12 @@ Requires(pre): shadow-utils This package provides D-Bus API for libvirt %prep -%autosetup -S git +%autosetup -S git_am -N + +git config gc.auto 0 + +%autopatch + %build %configure @@ -54,7 +57,7 @@ exit 0 %files %doc README.md HACKING.md AUTHORS NEWS %license COPYING -%{_bindir}/libvirt-dbus +%{_sbindir}/libvirt-dbus %{_datadir}/dbus-1/services/org.libvirt.service %{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system.d/org.libvirt.conf @@ -63,6 +66,10 @@ exit 0 %{_mandir}/man8/libvirt-dbus.8* %changelog +* Mon Apr 27 2020 Danilo C. L. de Paula - 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 - 1.2.0-3 - Rebuild all virt packages to fix RHEL's upgrade path - Resolves: rhbz#1695587