Rebased to version 1.2.18.2
disk backend is not removed properly when disk frontent hotplug fails (bz #1265968) Fix TPM cancel path on newer kernels (bz #1244895) Remove timeout for libvirt-guests.service (bz #1195544) CVE-2015-5313 libvirt: filesystem storage volume names path traversal flaw (bz #1291433) Fix VM names with non-ascii (bz #1062943) Fix backwards migration with graphics listen address (bz #1276883)
This commit is contained in:
parent
e9afe9ad5c
commit
8cbc8bc355
|
@ -1,37 +0,0 @@
|
||||||
From: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Date: Mon, 28 Sep 2015 19:47:09 -0400
|
|
||||||
Subject: [PATCH] qemu: Fix dynamic_ownership qemu.conf setting
|
|
||||||
|
|
||||||
Commit 307fb904 (Sep 10) added a 'privileged' variable when creating
|
|
||||||
the DAC driver:
|
|
||||||
|
|
||||||
@@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
|
|
||||||
bool defaultConfined,
|
|
||||||
bool requireConfined,
|
|
||||||
bool dynamicOwnership,
|
|
||||||
+ bool privileged,
|
|
||||||
virSecurityManagerDACChownCallback chownCallback)
|
|
||||||
|
|
||||||
But argument order is mixed up at the caller, swapping dynamicOwnership
|
|
||||||
and privileged values. This corrects the argument order
|
|
||||||
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1266628
|
|
||||||
(cherry picked from commit 68572de8228e3971174a83c227fcb018d6f684c7)
|
|
||||||
---
|
|
||||||
src/qemu/qemu_driver.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
||||||
index a38e776..fda9cd9 100644
|
|
||||||
--- a/src/qemu/qemu_driver.c
|
|
||||||
+++ b/src/qemu/qemu_driver.c
|
|
||||||
@@ -430,8 +430,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
|
|
||||||
cfg->allowDiskFormatProbing,
|
|
||||||
cfg->securityDefaultConfined,
|
|
||||||
cfg->securityRequireConfined,
|
|
||||||
- virQEMUDriverIsPrivileged(driver),
|
|
||||||
cfg->dynamicOwnership,
|
|
||||||
+ virQEMUDriverIsPrivileged(driver),
|
|
||||||
qemuSecurityChownCallback)))
|
|
||||||
goto error;
|
|
||||||
if (!stack) {
|
|
|
@ -1,45 +0,0 @@
|
||||||
From: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Date: Tue, 22 Sep 2015 15:56:50 -0400
|
|
||||||
Subject: [PATCH] spec: Fix some warnings with latest rpmbuild
|
|
||||||
|
|
||||||
$ rpmbuild -ba libvirt.spec
|
|
||||||
warning: Macro expanded in comment on line 5: # If neither fedora nor rhel was defined, try to guess them from %{dist}
|
|
||||||
|
|
||||||
warning: Macro %enable_autotools defined but not used within scope
|
|
||||||
warning: Macro %client_only defined but not used within scope
|
|
||||||
...
|
|
||||||
|
|
||||||
(cherry picked from commit dae1250b24404f7f21e7bd8aeeb304565d175de4)
|
|
||||||
---
|
|
||||||
libvirt.spec.in | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libvirt.spec.in b/libvirt.spec.in
|
|
||||||
index 2acb01b..62dfecd 100644
|
|
||||||
--- a/libvirt.spec.in
|
|
||||||
+++ b/libvirt.spec.in
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
# This spec file assumes you are building for Fedora 13 or newer,
|
|
||||||
# or for RHEL 5 or newer. It may need some tweaks for other distros.
|
|
||||||
-# If neither fedora nor rhel was defined, try to guess them from %{dist}
|
|
||||||
+# If neither fedora nor rhel was defined, try to guess them from dist
|
|
||||||
%if !0%{?rhel} && !0%{?fedora}
|
|
||||||
%{expand:%(echo "%{?dist}" | \
|
|
||||||
sed -ne 's/^\.el\([0-9]\+\).*/%%define rhel \1/p')}
|
|
||||||
@@ -13,13 +13,13 @@
|
|
||||||
# Default to skipping autoreconf. Distros can change just this one line
|
|
||||||
# (or provide a command-line override) if they backport any patches that
|
|
||||||
# touch configure.ac or Makefile.am.
|
|
||||||
-%{!?enable_autotools:%define enable_autotools 0}
|
|
||||||
+%{!?enable_autotools:%global enable_autotools 0}
|
|
||||||
|
|
||||||
# A client only build will create a libvirt.so only containing
|
|
||||||
# the generic RPC driver, and test driver and no libvirtd
|
|
||||||
# Default to a full server + client build, but with the possibility
|
|
||||||
# of a command-line or ~/.rpmmacros override for client-only.
|
|
||||||
-%{!?client_only:%define client_only 0}
|
|
||||||
+%{!?client_only:%global client_only 0}
|
|
||||||
|
|
||||||
# Now turn off server build in certain cases
|
|
||||||
|
|
21
libvirt.spec
21
libvirt.spec
|
@ -377,8 +377,8 @@
|
||||||
|
|
||||||
Summary: Library providing a simple virtualization API
|
Summary: Library providing a simple virtualization API
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Version: 1.2.18.1
|
Version: 1.2.18.2
|
||||||
Release: 2%{?dist}%{?extra_release}
|
Release: 1%{?dist}%{?extra_release}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
|
@ -389,11 +389,6 @@ URL: http://libvirt.org/
|
||||||
%endif
|
%endif
|
||||||
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
|
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
|
||||||
|
|
||||||
# Fix qemu.conf dynamic_ownership=0 (bz #1266628)
|
|
||||||
Patch0001: 0001-qemu-Fix-dynamic_ownership-qemu.conf-setting.patch
|
|
||||||
# Fix some spec file warnings
|
|
||||||
Patch0002: 0002-spec-Fix-some-warnings-with-latest-rpmbuild.patch
|
|
||||||
|
|
||||||
%if %{with_libvirtd}
|
%if %{with_libvirtd}
|
||||||
Requires: libvirt-daemon = %{version}-%{release}
|
Requires: libvirt-daemon = %{version}-%{release}
|
||||||
%if %{with_network}
|
%if %{with_network}
|
||||||
|
@ -1261,6 +1256,7 @@ if [ $COUNT -gt 0 ]; then
|
||||||
fi
|
fi
|
||||||
echo "Applied $COUNT patches"
|
echo "Applied $COUNT patches"
|
||||||
rm -f $PATCHLIST
|
rm -f $PATCHLIST
|
||||||
|
rm -rf .git
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if ! %{with_xen}
|
%if ! %{with_xen}
|
||||||
|
@ -2335,6 +2331,17 @@ exit 0
|
||||||
%doc examples/systemtap
|
%doc examples/systemtap
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 23 2015 Cole Robinson <crobinso@redhat.com> - 1.2.18.2-1
|
||||||
|
- Rebased to version 1.2.18.2
|
||||||
|
- disk backend is not removed properly when disk frontent hotplug fails (bz
|
||||||
|
#1265968)
|
||||||
|
- Fix TPM cancel path on newer kernels (bz #1244895)
|
||||||
|
- Remove timeout for libvirt-guests.service (bz #1195544)
|
||||||
|
- CVE-2015-5313 libvirt: filesystem storage volume names path traversal flaw
|
||||||
|
(bz #1291433)
|
||||||
|
- Fix VM names with non-ascii (bz #1062943)
|
||||||
|
- Fix backwards migration with graphics listen address (bz #1276883)
|
||||||
|
|
||||||
* Tue Oct 06 2015 Cole Robinson <crobinso@redhat.com> - 1.2.18.1-2
|
* Tue Oct 06 2015 Cole Robinson <crobinso@redhat.com> - 1.2.18.1-2
|
||||||
- Fix qemu.conf dynamic_ownership=0 (bz #1266628)
|
- Fix qemu.conf dynamic_ownership=0 (bz #1266628)
|
||||||
- Fix some spec file warnings
|
- Fix some spec file warnings
|
||||||
|
|
Loading…
Reference in New Issue