[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/142: gnu: shadow: Update to 4.9.
From: |
guix-commits |
Subject: |
37/142: gnu: shadow: Update to 4.9. |
Date: |
Mon, 10 Jan 2022 13:07:18 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 7ecc2e3d2badbd1f8f28f4b0ff283b8a2253acd0
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Dec 18 02:03:11 2021 -0500
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.
---
gnu/local.mk | 1 -
gnu/packages/admin.scm | 23 +++++++++++++----------
gnu/packages/freedesktop.scm | 8 ++++----
gnu/packages/patches/shadow-hurd-pctrl.patch | 16 ----------------
4 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index fe21cf8062..aa679ee6c7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1791,7 +1791,6 @@ dist_patch_DATA =
\
%D%/packages/patches/serf-python3.patch \
%D%/packages/patches/shakespeare-spl-fix-grammar.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
- %D%/packages/patches/shadow-hurd-pctrl.patch \
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \
%D%/packages/patches/slim-session.patch \
%D%/packages/patches/slim-config.patch \
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?)
'()
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 844191a438..8cd4cd833c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -621,10 +621,10 @@ the freedesktop.org XDG Base Directory specification.")
;; existing in the build environment.
(invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g"
"-i" "src/test/meson.build")
- ;; FIXME: This one times out for unknown reasons.
- (invoke "sed"
- "/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g"
- "-i" "src/test/meson.build")
+ ;; ;; FIXME: This one times out for unknown reasons.
+ ;; (invoke "sed"
+ ;;
"/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g"
+ ;; "-i" "src/test/meson.build")
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch
b/gnu/packages/patches/shadow-hurd-pctrl.patch
deleted file mode 100644
index 2e376e19a9..0000000000
--- a/gnu/packages/patches/shadow-hurd-pctrl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid including sys/prctl.h on the Hurd.
-
-Upstream status: Not submitted.
-
---- shadow-4.8.1/libmisc/idmapping.c.orig 2020-03-07 16:32:05.000000000
-0500
-+++ shadow-4.8.1/libmisc/idmapping.c 2020-03-07 16:32:27.000000000 -0500
-@@ -36,8 +36,8 @@
- #include <stdio.h>
- #include "prototypes.h"
- #include "idmapping.h"
--#include <sys/prctl.h>
- #if HAVE_SYS_CAPABILITY_H
-+#include <sys/prctl.h>
- #include <sys/capability.h>
- #endif
-
- 57/142: gnu: python-typed-ast: Update to 1.5.1., (continued)
- 57/142: gnu: python-typed-ast: Update to 1.5.1., guix-commits, 2022/01/10
- 61/142: gnu: python-typing: Update to 3.10.0.0., guix-commits, 2022/01/10
- 28/142: gnu: help2man: Update to 1.48.5., guix-commits, 2022/01/10
- 13/142: gnu: avahi: Make all arguments unconditional., guix-commits, 2022/01/10
- 12/142: gnu: python-3.9: Update to 3.9.9., guix-commits, 2022/01/10
- 21/142: gnu: llvm-12: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 18/142: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/142: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10
- 32/142: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10
- 33/142: gnu: util-linux: Update to 2.37.2., guix-commits, 2022/01/10
- 37/142: gnu: shadow: Update to 4.9.,
guix-commits <=
- 39/142: gnu: rust-1.39: Update mrustc to commit c70665., guix-commits, 2022/01/10
- 42/142: gnu: python-gnupg: Update to 0.4.8., guix-commits, 2022/01/10
- 80/142: gnu: python-cachecontrol: Update to 0.12.10., guix-commits, 2022/01/10
- 35/142: gnu: cmake-bootstrap: Update to 3.21.4., guix-commits, 2022/01/10
- 62/142: gnu: python-typing-extensions: Update to 4.0.1., guix-commits, 2022/01/10
- 68/142: gnu: python-pylint: Update to 2.12.2., guix-commits, 2022/01/10
- 83/142: gnu: python-beautifulsoup4: Update to 4.10.0., guix-commits, 2022/01/10
- 89/142: gnu: igraph: Update to 0.9.5., guix-commits, 2022/01/10
- 92/142: build-system/gnu: Make gzip files writable before resetting timestamps., guix-commits, 2022/01/10
- 93/142: gnu: python-biom-format: Remove obsolete phase., guix-commits, 2022/01/10