From patchwork Fri Feb 17 17:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47061 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 499E31688A; Fri, 17 Feb 2023 17:04:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8BFF016793 for ; Fri, 17 Feb 2023 17:04:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT484-0007MU-LM; Fri, 17 Feb 2023 12:02:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pT47e-0006oD-MP for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT47e-0000Mz-51 for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47e-00083h-0y for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 21/21] gnu: spice-gtk: Adjust the default file name of the ACL helper binary. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665331530816 (code B ref 61576); Fri, 17 Feb 2023 17:02:09 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:55 +0000 Received: from localhost ([127.0.0.1]:41380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT47O-00080r-RM for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:55 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:39922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT47B-0007wA-0G for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:41 -0500 Received: by mail-qt1-f174.google.com with SMTP id e26so1469401qtq.6 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+oX2dDQvVr/cGSU4pK5eHXWj23v5UGI9sK32a93X4z4=; b=Ki0wo6FwKrh8HCTL9Kb5XYMgnsJdb4D12dHCx4LeuT5KnfZimqXMRlmsdan9cyoXOs I/zkoPaeHBzv62ixLBilBbrFms6Kk7bds7ct97AB6rU9hhXWAt+HhCBE1veNK1is4ysf g0q2kbn67o5uBahNom6No4N+noShEq9Oc9U7w7Md6zkhzVBxfd5s7Hym4MHR2G85aF9J W9RYH6C4O5GLNrZN92XRatWvBTzs9KLuVvMm97H1LcoPeDaBLjj4DFU19mQajYf/3J0E EkvXROs3gKtbutcJBrezJwiENT7pYsrw4j5TnnAsyOSjeQXYyv2ziX7zkIyRPnRLcJCZ awDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+oX2dDQvVr/cGSU4pK5eHXWj23v5UGI9sK32a93X4z4=; b=u7lPMcIA4K1KPjFF18wCuhWnSc9bL1ZWLqP/cl6yusjSU8k673TEQWAyOucVs3dtKt Cn8a8AxVLPEha0ZizZ0ivs+AfqCBT+zYDRLf4dC/TWstGozClCjiVyFcJxrfH3ZhbdLG IKPKSVWN+v1aJtabGPoZ++QAW/egqaD+aFy3h84gtdjsYTbakMOZHxvFDDrnii73uhSH DkxkHrCIJ7ErnJCsNX3xRxheyO2yjtDqQ7mPUexPMj4q2tPYjUHm1N6MMpH0JAW6SLcZ 6HRXDaI42Gegvnq7hENbn6kp0v+IRuKyzS8DRdifWSN5IhkDX7qt7H42mGQSHwFCTCR9 8exg== X-Gm-Message-State: AO0yUKWy958jVIywd7/GdnLAB9rupE/a8RyLFQYlg80JQjGp4H2AX2Bp 38A5ld1phwDyfsnFhbVtIPCbJk5vTkSoWp/E X-Google-Smtp-Source: AK7set8vAbFyWDfysy8Yr3jlzq8i8bVXkflTs7xAtFop9tjIPsYOjRXV4SWVeq+WLaEy/6dj2ytngw== X-Received: by 2002:ac8:4d94:0:b0:3b9:beca:8d79 with SMTP id a20-20020ac84d94000000b003b9beca8d79mr1336034qtw.12.1676653300018; Fri, 17 Feb 2023 09:01:40 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:39 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:01:02 -0500 Message-Id: <20230217170103.10147-22-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/spice.scm (spice-gtk) [arguments]: Add adjust-default-acl-helper-path phase. --- gnu/packages/spice.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 62d1d50e5b..8d2bed38b2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -159,6 +159,16 @@ (define-public spice-gtk ((".*'session.c',.*") "") (("tests_sources \\+= 'cd-emu.c'" all) (string-append "# " all))))) + (add-after 'unpack 'adjust-default-acl-helper-path + (lambda _ + ;; The USB ACL helper used to allow USB redirection as a + ;; non-privileged user needs to be setuid, as configured by the + ;; gnome-desktop-service-type. A user can still change the + ;; location by specifying the SPICE_USB_ACL_BINARY environment + ;; variable. + (substitute* "src/usb-acl-helper.c" + (("ACL_HELPER_PATH\"/spice-client-glib-usb-acl-helper\"") + "\"/run/setuid-programs/spice-client-glib-usb-acl-helper\"")))) (add-before 'configure 'correct-polkit-dir (lambda _ (substitute* "meson.build"