From patchwork Sun Mar 7 21:23:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 27532 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4268627BC51; Sun, 7 Mar 2021 21:29:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F12E027BC50 for ; Sun, 7 Mar 2021 21:29:11 +0000 (GMT) Received: from localhost ([::1]:43156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJ0xb-000593-7N for patchwork@mira.cbaines.net; Sun, 07 Mar 2021 16:29:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJ0xS-00056h-TL for guix-patches@gnu.org; Sun, 07 Mar 2021 16:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJ0xS-0007gB-M8 for guix-patches@gnu.org; Sun, 07 Mar 2021 16:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJ0xS-000133-Je for guix-patches@gnu.org; Sun, 07 Mar 2021 16:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46995] [PATCH staging] gnu: polkit: Update to 0.118. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Mar 2021 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46995 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46995@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16151524983934 (code B ref -1); Sun, 07 Mar 2021 21:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2021 21:28:18 +0000 Received: from localhost ([127.0.0.1]:41651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJ0we-00011E-Ho for submit@debbugs.gnu.org; Sun, 07 Mar 2021 16:28:18 -0500 Received: from lists.gnu.org ([209.51.188.17]:43398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJ0wc-000116-Hf for submit@debbugs.gnu.org; Sun, 07 Mar 2021 16:28:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJ0wc-0004VT-BF for guix-patches@gnu.org; Sun, 07 Mar 2021 16:28:10 -0500 Received: from mail-mw2nam10olkn2101.outbound.protection.outlook.com ([40.92.42.101]:52480 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJ0wZ-0007SX-9y for guix-patches@gnu.org; Sun, 07 Mar 2021 16:28:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P178/THAUCG89KW2K4Su3B0Rb0cHEWKObv5JZ+0UtXfLY5rQduVduO5DP71+vVIxizmwQzAvjfiNJtRQM6yd5NKP1jWRPh6YqgmiX5q+yIF2H5rKdPwQ3q0BrRVWlBOard+G1HUz1tkYGME5juBB/92pIxbNc/IL+kKGTVuFXkRqXeU5r4+1bCyyDGHZZwAnFaIHQDvFda+GgRp8FijXAuS0Oxv6RXXvdHryD2nNOSWhnDY0zumLTHSMxiz1HGBe9REn4sj9PKlIYmd8mHSVHtedCuH6EySvTSDqqS/Czy6rKWga7du+OtfbkLOIVCg+6leQBPLXgjlWJacpNYHpCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O6K6JOZ+f76kWPDmSxGMyGnpXEgk5PC0a73aHO2NKnA=; b=m6Lf2rFyz/orv62tn1vmoXU+K6Cr5XxY6jLB7W1sIp7H4j2hp8dVFPqrUXxiCatWkB03dElv6XuVn8y4u/u9phyIzhQ/2esIPuBhFYlGVoMgxEC2mzALaRb50UnyfGbZX2AP/jqXBGh+FQt8r2PNXQvDSmUtAJpy+MdywWKt0zyv6hWlKEiPnwoIM7Z2OaEBMbRpFpbfywkOGT3oLt8cCDl/hz+ecycYd+NypSAwALEFNzXR7x3ofxdWgv5Gfrtke+SSBpuVxD8XjXkhbNfjkjWfPe7inilHK30l4s6t3GGY38OyUxlo0uctuwkIhHoXuxAC5Z2VIdr/CQj0+lWwPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O6K6JOZ+f76kWPDmSxGMyGnpXEgk5PC0a73aHO2NKnA=; b=PAnNc3Y7a2AyBJjMT70Pb7EozUnWoErrN4H7EzP2srzlTSoy7/zSDuJJii+vr0TVJmyrNZ2tVcsr1oqTj7t4jN1nTZPFRiNOboWr1hRUwYI9vxnLMyaAdRvXHuxhTvP2v2pAg+H7wRR2WelbsgmMHXHM9kAiXdvD+6z8lp0hMczu1oI1JHtWWGivBM3Qz9O6GwFcq/6Y11+27uWc+WwLhPpJFVOszDwSRUqewMZ2UUCeKaW87ySKk9Oe8PrQ6ie8oyN06kaEWp5E9N7VnbYZS1xKyXV0IZZv9O10zIS8qthMr6hF+BuHSc9AzK/0iVAxg/SJt45h6RP+2o310v037A== Received: from BN7NAM10FT041.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e8f::41) by BN7NAM10HT050.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e8f::453) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.25; Sun, 7 Mar 2021 21:28:04 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:7e8f::53) by BN7NAM10FT041.mail.protection.outlook.com (2a01:111:e400:7e8f::71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.25 via Frontend Transport; Sun, 7 Mar 2021 21:28:04 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8D143A4A3FAA6ADC5FDBEB15ED1FA1CCB92476420C95FF84ECC8C824A20547F8; UpperCasedChecksum:4A022D33318EFA1A7FF0E12D7B0D33D98ED935A1F722ACD4A97DAB99E7BE8A0A; SizeAsReceived:8398; Count:45 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::285e:b16b:c1cb:7374]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::285e:b16b:c1cb:7374%7]) with mapi id 15.20.3912.026; Sun, 7 Mar 2021 21:28:04 +0000 From: Morgan.J.Smith@outlook.com Date: Sun, 7 Mar 2021 16:23:51 -0500 Message-ID: X-Mailer: git-send-email 2.30.1 X-TMN: [J1Smdl/F1dhk7ER+Rbx+PYPi3IHuwTii] X-ClientProxiedBy: YTXPR0101CA0026.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00::39) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210307212350.7853-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (50.100.87.45) by YTXPR0101CA0026.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.26 via Frontend Transport; Sun, 7 Mar 2021 21:28:03 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f295ff03-b56e-4959-d790-08d8e1afe446 X-MS-Exchange-SLBlob-MailProps: VCKv1Cle4b3INLEjV/qCxYMdq6J0EM25OHWVGKAMjaCJP3zKjHV5ZnVe+t31Dd+4FxhUyMnM2fzRs9uHs4cwMD9PUQaNcRDaZsaEtOfc3hgRSGAmhGTD1fxBllV38udXU/j6QPMDwTK5LF7VBwRSa4OgtCa5HlKjziV6yxwtI0B8d5wcfGwNd+o3Vwob7JJqgRPP3nIOuFDkR73uGFLNRK/4iAe5in+RJ2+tzu2mpnFJi2t5oflj6X3tQEASwfE3AjvLRzIODZ97MTXIZworU988qJlySmDGhIa4Wbb5ItROEMPx5YBOSaJmLv4P0pzcNGG4+/N9y/7nXIokP2ehAp2oibprxMVTlUnwBGvmah37MhSnAmyu7IgYuQqyCTIVIlHREAB4q7rxWqkdJmZRW0SYXbJJvjXpxxst9d32wr1VVEUMcYwGyqNajFjHAtMf+e7C5r6uiLf10KPl15ROUz7mNlWL+VSjg87FnWY5Cew/fz5ofrv/9zr10SsfZ2XTuEzcrs1dhn//GmpGD0y1t1dYmUBNNmAYRwIS5DMkQbvTAT47/lzacRsdXJF6IBUKeFjNN9QDV2C+XUm1tTv/dFhjvu6aDBij32Au1MwLsr15xgSgx/8QlD4Dkdg84J2WvriVSf5ygQ+VKcRXPdqG4In9Td89ww1zeqcKcbPwv9Z9lzt5ebsbDnEwO+DQHrJ+tfjgK6AJsu+WOr2F/OiQscI1wmJ3YhSd/e166IN39o/JT+5f12sGbkvRJulAqqiwXK6Fh/I/DmJtuMO3FYamWLJwyW3ho39hWF9S2zxl/Ovjxq0BSVdzYdJEsk/SlJn50tU+iDFe5whemLuXte6CgynSO+eCl+A9qZuYK98djQY4EkZ+OZkN0AGWwkEiQGxf8uUPzm8u57bcJZXJ7wUGjN87XEIwI8CnynVvLljjj23RBnISbwThUfkWALKfhWCbhKlWO1ksO2zA2Emjl7U1RqoZOMFDqHHk4LXE097MJTjhNAEDdwpCPOLGjtiRl/AcMJonjQAJBKVxPzpau4do8fwqnM//iZ/3TpIDTS64lmw= X-MS-TrafficTypeDiagnostic: BN7NAM10HT050: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tp4hoxpgBecostZU+hqGpWxOq3PZ3I6yJricDrnTGVrf4PNsN6v1CCTmsLb+bgYYHfU1v7bwnvIKLWm7IhZ6vPtZFJq2bR1udZaA2VOQ/1d/FLKehC3ngbIAwb6uFt9ivigg1F7m6M5WzwjKm17267KYggOI8g+4epkIj1vG2a6g0Z57HFqtQfzLMOGbka+uVe5El9w5YjmTpMuhp5zVp5RHfrInkN3XdjMA5qkbjA7d/KwfEcnG6qGZttesqce9gJWL76Ui0IbqLjEeypfh1BNybXYEGUNG5OX2CC8smvUoi+A44LjyoUvCFvQZVxHUuxi1t78LPBPp40FdAGCxCznGcUxFa8DATPrq4I/BzA8tvU9IuaC9guRzGrI6zcusSYDLI59YiT3PquDCJe/jkPKRQ8JOuFotf7TVHk+IW1k= X-MS-Exchange-AntiSpam-MessageData: 2usHhebGcJK57Gf0qTXXqBdehElHkHKAICqg0kE/f5y+odrAxHsrWbn9edD63L8/UJTKfc1o5CrYc1UrkTBOlHf/TzenbFVLVtw8xspwhQv9qI1QvxG/+fP7eMvavy3eZdTTSL/155pMgvo9dzu0JQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f295ff03-b56e-4959-d790-08d8e1afe446 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2021 21:28:04.0598 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN7NAM10FT041.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7NAM10HT050 Received-SPF: pass client-ip=40.92.42.101; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/polkit.scm (polkit): Update to 0.118. [origin]: Update url and remove libsystemd-login substitution [inputs]: Update mozjs-60 to mozjs-78 [native-inputs]: Add libxslt and docbook-xsl for manpage generation [arguments]: Add phase to fix manpage generation --- I think this belongs in the staging branch. I'm really not sure. Also I'm not sure how to test packages that go in a system configuration without risking my system, so I didn't test this at all. The only reason I decided to package this was because the previous package didn't have man pages. The libsystemd-login substitution was removed because the configure script seems to have good automatic detection. --- gnu/packages/polkit.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index d868aceec2..1a705712a9 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Huang Ying ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ (define-module (gnu packages polkit) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) + #:use-module (gnu packages docbook) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages linux) #:use-module (gnu packages nss) @@ -43,15 +45,15 @@ (define-module (gnu packages polkit) (define-public polkit (package (name "polkit") - (version "0.116") + (version "0.118") (source (origin (method url-fetch) (uri (string-append - "https://www.freedesktop.org/software/polkit/releases/" + "https://gitlab.freedesktop.org/polkit/polkit/releases/" name "-" version ".tar.gz")) (sha256 (base32 - "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8")) + "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d")) (modules '((guix build utils))) (snippet '(begin @@ -60,18 +62,6 @@ (define-public polkit (substitute* "test/Makefile.in" (("SUBDIRS = mocklibc . polkit polkitbackend") "SUBDIRS = mocklibc . polkit")) - (substitute* "configure" - ;; Replace libsystemd-login with libelogind. - (("libsystemd-login") "libelogind") - ;; Skip the sanity check that the current system runs - ;; systemd. - (("test ! -d /sys/fs/cgroup/systemd/") "false")) - (substitute* "src/polkit/polkitunixsession-systemd.c" - (("systemd") "elogind")) - (substitute* "src/polkitbackend/polkitbackendsessionmonitor-systemd.c" - (("systemd") "elogind")) - (substitute* "src/polkitbackend/polkitbackendjsauthority.cpp" - (("systemd") "elogind")) ;; Guix System's polkit service stores actions under ;; /etc/polkit-1/actions. @@ -89,7 +79,7 @@ (define-public polkit `(("expat" ,expat) ("linux-pam" ,linux-pam) ("elogind" ,elogind) - ("mozjs" ,mozjs-60) + ("mozjs" ,mozjs-78) ("nspr" ,nspr))) (propagated-inputs `(("glib" ,glib))) ; required by polkit-gobject-1.pc @@ -97,7 +87,9 @@ (define-public polkit `(("pkg-config" ,pkg-config) ("glib:bin" ,glib "bin") ; for glib-mkenums ("intltool" ,intltool) - ("gobject-introspection" ,gobject-introspection))) + ("gobject-introspection" ,gobject-introspection) + ("libxslt" ,libxslt) ; for man page generation + ("docbook-xsl" ,docbook-xsl))) ; for man page generation (arguments `(#:configure-flags '("--sysconfdir=/etc" "--enable-man-pages") @@ -113,6 +105,15 @@ (define-public polkit (("@INTROSPECTION_TYPELIBDIR@") (string-append out "/lib/girepository-1.0/"))) #t))) + (add-after 'unpack 'fix-manpage-generation + (lambda* (#:key inputs #:allow-other-keys) + (let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in") + (("http://docbook.sourceforge.net/release/xsl/current") + xsldoc))) + #t)) (replace 'install (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)