From patchwork Thu Apr 30 13:46:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21771 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 DD21A27BBE4; Thu, 30 Apr 2020 14:59:07 +0100 (BST) 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, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 701C127BBE1 for ; Thu, 30 Apr 2020 14:59:07 +0100 (BST) Received: from localhost ([::1]:51852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU9iU-0002Rb-QS for patchwork@mira.cbaines.net; Thu, 30 Apr 2020 09:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51416) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU9Zk-0002Rw-Io for guix-patches@gnu.org; Thu, 30 Apr 2020 09:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU9Zj-000855-NS for guix-patches@gnu.org; Thu, 30 Apr 2020 09:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU9Zi-00084v-HQ for guix-patches@gnu.org; Thu, 30 Apr 2020 09:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jU9Zi-0004Fw-FN for guix-patches@gnu.org; Thu, 30 Apr 2020 09:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40982] gnu: spacefm: Fix privilege and disk management. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 13:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40982 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40982@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158825459716331 (code B ref -1); Thu, 30 Apr 2020 13:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2020 13:49:57 +0000 Received: from localhost ([127.0.0.1]:45540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU9Zd-0004FL-Ht for submit@debbugs.gnu.org; Thu, 30 Apr 2020 09:49:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:51546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU9ZY-0004F9-Jp for submit@debbugs.gnu.org; Thu, 30 Apr 2020 09:49:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51112) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU9ZC-0001b0-5m for guix-patches@gnu.org; Thu, 30 Apr 2020 09:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU9Wo-0007VV-2X for guix-patches@gnu.org; Thu, 30 Apr 2020 09:49:29 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33012) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jU9Wn-0007Or-AA for guix-patches@gnu.org; Thu, 30 Apr 2020 09:47:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D4EE52B2C8 for ; Thu, 30 Apr 2020 15:46:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s-nsOnfPqKwW for ; Thu, 30 Apr 2020 15:46:57 +0200 (CEST) Date: Thu, 30 Apr 2020 09:46:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588254417; bh=TXG13My10Xs7QS8A9cmmNHR50MMBcGACHIAlq9QsjXQ=; h=Date:From:To:Subject; b=UvjXI3CjlV0ag2dyEcssIjUJ3v8KgIqMcNrB0xxwPFNtjqX6mkf9k9XCaLDWd4Oth 6Pl7rklxEHDV0YvodQT1/nHM4kMLp7UihpuaS0HAg0lKOmHAUmcGE0UmlI1mzcA4Op cKKBrfA6KELc5XMfbXTXr8lvB0LTcmnDkk7pcQEmKYdBPBTjk8v+R73yGM7yT4v3Xt 99kXGTskJLg4QWZAYpvTk7w4Zg4BnCCaJbZlhZaf+pG0FDnWx5P1pTMM8LVKzvOzQ/ 5k5ES5KxxoswgZpFJMUDfRFZz9sJO50S4rm/xnpMDtECaOQyaf7SfFiDeHscVIzNz/ DnzaSmyN1U+ZQ== From: Raghav Gururajan Message-ID: <20200430094639.3d0c9786.raghavgururajan@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 09:46:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 3bad3e31dd0076e6ad87ee4e2045acd744768601 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 30 Apr 2020 09:44:32 -0400 Subject: [PATCH] gnu: spacefm: Fix privilege and disk management. Patched references to sudo, ktsuss and udevil; to load them correctly. * gnu/packages/lxde.scm (spacefm): Fix privilege and disk management. --- gnu/packages/lxde.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..a52e403106 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages disk) @@ -279,7 +280,6 @@ with freedesktop.org standard.") `(("bash" ,bash) ("cairo" ,cairo) ("curlftpfs" ,curlftpfs) - ("dbus" ,dbus) ("eudev" ,eudev) ("fakeroot" ,fakeroot) ("ffmpegthumbnailer" ,ffmpegthumbnailer) @@ -288,6 +288,7 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) @@ -297,12 +298,31 @@ with freedesktop.org standard.") ("util-linux" ,util-linux) ("wget" ,wget))) (arguments - `(#:configure-flags (list (string-append "--with-bash-path=" - (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-files + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch config file to load programs correctly. + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + "terminal_su=/run/setuid-programs/sudo") + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + ;; SpaceFM expects udevil to have uid set to root. + ;; User has to manually add udevil to setuid-programs. + (substitute* "src/settings.c" + (("/usr/bin/udevil") + "/run/setuid-programs/udevil")) + #t))) + #:configure-flags (list + (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager -- 2.26.2