From 44118720c0f0af0b16ccdf5fd36f03a1ff0677ff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 26 Jan 2018 01:51:59 +0100
Subject: gnu: gcab: Update to 1.0 [fixes CVE-2018-5345].

* gnu/packages/package-management.scm (gcab): Update to 1.0.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add glib:bin and vala.
[arguments]: Don't build developer documentation.
Disable introspection, thanks.
---
 gnu/packages/package-management.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index a890dca403..3b7dfe7d2e 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -61,6 +61,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system emacs)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -811,21 +812,29 @@ (define-public gwl
 (define-public gcab
   (package
     (name "gcab")
-    (version "0.7")
+    (version "1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
                                   version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1"))))
-    (build-system gnu-build-system)
+                "1ji8j8pnxqaycbp9ydi2zq7gcr02c2vw4qnc198i6jwy9zkh2x19"))))
+    (build-system meson-build-system)
     (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+     `(("glib:bin" ,glib "bin")         ; for glib-mkenums
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
     (inputs
      `(("glib" ,glib)
        ("zlib" ,zlib)))
+    (arguments
+     `(#:configure-flags
+       ;; XXX This ‘documentation’ is for developers, and fails informatively:
+       ;; Error in gtkdoc helper script: 'gtkdoc-mkhtml' failed with status 5
+       (list "-Ddocs=false"
+             "-Dintrospection=false")))
     (home-page "https://wiki.gnome.org/msitools") ; no dedicated home page
     (synopsis "Microsoft Cabinet file manipulation library")
     (description
-- 
cgit v1.2.3