all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#40901] gnu: ktsuss: Fix paths.
@ 2020-04-27 13:37 Raghav Gururajan
  2020-04-27 16:21 ` Jan Nieuwenhuizen
  0 siblings, 1 reply; 6+ messages in thread
From: Raghav Gururajan @ 2020-04-27 13:37 UTC (permalink / raw)
  To: 40901; +Cc: Jan Nieuwenhuizen

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: 0001-gnu-ktsuss-Fix-paths.patch --]
[-- Type: text/x-patch, Size: 1862 bytes --]

From ecdb9f73f2aa9854f03ace199fcc4c4547a2be49 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 27 Apr 2020 09:32:43 -0400
Subject: [PATCH] gnu: ktsuss: Fix paths.

* gnu/packages/admin.scm (ktsuss): Fix paths.
---
 gnu/packages/admin.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 236eebe53c..9316e974bc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -150,24 +150,25 @@
        (list "--enable-sudo=yes")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-sudo-path
-           (lambda* (#:key inputs #:allow-other-keys)
+         (add-after 'unpack 'patch-paths
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "src/ktsuss.c"
+               (("/usr/sbin:/usr/local/sbin:/sbin")
+                "~/.guix-profile/sbin"))
              (substitute* "configure.ac"
+               (("supath=`which su 2>/dev/null`")
+                "supath=/run/setuid-programs/su")
                (("sudopath=`which sudo 2>/dev/null`")
-                (string-append "sudopath="
-                               (string-append (assoc-ref inputs "sudo")
-                                              "/bin/sudo"))))
+                "sudopath=/run/setuid-programs/sudo"))
              #t)))))
     (native-inputs
      `(("autoconf" ,autoconf)
-       ("autogen" ,autogen)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("glib" ,glib)
-       ("gtk+" ,gtk+-2)
-       ("sudo" ,sudo)))
+       ("gtk+" ,gtk+-2)))
     (synopsis "Graphical front end for @command{su}")
     (description
      "Ktsuss stands for ``Keep the @command{su} simple, stupid''.
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#40901] gnu: ktsuss: Fix paths.
  2020-04-27 13:37 [bug#40901] gnu: ktsuss: Fix paths Raghav Gururajan
@ 2020-04-27 16:21 ` Jan Nieuwenhuizen
  2020-04-28  7:43   ` Raghav Gururajan
  0 siblings, 1 reply; 6+ messages in thread
From: Jan Nieuwenhuizen @ 2020-04-27 16:21 UTC (permalink / raw)
  To: Raghav Gururajan; +Cc: 40901

Raghav Gururajan writes:

Hello Raghav,

> From ecdb9f73f2aa9854f03ace199fcc4c4547a2be49 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Mon, 27 Apr 2020 09:32:43 -0400
> Subject: [PATCH] gnu: ktsuss: Fix paths.
>
> * gnu/packages/admin.scm (ktsuss): Fix paths.

I changed the commit message to

--8<---------------cut here---------------start------------->8---
gnu: ktsuss: Use setuid "su" and "sudo" commands.

This has ktsudo actually gain root access.

* gnu/packages/admin.scm (ktsuss)[arguments]: Instead of <sudo>/bin/{su,sudo}
file names, use the setuid' verrsions.
--8<---------------cut here---------------end--------------->8---

When there is a fix being made, a short explanation is nice to have.
What was wrong that the file name were changed, what was fixed?

Also, we are (mainly) fixing the file names of SU and SUDO, not PATHs.

> -         (add-after 'unpack 'patch-sudo-path
> -           (lambda* (#:key inputs #:allow-other-keys)
> +         (add-after 'unpack 'patch-paths

Renamed to 'patch-file-names'

> +           (lambda* (#:key inputs outputs #:allow-other-keys)

Parameters inputs and outputs are both not used; I changed this to

+           (lambda _

> +             (substitute* "src/ktsuss.c"
> +               (("/usr/sbin:/usr/local/sbin:/sbin")
> +                "~/.guix-profile/sbin"))

No way!  :-)

I removed/did not apply this change.

>               (substitute* "configure.ac"
> +               (("supath=`which su 2>/dev/null`")
> +                "supath=/run/setuid-programs/su")
>                 (("sudopath=`which sudo 2>/dev/null`")
> -                (string-append "sudopath="
> -                               (string-append (assoc-ref inputs "sudo")
> -                                              "/bin/sudo"))))
> +                "sudopath=/run/setuid-programs/sudo"))

LGTM!

Can you please remember to test a program before submitting it?  And I
mean not only check if "it runs", but also if it is actually useful?

Pushed to master with these changes.

Greetings,
janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#40901] gnu: ktsuss: Fix paths.
  2020-04-27 16:21 ` Jan Nieuwenhuizen
@ 2020-04-28  7:43   ` Raghav Gururajan
  2020-04-28 17:13     ` Jan Nieuwenhuizen
  0 siblings, 1 reply; 6+ messages in thread
From: Raghav Gururajan @ 2020-04-28  7:43 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 40901

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hello Jan!

> Can you please remember to test a program before submitting it?  And I
> mean not only check if "it runs", but also if it is actually useful?

Sorry. I have attached a patch with this email to make ktsuss work correctly.

This, along with #40922, allows me to fix SpaceFM.

Regards,
RG.

[-- Attachment #2: 0002-gnu-ktsuss-Disable-sudo.patch --]
[-- Type: text/x-patch, Size: 977 bytes --]

From a1d5a14bb634fe52201fdde9ffbd3e385b89d234 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 28 Apr 2020 03:34:05 -0400
Subject: [PATCH 2/2] gnu: ktsuss: Disable sudo.

* gnu/packages/admin.scm (ktsuss): Disable sudo.

Disabled sudo-backend as there is an unknown bug in upstream.
Ktsuss now fall-back to using su-backend, which works correctly.
---
 gnu/packages/admin.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index cb3de79713..356fd1cdf4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -146,9 +146,7 @@
        (file-name (git-file-name name version))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--enable-sudo=yes")
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-file-names
            (lambda _
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#40901] gnu: ktsuss: Fix paths.
  2020-04-28  7:43   ` Raghav Gururajan
@ 2020-04-28 17:13     ` Jan Nieuwenhuizen
  2020-04-30  8:39       ` Raghav Gururajan
  0 siblings, 1 reply; 6+ messages in thread
From: Jan Nieuwenhuizen @ 2020-04-28 17:13 UTC (permalink / raw)
  To: Raghav Gururajan; +Cc: 40901

Raghav Gururajan writes:

Hello Raghav,

>> Can you please remember to test a program before submitting it?  And I
>> mean not only check if "it runs", but also if it is actually useful?
>
> Sorry. I have attached a patch with this email to make ktsuss work
> correctly.

Hmm, I experienced no problem when I tested it.  What did you observe
(see my question below).

> From a1d5a14bb634fe52201fdde9ffbd3e385b89d234 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Tue, 28 Apr 2020 03:34:05 -0400
> Subject: [PATCH 2/2] gnu: ktsuss: Disable sudo.
>
> * gnu/packages/admin.scm (ktsuss): Disable sudo.
>
> Disabled sudo-backend as there is an unknown bug in upstream.
> Ktsuss now fall-back to using su-backend, which works correctly.

Having a like this is great.  Two remarks

  * please move it above the "* gnu/packages/admin" line
  * it would be great if you can add link to the ktsuss bug tracer about
    this "unknown" bug

Without any indication about what the bug is or how it can be
reproduced, it becomes hard to remove this workaround.

Other than that: LGTM.

Greetings,
janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#40901] gnu: ktsuss: Fix paths.
  2020-04-28 17:13     ` Jan Nieuwenhuizen
@ 2020-04-30  8:39       ` Raghav Gururajan
  2020-04-30 13:54         ` Raghav Gururajan
  0 siblings, 1 reply; 6+ messages in thread
From: Raghav Gururajan @ 2020-04-30  8:39 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 40901

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

Hi Jan!
> Having a like this is great.  Two remarks
> 
>   * please move it above the "* gnu/packages/admin" line

Done!

>   * it would be great if you can add link to the ktsuss bug tracer about
>     this "unknown" bug

It is not reported yet. I could report it, but I am not sure how to debug
deeper to pin-point the exact part of the sudo-backend that has the bug. So I
have changed commit-message to fit situation.

Please find the revised patch attached with this email.

Regards,
RG.

[-- Attachment #2: 0001-gnu-ktsuss-Revert-back-to-su-from-sudo.patch --]
[-- Type: text/x-patch, Size: 1003 bytes --]

From 736ac4d7940bdc9982f05b5b58fbaf32f3d6aec4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Apr 2020 04:26:05 -0400
Subject: [PATCH] gnu: ktsuss: Revert back to su from sudo.

Sudo authentication does not work in guix system. Disabled sudo-backend.
Ktsuss will now use su-backend, which is the default.

* gnu/packages/admin.scm (ktsuss): Revert back to su from sudo.
---
 gnu/packages/admin.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index cb3de79713..356fd1cdf4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -146,9 +146,7 @@
        (file-name (git-file-name name version))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--enable-sudo=yes")
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-file-names
            (lambda _
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#40901] gnu: ktsuss: Fix paths.
  2020-04-30  8:39       ` Raghav Gururajan
@ 2020-04-30 13:54         ` Raghav Gururajan
  0 siblings, 0 replies; 6+ messages in thread
From: Raghav Gururajan @ 2020-04-30 13:54 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: 40901

Hi Jan!

Please ignore #40901. Let's leave it closed.

Regards,
RG.




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-04-30 14:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-27 13:37 [bug#40901] gnu: ktsuss: Fix paths Raghav Gururajan
2020-04-27 16:21 ` Jan Nieuwenhuizen
2020-04-28  7:43   ` Raghav Gururajan
2020-04-28 17:13     ` Jan Nieuwenhuizen
2020-04-30  8:39       ` Raghav Gururajan
2020-04-30 13:54         ` Raghav Gururajan

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.