From 0e3f00d6d1b2fb53c6c151f174cf70d6caa6deba Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:35:25 +0200
Subject: [PATCH 1/2] util-linux-libs: update to 2.36.

---
 srcpkgs/util-linux-libs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 11a924cef5e..b997874392a 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-libs'
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
-version=2.35.2
+version=2.36
 revision=1
 wrksrc="util-linux-$version"
 build_style=meta
@@ -13,8 +13,8 @@ short_desc="Miscellaneous linux utilities - meta libraries"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
-distfiles="${KERNEL_SITE}/utils/util-linux/v2.35/util-linux-${version}.tar.xz"
-checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/util-linux/v${version}/util-linux-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
 
 pre_configure() {
 	local _cfgdir="$XBPS_COMMONDIR/environment/configure"

From 41bf839a28016f832a8c4e29f867b598cbfd1ccb Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:32:51 +0200
Subject: [PATCH 2/2] util-linux: update to 2.36.

---
 .../patches/cleanup-pidfd-includes.patch      | 44 -------------------
 srcpkgs/util-linux/template                   |  6 +--
 2 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch

diff --git a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch b/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
deleted file mode 100644
index 0285447d4ea..00000000000
--- a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-upstream: yes
-reason: fixes compilation for armv6-musl
-
-From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 10 Mar 2020 11:43:16 +0100
-Subject: include: cleanup pidfd inckudes
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- 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 <sys/syscall.h>
--# if defined(SYS_pidfd_send_signal)
-+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
- #  include <sys/types.h>
- 
--#  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 bb09d12d418..1171cbd60e3 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
-version=2.35.2
+version=2.36
 revision=1
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
@@ -12,8 +12,8 @@ short_desc="Miscellaneous linux utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"