diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-08-18 22:23:57 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-08-18 23:57:25 -0400 |
| commit | 7cb6f648b2486b0e6060a333564432a0830637de (patch) | |
| tree | be5152f2b7171f58bf9cfa8036536dccee8d810f /gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch | |
| parent | 2376963411a096aa0c8e77f27c4d1db1a9a7fa42 (diff) | |
| download | gnu-guix-7cb6f648b2486b0e6060a333564432a0830637de.tar gnu-guix-7cb6f648b2486b0e6060a333564432a0830637de.tar.gz | |
gnu: qemu: Update to 2.3.1. Add fix for CVE-2015-5745.
* gnu/packages/patches/qemu-CVE-2015-5745.patch: New file.
* gnu/packages/patches/qemu-CVE-2015-3456.patch,
gnu/packages/patches/qemu-CVE-2015-5154-pt1.patch,
gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch,
gnu/packages/patches/qemu-CVE-2015-5154-pt3.patch,
gnu/packages/patches/qemu-CVE-2015-5158.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Add new file and remove the deleted ones.
* gnu/packages/qemu.scm (qemu): Update to 2.3.1. Add new patch and remove the
deleted ones.
Diffstat (limited to 'gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch b/gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch deleted file mode 100644 index f860cfa3db..0000000000 --- a/gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From aa851d30acfbb9580098ac1dc82885530cb8b3c1 Mon Sep 17 00:00:00 2001 -From: Kevin Wolf <kwolf@redhat.com> -Date: Wed, 3 Jun 2015 14:17:46 +0200 -Subject: [PATCH 2/3] ide/atapi: Fix START STOP UNIT command completion - -The command must be completed on all code paths. START STOP UNIT with -pwrcnd set should succeed without doing anything. - -Signed-off-by: Kevin Wolf <kwolf@redhat.com> ---- - hw/ide/atapi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c -index 950e311..79dd167 100644 ---- a/hw/ide/atapi.c -+++ b/hw/ide/atapi.c -@@ -983,6 +983,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) - - if (pwrcnd) { - /* eject/load only happens for power condition == 0 */ -+ ide_atapi_cmd_ok(s); - return; - } - --- -1.8.3.1 - |