From patchwork Mon Apr 27 06:29:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21678 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 F0DC627BBE1; Mon, 27 Apr 2020 07:31:09 +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 [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 68B6927BBE1 for ; Mon, 27 Apr 2020 07:31:09 +0100 (BST) Received: from localhost ([::1]:54112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSxIK-00089Y-RC for patchwork@mira.cbaines.net; Mon, 27 Apr 2020 02:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60056) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSxIE-00089J-Ve for guix-patches@gnu.org; Mon, 27 Apr 2020 02:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSxIE-00056i-Bm for guix-patches@gnu.org; Mon, 27 Apr 2020 02:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSxID-00056Y-UZ for guix-patches@gnu.org; Mon, 27 Apr 2020 02:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSxID-0003U0-Pz for guix-patches@gnu.org; Mon, 27 Apr 2020 02:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 06:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Cc: 40753@debbugs.gnu.org Received: via spool by 40753-submit@debbugs.gnu.org id=B40753.158796902713336 (code B ref 40753); Mon, 27 Apr 2020 06:31:01 +0000 Received: (at 40753) by debbugs.gnu.org; 27 Apr 2020 06:30:27 +0000 Received: from localhost ([127.0.0.1]:35387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSxHf-0003T1-B5 for submit@debbugs.gnu.org; Mon, 27 Apr 2020 02:30:27 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSxHZ-0003So-Ex for 40753@debbugs.gnu.org; Mon, 27 Apr 2020 02:30:26 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 32D0125F77; Mon, 27 Apr 2020 08:30:20 +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 UTF8SMTP id RyTs4RMXOgtS; Mon, 27 Apr 2020 08:30:18 +0200 (CEST) Date: Mon, 27 Apr 2020 02:29:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587969016; bh=OXwKdAFYKk1s3y8FdyruFs99w8PwRQSx6AX1osJ9iYY=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=AjqKmcmdVGOfPHiLek8NC9hYZWgf4dQ+wOrpnuibQwzBP2JXxhE+u7Ph0UVoXLOvq MFuumb5p1Hr13m8D3uh92wV08cD2opjNTFKlDHqc9oFwb3m4IV0s6eDdBfZylK9H+h E70TTg+e0Dv4QQUNZb0xkM8yqhKt4ZNLQxVpg6BvXYvHFveD5Zwk2gQduSiJ0eSLn9 Ueux6yqlvQmJtGmVIDnYZiO5iBvh1qQekYaARdPXXGkzans3BbZuIkcrpmtJsWFCx3 NIR0/sS1FYnFnaJltlGrzlzgcCZNEoMwWdp/KT3F5f32A1rNjOyyRH7jay1jBOQOZ7 wm/9wsoHEqPgQ== From: Raghav Gururajan Message-ID: <20200427022956.7c7d7263.raghavgururajan@disroot.org> In-Reply-To: <87lfmis5wm.fsf@gnu.org> References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> <20200424153558.2aa79ef0.raghavgururajan@disroot.org> <87h7x8wsr8.fsf@gnu.org> <20200425221143.1a587483.raghavgururajan@disroot.org> <87lfmis5wm.fsf@gnu.org> Mime-Version: 1.0 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 Hi Jan! > >>>HERE<<< > > > * gnu/packages/lxde.scm (spacefm): Fix privilege management and icons. > > Please move this remark: > > > This commit contains changes that were accidentally left out in > > commit bf37b49cdd345bcedeb7142f61968d3a6e15e8d8. > > beteen subject and "* gnu/packages/lxde", so to >>>HERE<<< Sure. > > (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-spacefm-conf > > + (lambda* (#:key inputs #:allow-other-keys) > > + (substitute* "etc/spacefm.conf" > > + (("#terminal_su=/bin/su") > > + (string-append "terminal_su=" > > + (string-append (assoc-ref inputs "sudo") > > + "/bin/sudo")))) > > Does this work; SU is not SUDO? Also, I don't see how /bin/sudo > would work. When I run this > > $(guix build sudo)/bin/sudo > > I get > > sudo: /gnu/store/l320ig872ny66d1yi6v7n4zb93iz50dx-sudo-1.8.31p1/bin/sudo > must be owned by uid 0 and have the setuid bit set > > Am I missing something? The option just has the name "su". It can be sudo too. I wouldn't worry about this terminal_su option. This is just has to be set, so that spacefm doesn't throw "no valid program found" error, now and then, because of default FHS path. SpaceFM primarily uses graphical_su, which has been set to 'ktsuss'. > > + (substitute* "etc/spacefm.conf" > > + (("#graphical_su=/usr/bin/gksu") > > + (string-append "graphical_su=" > > + (string-append (assoc-ref inputs "ktsuss") > > + "/bin/ktsuss")))) > > + #t))) > > Changing the default configurations does not seem to work for me. When > I select > > /File/Root Window > > there is a pop-up that says: Please configure a valid Terminal SU > command. Does it work for You? This is exactly the error I was talking about above. Once we apply this patch, the error appearing stops and ktsuss will pop right up. > > > + #:configure-flags (list > ^ > Trailing space. Thanks! I have attached revised patch with this email. Regards, RG. From 636d358dc3290433b929ebd72ad087dbfa50c8a5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Apr 2020 02:27:16 -0400 Subject: [PATCH] gnu: spacefm: Fix privilege management. * gnu/packages/lxde.scm (spacefm): Fix privilege management. --- gnu/packages/lxde.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..8b9759bc9c 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) @@ -288,21 +289,42 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) ("shared-mime-info" ,shared-mime-info) ("startup-notification" ,startup-notification) + ("sudo" ,sudo) ("udevil" ,udevil) ("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-spacefm-conf + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + (string-append "terminal_su=" + (string-append (assoc-ref inputs "sudo") + "/bin/sudo")))) + (substitute* "etc/spacefm.conf" + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + #t))) + #:configure-flags (list + (string-append "--with-preferable-sudo=" + (assoc-ref %build-inputs "ktsuss") + "/bin/ktsuss") + (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