From f6b7ccc9f9e72c6492c7be37ff7da769081dc2cc Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 11 Sep 2018 01:58:06 +0200
Subject: gnu: spice: Update to 0.14.1 [fixes CVE-2018-10873].

* gnu/packages/spice.scm (spice): Update to 0.14.1.
[source](uri): Update to new "spice-server" subdirectory.
[native-inputs]: Add GLIB-NETWORKING and GSETTINGS-DESKTOP-SCHEMAS.
[arguments]: Remove configure-flag which is now off even when celt is
available.  Add phase to set $SSL_CERT_FILE.
---
 gnu/packages/spice.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index fc08a1dfdf..e708d726bb 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -177,15 +177,15 @@ (define-public spice-gtk
 (define-public spice
   (package
     (name "spice")
-    (version "0.14.0")
+    (version "0.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                 "https://www.spice-space.org/download/releases/"
-                "spice-" version ".tar.bz2"))
+                "spice-server/spice-" version ".tar.bz2"))
               (sha256
                (base32
-                "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"))))
+                "068mb9l7wzk4k4c65bzvpw5fyyzh81rb6z81skgdxvh67pk5vb8y"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("openssl" ,openssl)
@@ -202,12 +202,18 @@ (define-public spice
     (native-inputs
       `(("pkg-config" ,pkg-config)
         ("python" ,python)
-        ("spice-gtk" ,spice-gtk)))
+        ("spice-gtk" ,spice-gtk)
+
+        ;; These are needed for the server listen tests.
+        ("glib-networking" ,glib-networking)
+        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
     (arguments
       `(#:configure-flags
-        '("--disable-celt051" ; Disable support for unpackaged audio codec
-          "--enable-lz4"
-          "--enable-automated-tests")))
+        '("--enable-lz4"
+          "--enable-automated-tests")
+        #:phases (modify-phases %standard-phases
+                   (add-before 'check 'use-empty-ssl-cert-file
+                     (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t)))))
     (synopsis "Server implementation of the SPICE protocol")
     (description "SPICE is a remote display system built for virtual
 environments which allows you to view a computing 'desktop' environment
-- 
cgit v1.2.3