From bcdee2dc336439de5bc90b2712d83ecc865c45d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 5 Aug 2018 13:00:12 +0200 Subject: gnu: polkit: Update to 0.115 [fixes CVE-2018-1116]. * gnu/packages/polkit.scm (polkit): Update to 0.115. [origin]: Adjust snippet. [inputs]: Replace mozjs with mozjs-52. * gnu/packages/patches/polkit-drop-test.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. (cherry picked from commit 50afd712312a4b9fa42d7f9d03464e542b3aeb75) Signed-off-by: Marius Bakke --- gnu/packages/polkit.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/polkit.scm') diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index a3dbc4ff79..7cc5205faa 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Huang Ying ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,7 +43,7 @@ (define-public polkit (package (name "polkit") - (version "0.113") + (version "0.115") (source (origin (method url-fetch) (uri (string-append @@ -50,12 +51,15 @@ name "-" version ".tar.gz")) (sha256 (base32 - "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71")) - (patches (search-patches "polkit-drop-test.patch")) + "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg")) (modules '((guix build utils))) (snippet '(begin (use-modules (guix build utils)) + ;; Disable broken test. + (substitute* "test/Makefile.in" + (("SUBDIRS = mocklibc . polkit polkitbackend") + "SUBDIRS = mocklibc . polkit")) (substitute* "configure" ;; Replace libsystemd-login with libelogind. (("libsystemd-login") "libelogind") @@ -66,7 +70,7 @@ (("systemd") "elogind")) (substitute* "src/polkitbackend/polkitbackendsessionmonitor-systemd.c" (("systemd") "elogind")) - (substitute* "src/polkitbackend/polkitbackendjsauthority.c" + (substitute* "src/polkitbackend/polkitbackendjsauthority.cpp" (("systemd") "elogind")) ;; GuixSD's polkit service stores actions under @@ -85,7 +89,7 @@ `(("expat" ,expat) ("linux-pam" ,linux-pam) ("elogind" ,elogind) - ("mozjs" ,mozjs) + ("mozjs" ,mozjs-52) ("nspr" ,nspr))) (propagated-inputs `(("glib" ,glib))) ; required by polkit-gobject-1.pc -- cgit v1.2.3