[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/33: gnu: shadow: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
17/33: gnu: shadow: Build fix for the Hurd. |
Date: |
Fri, 13 Mar 2020 02:45:54 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit cb6478350660b55d215e3db2b163dcd911879359
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sat Mar 7 16:38:31 2020 -0500
gnu: shadow: Build fix for the Hurd.
* gnu/packages/patches/shadow-hurd-pctrl.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (shadow): Use it.
---
gnu/local.mk | 1 +
gnu/packages/admin.scm | 1 +
gnu/packages/patches/shadow-hurd-pctrl.patch | 18 ++++++++++++++++++
3 files changed, 20 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index dc99722..6a9adbb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1414,6 +1414,7 @@ dist_patch_DATA =
\
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
+ %D%/packages/patches/shadow-hurd-pctrl.patch \
%D%/packages/patches/shepherd-hurd.patch \
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \
%D%/packages/patches/slim-session.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 10039b8..b1cd867 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -484,6 +484,7 @@ hostname.")
(uri (string-append
"https://github.com/shadow-maint/shadow/releases/"
"download/" version "/shadow-" version ".tar.xz"))
+ (patches (search-patches "shadow-hurd-pctrl.patch"))
(sha256
(base32
"0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3"))))
diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch
b/gnu/packages/patches/shadow-hurd-pctrl.patch
new file mode 100644
index 0000000..a60b44f
--- /dev/null
+++ b/gnu/packages/patches/shadow-hurd-pctrl.patch
@@ -0,0 +1,18 @@
+Description: Avoid including sys/prctl.h on the Hurd.
+Author: Jan (janneke) Nieuwenhuizen <address@hidden>
+Bug-Guix: - XXX: [core-updates] merge wip-hurd
+Forwarded: no
+Last-Update: 2020-03-07
+
+--- 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
+
- 12/33: gnu: coreutils: Remove libcap dependency for the Hurd., (continued)
- 12/33: gnu: coreutils: Remove libcap dependency for the Hurd., guix-commits, 2020/03/13
- 07/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/13
- 09/33: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/13
- 14/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/13
- 21/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/13
- 22/33: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/13
- 26/33: gnu: commencement: static-bash-for-glibc: Hurd build fix., guix-commits, 2020/03/13
- 27/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/13
- 18/33: gnu: mit-krb5: Supprt for the Hurd., guix-commits, 2020/03/13
- 31/33: Revert "gnu: guile-static-stripped: Update to 2.2.", guix-commits, 2020/03/13
- 17/33: gnu: shadow: Build fix for the Hurd.,
guix-commits <=
- 30/33: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/13
- 15/33: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/13