diff --git a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch b/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch new file mode 100644 index 0000000000..0285447d4e --- /dev/null +++ b/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch @@ -0,0 +1,44 @@ +upstream: yes +reason: fixes compilation for armv6-musl + +From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 10 Mar 2020 11:43:16 +0100 +Subject: include: cleanup pidfd inckudes + +Signed-off-by: Karel Zak +--- + include/pidfd-utils.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +(limited to 'include/pidfd-utils.h') + +diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h +index 0baedd2c9..4a6c3a604 100644 +--- include/pidfd-utils.h ++++ include/pidfd-utils.h +@@ -3,10 +3,10 @@ + + #if defined(__linux__) + # include +-# if defined(SYS_pidfd_send_signal) ++# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) + # include + +-# ifndef HAVE_PIDFD_OPEN ++# ifndef HAVE_PIDFD_SEND_SIGNAL + static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + unsigned int flags) + { +@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + } + # endif + +-# ifndef HAVE_PIDFD_SEND_SIGNAL ++# ifndef HAVE_PIDFD_OPEN + static inline int pidfd_open(pid_t pid, unsigned int flags) + { + return syscall(SYS_pidfd_open, pid, flags); +-- +cgit 1.2.3-1.el7 + diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index b20105937e..bb09d12d41 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,9 +1,9 @@ # Template file for 'util-linux' # Keep this package sync with util-linux-libs pkgname=util-linux -version=2.35.1 -revision=2 -hostmakedepends="automake bison gettext-devel libtool pkg-config xz" +version=2.35.2 +revision=1 +hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz" makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel eudev-libudev-devel" depends="util-linux-libs-${version}_${revision}" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.35/${pkgname}-${version}.tar.xz" -checksum=d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 +checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a # Create uuidd system account for uuidd. system_accounts="_uuidd"