From 76cb23c117e25eaec8f177076bd4eaa10e800672 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 Sep 2024 02:00:00 +0200
Subject: [PATCH] services: screen-locker: Migrate to (gnu system privilege).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/services/xorg.scm (screen-locker-setuid-programs): Rename from this…
(screen-locker-privileged-programs): …to this.  Use <privileged-program>.
(screen-locker-service-type): Extend the PRIVILEGED-PROGRAM-SERVICE-TYPE.

Change-Id: Icbd891def4fc90ed5365702731f009dec358c19e
---
 gnu/services/xorg.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index e7d8922d76..eff1c9354b 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -38,9 +38,9 @@ (define-module (gnu services xorg)
   #:use-module (gnu services)
   #:use-module (gnu services configuration)
   #:use-module (gnu services shepherd)
-  #:use-module (gnu system pam)
-  #:use-module (gnu system setuid)
   #:use-module (gnu system keyboard)
+  #:use-module (gnu system pam)
+  #:use-module (gnu system privilege)
   #:use-module (gnu services base)
   #:use-module (gnu services dbus)
   #:use-module (gnu packages base)
@@ -847,11 +847,13 @@ (define (screen-locker-pam-services config)
                                 allow-empty-password?))
         '())))
 
-(define (screen-locker-setuid-programs config)
+(define (screen-locker-privileged-programs config)
   (match-record config <screen-locker-configuration>
     (name program using-setuid?)
     (if using-setuid?
-        (list (file-like->setuid-program program))
+        (list (privileged-program
+               (program program)
+               (setuid? #t)))
         '())))
 
 (define screen-locker-service-type
@@ -859,8 +861,8 @@ (define screen-locker-service-type
                 (extensions
                  (list (service-extension pam-root-service-type
                                           screen-locker-pam-services)
-                       (service-extension setuid-program-service-type
-                                          screen-locker-setuid-programs)))
+                       (service-extension privileged-program-service-type
+                                          screen-locker-privileged-programs)))
                 (description
                  "Allow the given program to be used as a screen locker for
 the graphical server by making it setuid-root, so it can authenticate users,