guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.

commit 7c188992ec108744f281cd846d5cd80626b9b545
Author: Yelninei <[email protected]>
AuthorDate: Mon Aug 10 07:20:01 2026 +0000

    system: hurd: Use minimal glibc for pt_chown.
    
    * gnu/system/hurd.scm (%setuid-programs/hurd): Replace glibc/hurd with the
    cross-libc or the canonical glibc.
    
    Change-Id: Ib110a5de4b722c1d9818c28b1ef90e4abcd65f1a
---
 gnu/system/hurd.scm | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 1879032b3db..95b7bdc4504 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -110,16 +110,25 @@
 
 (define %setuid-programs/hurd
   ;; Default set of setuid-root programs.
-  (map file-like->setuid-program
-       (list (file-append glibc/hurd "/libexec/pt_chown")
-             (file-append shadow "/bin/passwd")
-             (file-append shadow "/bin/sg")
-             (file-append shadow "/bin/su")
-             (file-append shadow "/bin/newgrp")
-             (file-append shadow "/bin/newuidmap")
-             (file-append shadow "/bin/newgidmap")
-             (file-append sudo "/bin/sudo")
-             (file-append sudo "/bin/sudoedit"))))
+  (let ((libc
+         (let-system (system target)
+           ;; Unless we're cross-compiling, arrange to use pt_chown
+           ;; from 'glibc-final' instead of pulling in a second
+           ;; glibc copy.
+           (if target
+               (cross-libc target)
+               (canonical-package glibc/hurd)))))
+    (map file-like->setuid-program
+         (list
+          (file-append libc "/libexec/pt_chown")
+          (file-append shadow "/bin/passwd")
+          (file-append shadow "/bin/sg")
+          (file-append shadow "/bin/su")
+          (file-append shadow "/bin/newgrp")
+          (file-append shadow "/bin/newuidmap")
+          (file-append shadow "/bin/newgidmap")
+          (file-append sudo "/bin/sudo")
+          (file-append sudo "/bin/sudoedit")))))
 
 (define %hurd-default-operating-system
   (operating-system

Reply via email to