rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typo causing qemu-img to link against entire world (bz #1260996)

Browse Source
This commit is contained in:
Daniel P. Berrange 2015-09-08 12:42:50 +01:00
parent ab42d9f7d6
commit ba1746053e
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0007-fix-quorum-libs.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rup qemu-2.3.1/configure qemu-2.3.1.new/configure
--- qemu-2.3.1/configure 2015-08-11 20:19:07.000000000 +0100
+++ qemu-2.3.1.new/configure 2015-09-08 12:40:44.694091584 +0100
@@ -2323,7 +2323,7 @@ quorum_tls_libs=`$pkg_config --libs gnut
if compile_prog "$quorum_tls_cflags" "$quorum_tls_libs" ; then
qcow_tls=yes
libs_softmmu="$quorum_tls_libs $libs_softmmu"
- libs_tools="$quorum_tls_libs $libs_softmmu"
+ libs_tools="$quorum_tls_libs $libs_tools"
QEMU_CFLAGS="$QEMU_CFLAGS $quorum_tls_cflags"
quorum="yes"
else

7
qemu.spec
View File

@ -43,7 +43,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 2.3.1
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
Group: Development/Tools
@ -87,6 +87,8 @@ Patch0005: 0005-virtio-serial-fix-ANY_LAYOUT.patch
# CVE-2015-5255: heap memory corruption in vnc_refresh_server_surface
# (bz #1255899)
Patch0006: 0006-vnc-fix-memory-corruption-CVE-2015-5225.patch
# Fix typo causing qemu-img to link against entire world (rhbz #1260996)
Patch0007: 0007-fix-quorum-libs.patch
BuildRequires: SDL2-devel
BuildRequires: zlib-devel
@ -1189,6 +1191,9 @@ getent passwd qemu >/dev/null || \
%changelog
* Tue Sep 8 2015 Daniel P. Berrange <berrange@redhat.com> - 2:2.3.1-3
- Fix typo causing qemu-img to link against entire world (bz #1260996)
* Mon Aug 31 2015 Cole Robinson <crobinso@redhat.com> - 2:2.3.1-2
- CVE-2015-5255: heap memory corruption in vnc_refresh_server_surface (bz
#1255899)