* [bug#40982] gnu: spacefm: Fix privilege and disk management.
@ 2020-04-30 13:46 Raghav Gururajan
2020-05-01 12:15 ` bug#40982: " Danny Milosavljevic
0 siblings, 1 reply; 2+ messages in thread
From: Raghav Gururajan @ 2020-04-30 13:46 UTC (permalink / raw)
To: 40982
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-spacefm-Fix-privilege-and-disk-management.patch --]
[-- Type: text/x-patch, Size: 3394 bytes --]
From 3bad3e31dd0076e6ad87ee4e2045acd744768601 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#40982: gnu: spacefm: Fix privilege and disk management.
2020-04-30 13:46 [bug#40982] gnu: spacefm: Fix privilege and disk management Raghav Gururajan
@ 2020-05-01 12:15 ` Danny Milosavljevic
0 siblings, 0 replies; 2+ messages in thread
From: Danny Milosavljevic @ 2020-05-01 12:15 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 40982-done
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
Pushed to guix master as commit 53e8b852e90ec91e66172ad49f019955d7137eb1
with changes to commit message (to use our convention of change metdata logging).
Ignored src/vfs/vfs-file-task.c /usr/bin/sudo since it is not used.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-01 12:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-30 13:46 [bug#40982] gnu: spacefm: Fix privilege and disk management Raghav Gururajan
2020-05-01 12:15 ` bug#40982: " Danny Milosavljevic
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).