From b5b610af5d6e5bd72381f79f526fa38d411686e0 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 8 Aug 2018 11:50:00 -0400
Subject: gnu: lxc: Fix CVE-2018-6556.

* gnu/packages/patches/lxc-CVE-2018-6556.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/virtualization.scm (lxc)[source]: Use it.
---
 gnu/packages/virtualization.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages/virtualization.scm')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index e4120de38f..192d599a3d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -347,6 +347,7 @@ (define-public lxc
               (uri (string-append
                     "https://linuxcontainers.org/downloads/lxc/lxc-"
                     version ".tar.gz"))
+              (patches (search-patches "lxc-CVE-2018-6556.patch"))
               (sha256
                (base32
                 "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625"))))
-- 
cgit v1.2.3


From a066680e20840fba11e0cfb107584013decaf4d6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 4 Aug 2018 14:07:01 +0200
Subject: gnu: qemu: Update to 2.12.1.

* gnu/packages/virtualization.scm (qemu): Update to 2.12.1.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/virtualization.scm')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 192d599a3d..8e7eded5e1 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -94,7 +94,7 @@ (define (qemu-patch commit file-name sha256)
 (define-public qemu
   (package
     (name "qemu")
-    (version "2.12.0")
+    (version "2.12.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.qemu.org/qemu-"
@@ -102,7 +102,7 @@ (define-public qemu
              (patches (search-patches "qemu-CVE-2018-11806.patch"))
              (sha256
               (base32
-               "1z66spkm1prvhbq7h5mfnp0i6mmamsb938fqmdfvyrgzc7rh34z6"))))
+               "0krnp2wvggpchc7fdlmyasqy7j17baz8asr2g05x0v00w003hn1k"))))
     (build-system gnu-build-system)
     (arguments
      '(;; Running tests in parallel can occasionally lead to failures, like:
-- 
cgit v1.2.3