GNU bug report logs - #63357
[PATCH] gnu: swaylock: Add linux-pam to inputs

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63357 in the body.
You can then email your comments to 63357 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Benjamin <benjamin <at> uvy.fr>
To: guix-patches <at> gnu.org
Cc: Benjamin <benjamin <at> uvy.fr>
Subject: [PATCH] gnu: swaylock: Add linux-pam to inputs
Date: Sun,  7 May 2023 17:27:15 +0200

Adding linux-pam to inputs allows swaylock to run without setuid if
configured with a proper pam file.
---
 gnu/packages/wm.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index fe732e572e..b128b77e6a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1705,9 +1705,7 @@ (define-public swaylock
        (sha256
         (base32 "03jrjwlwxkcyd6m9a1bbwapasnz7b7aws7h0y6jigjm4m478phv6"))))
     (build-system meson-build-system)
-    (inputs (list cairo gdk-pixbuf libxkbcommon
-                  ;("linux-pam" ,linux-pam) ; FIXME: Doesn't work.
-                  wayland))
+    (inputs (list cairo gdk-pixbuf libxkbcommon linux-pam wayland))
     (native-inputs (list pango pkg-config scdoc wayland-protocols))
     (home-page "https://github.com/swaywm/sway")
     (synopsis "Screen locking utility for Wayland compositors")

base-commit: 7f8575c97a8c112e9f82981b8803d075a82738dd
-- 
2.39.2

Message #10 received at 63357-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Benjamin <benjamin <at> uvy.fr>
Cc: 63357-done <at> debbugs.gnu.org
Subject: Re: bug#63357: [PATCH] gnu: swaylock: Add linux-pam to inputs
Date: Thu, 18 May 2023 19:54:43 +0200

Hi,

Benjamin <benjamin <at> uvy.fr> skribis:

> Adding linux-pam to inputs allows swaylock to run without setuid if
> configured with a proper pam file.
> ---
>  gnu/packages/wm.scm | 4 +---

I tweaked the commit log and applied it.  Thanks!

Ludo’.

Message #13 received at 63357-done <at> debbugs.gnu.org (full text, mbox):

From: Andrew Tropin <andrew <at> trop.in>
To: Ludovic Courtès <ludo <at> gnu.org>, Benjamin <benjamin <at> uvy.fr>
Cc: 63357-done <at> debbugs.gnu.org, muradm <mail <at> muradm.net>
Subject: Re: bug#63357: [PATCH] gnu: swaylock: Add linux-pam to inputs
Date: Mon, 22 May 2023 19:14:22 +0400

[Message part 1 (text/plain, inline)]

On 2023-05-18 19:54, Ludovic Courtès wrote:

> Hi,
>
> Benjamin <benjamin <at> uvy.fr> skribis:
>
>> Adding linux-pam to inputs allows swaylock to run without setuid if
>> configured with a proper pam file.
>> ---
>>  gnu/packages/wm.scm | 4 +---
>
> I tweaked the commit log and applied it.  Thanks!

Hey guys!

One of our colleagues mentioned that it's a breaking change and swaylock
with pam backend will complain if suid is set, so the old setups with
(screen-locker-service swaylock) will break after this commit.

Do we want to document how to configure pam for swaylock in manual and
add a news entry for this change?

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 63357-done <at> debbugs.gnu.org (full text, mbox):

From: "Benjamin" <benjamin <at> uvy.fr>
To: "Andrew Tropin" <andrew <at> trop.in>, Ludovic Courtès
 <ludo <at> gnu.org>
Cc: 63357-done <at> debbugs.gnu.org, muradm <mail <at> muradm.net>
Subject: Re: bug#63357: [PATCH] gnu: swaylock: Add linux-pam to inputs
Date: Mon, 22 May 2023 17:53:32 +0200

Hello,

> One of our colleagues mentioned that it's a breaking change and swaylock
> with pam backend will complain if suid is set, so the old setups with
> (screen-locker-service swaylock) will break after this commit.
>
> Do we want to document how to configure pam for swaylock in manual and
> add a news entry for this change?

First of all sorry for the breaking change.

I am pretty new to guix and did not know about screen-locker-service.
How I managed to make this to work is by setting a custom pam system
service :

(define-public swaylock-pam-service-type
  (service-type (name 'swaylock)
                (extensions (list (service-extension pam-root-service-type
                                                     (const (list (pam-service
                                                                   (name "swaylock")
                                                                   (auth (list
                                                                          (pam-entry
                                                                           (control "include")
                                                                           (module "greetd"))))))))))
                (description "Swaylock pam configuration")
                (default-value '())))

I do not know the policy in case of breaking changes, but if it is
easier we can roll back this change maybe ?

Best

Benjamin

Message #19 received at 63357-done <at> debbugs.gnu.org (full text, mbox):

From: muradm <mail <at> muradm.net>
To: Benjamin <benjamin <at> uvy.fr>
Cc: 63357-done <at> debbugs.gnu.org, Ludovic Courtès <ludo <at> gnu.org>,
 Andrew Tropin <andrew <at> trop.in>
Subject: Re: bug#63357: [PATCH] gnu: swaylock: Add linux-pam to inputs
Date: Mon, 22 May 2023 22:33:02 +0300

[Message part 1 (text/plain, inline)]

Hi,

I would suggest to go forward with fixing 
screen-locker-service-type.
Root cause of issue is explained within the commit message of:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63652

muradm

"Benjamin" <benjamin <at> uvy.fr> writes:

> Hello,
>
>> One of our colleagues mentioned that it's a breaking change and 
>> swaylock
>> with pam backend will complain if suid is set, so the old 
>> setups with
>> (screen-locker-service swaylock) will break after this commit.
>>
>> Do we want to document how to configure pam for swaylock in 
>> manual and
>> add a news entry for this change?
>
> First of all sorry for the breaking change.
>
> I am pretty new to guix and did not know about 
> screen-locker-service.
> How I managed to make this to work is by setting a custom pam 
> system
> service :
>
> (define-public swaylock-pam-service-type
>   (service-type (name 'swaylock)
>                 (extensions (list (service-extension 
>                 pam-root-service-type
>                                                      (const 
>                                                      (list 
>                                                      (pam-service
>                                                                    (name 
>                                                                    "swaylock")
>                                                                    (auth 
>                                                                    (list
>                                                                           (pam-entry
>                                                                            (control 
>                                                                            "include")
>                                                                            (module 
>                                                                            "greetd"))))))))))
>                 (description "Swaylock pam configuration")
>                 (default-value '())))
>
> I do not know the policy in case of breaking changes, but if it 
> is
> easier we can roll back this change maybe ?
>
> Best
>
> Benjamin

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.