diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-18 02:03:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-10 11:44:35 -0500 |
| commit | 7ecc2e3d2badbd1f8f28f4b0ff283b8a2253acd0 (patch) | |
| tree | 22d069f728eb08ac7e1517033d259117aaa181ea /gnu/packages/admin.scm | |
| parent | b082fdb4b5cebc6641affe7acf204453c39058c8 (diff) | |
| download | guix-patches-7ecc2e3d2badbd1f8f28f4b0ff283b8a2253acd0.tar guix-patches-7ecc2e3d2badbd1f8f28f4b0ff283b8a2253acd0.tar.gz | |
gnu: shadow: Update to 4.9.
* gnu/packages/admin.scm (shadow): Update to 4.9.
[source]: Remove hurd patch, merged upstream.
[phases]{fix-linking-to-pam}: New phase.
* gnu/packages/patches/shadow-hurd-pctrl.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 617c6098ee..65c0225826 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -805,16 +805,15 @@ hostname.") (define-public shadow (package (name "shadow") - (version "4.8.1") + (version "4.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/shadow-maint/shadow/releases/" - "download/" version "/shadow-" version ".tar.xz")) - (patches (search-patches "shadow-hurd-pctrl.patch")) + "download/v" version "/shadow-" version ".tar.xz")) (sha256 (base32 - "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) + "0i4iijbshnwnsrskxzrh18xgmzff0hdpsnnkmyc2gdn1x4n1zv7y")))) (build-system gnu-build-system) (arguments `(;; Assume System V `setpgrp (void)', which is the default on GNU @@ -825,9 +824,16 @@ hostname.") '("--with-libpam")) "shadow_cv_logdir=/var/log" "ac_cv_func_setpgrp_void=yes") - #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-linking-to-pam + (lambda _ + ;; There's a build system problem in 4.9 that causes link + ;; failures with the pam libraries (see: + ;; https://github.com/shadow-maint/shadow/issues/407). + (substitute* "libsubid/Makefile.in" + (("\\$\\(LIBTCB\\)" all) + (string-append all " $(LIBPAM)"))))) ,@(if (%current-target-system) '((add-before 'configure 'set-runtime-shell (lambda* (#:key inputs #:allow-other-keys) @@ -848,8 +854,7 @@ hostname.") "libc")))) (substitute* "lib/nscd.c" (("/usr/sbin/nscd") - (string-append libc "/sbin/nscd"))) - #t))) + (string-append libc "/sbin/nscd")))))) (add-after 'install 'remove-groups (lambda* (#:key outputs #:allow-other-keys) ;; Remove `groups', which is already provided by Coreutils. @@ -857,9 +862,7 @@ hostname.") (bin (string-append out "/bin")) (man (string-append out "/share/man"))) (delete-file (string-append bin "/groups")) - (for-each delete-file (find-files man "^groups\\.")) - #t)))))) - + (for-each delete-file (find-files man "^groups\\.")))))))) (inputs `(,@(if (hurd-target?) '() |