aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-01-26 01:51:59 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-01-26 02:11:20 +0100
commit44118720c0f0af0b16ccdf5fd36f03a1ff0677ff (patch)
treee4a018bebc76a241762cc7b29f79c29dbac72221
parent98b49626d42dd18c3dcbc49a3f85790c3b1a25b7 (diff)
downloadguix-44118720c0f0af0b16ccdf5fd36f03a1ff0677ff.tar
guix-44118720c0f0af0b16ccdf5fd36f03a1ff0677ff.tar.gz
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.
-rw-r--r--gnu/packages/package-management.scm19
1 files 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 @@
#: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 @@ on top of GNU Guix.")
(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