a3fa63d2ce
CVE-2015-6815: net: e1000: infinite loop issue (bz #1260225) CVE-2015-6855: ide: divide by zero issue (bz #1261793) CVE-2015-5278: Infinite loop in ne2000_receive() (bz #1263284) CVE-2015-5279: Heap overflow vulnerability in ne2000_receive() (bz #1263287) Make block copy more stable (bz #1264416) Fix hang at start of live merge for large images (bz #1262901)
31 lines
992 B
Diff
31 lines
992 B
Diff
From: Cole Robinson <crobinso@redhat.com>
|
|
Date: Tue, 8 Sep 2015 12:43:59 -0400
|
|
Subject: [PATCH] Fix typo causing qemu-img to link against entire world (rhbz
|
|
#1260996)
|
|
|
|
This is a minimal fix that's not upstream in this form. Upstream was
|
|
accidentally fixed with:
|
|
|
|
commit 488981a4af396551a3178d032cc2b41d9553ada2
|
|
Author: Daniel P. Berrange <berrange@redhat.com>
|
|
Date: Wed Jul 1 18:10:35 2015 +0100
|
|
|
|
block: convert quorum blockdrv to use crypto APIs
|
|
---
|
|
configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 6969f6f..adbe117 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2323,7 +2323,7 @@ quorum_tls_libs=`$pkg_config --libs gnutls 2> /dev/null`
|
|
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
|