[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/30: gnu: shadow: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
29/30: gnu: shadow: Build fix for the Hurd. |
Date: |
Sat, 21 Mar 2020 19:36:32 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit ff421ce327ee3c14cf6746706e9a7df0209752ec
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 | 16 ++++++++++++++++
3 files changed, 18 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9029ba2..f672e70 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1429,6 +1429,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 9662468..d35c455 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -488,6 +488,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..2e376e1
--- /dev/null
+++ b/gnu/packages/patches/shadow-hurd-pctrl.patch
@@ -0,0 +1,16 @@
+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
+
- 20/30: daemon: Do not use clone on the Hurd., (continued)
- 20/30: daemon: Do not use clone on the Hurd., guix-commits, 2020/03/21
- 22/30: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/21
- 24/30: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/21
- 26/30: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/21
- 09/30: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/21
- 19/30: gnu: hurd: Update to hurd-headers version: 0.9-91a51672., guix-commits, 2020/03/21
- 21/30: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/21
- 23/30: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/21
- 25/30: gnu: pciutils: Build fixes for the Hurd., guix-commits, 2020/03/21
- 28/30: gnu: screen: Build fix for the Hurd., guix-commits, 2020/03/21
- 29/30: gnu: shadow: Build fix for the Hurd.,
guix-commits <=
- 27/30: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/21
- 30/30: gnu: mit-krb5: Supprt for the Hurd., guix-commits, 2020/03/21