01/07: gnu: polkit: Incorporate security fix and remove replacement.

[guix-commits]

civodul pushed a commit to branch staging
in repository guix.

commit 69095cde82b2930ec9450f06aefcc7415524a615
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon May 9 15:16:03 2022 +0200

    gnu: polkit: Incorporate security fix and remove replacement.
    
    * gnu/packages/polkit.scm (polkit-mozjs)[replacement]: Remove.
    [source]: Add "polkit-CVE-2021-4034.patch".
    (polkit-mozjs/fixed): Remove.
---
 gnu/packages/polkit.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 1ae94be751..a544439fae 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -54,7 +54,6 @@
   (package
     (name "polkit")
     (version "0.120")
-    (replacement polkit-mozjs/fixed)
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -63,7 +62,8 @@
              (sha256
               (base32
                "00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf"))
-             (patches (search-patches "polkit-configure-elogind.patch"))
+             (patches (search-patches "polkit-configure-elogind.patch"
+                                      "polkit-CVE-2021-4034.patch"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -147,16 +147,6 @@ making process with respect to granting access to 
privileged operations
 for unprivileged applications.")
     (license lgpl2.0+)))
 
-(define-public polkit-mozjs/fixed
-  (package
-    (inherit polkit-mozjs)
-    (version "0.121")
-    (source (origin
-              (inherit (package-source polkit-mozjs))
-              (patches (cons (search-patch "polkit-CVE-2021-4034.patch")
-                             (origin-patches
-                              (package-source polkit-mozjs))))))))
-
 ;;; Variant of polkit built with Duktape, a lighter JavaScript engine compared
 ;;; to mozjs.
 (define-public polkit-duktape