From 82ae680b4a60a2f54e22f31750822599f8abb10b Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Sat, 1 Jun 2024 19:12:21 -0500
Subject: [PATCH] util-linux: 2.40.1

---
 extra/util-linux/checksums           |  4 ++--
 extra/util-linux/patches/posix.patch | 21 +++++++++------------
 extra/util-linux/sources             |  2 +-
 extra/util-linux/version             |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/extra/util-linux/checksums b/extra/util-linux/checksums
index 571f4539..29716d13 100644
--- a/extra/util-linux/checksums
+++ b/extra/util-linux/checksums
@@ -1,2 +1,2 @@
-6d1740c74ea7e47037320259b0e7a772aabc1cfcccf4ac2d3cc1726639ecb92d18
-6b51fa77e279b775004865b7514650f06156406048fd652bfbf10a84f031599444
+cffdf814bf69f805bf391688add8f2163190af6eb33c32afbcbda8aea362545f82
+89f707a429557c0b88c53327187c11d6dc740eba2d8a537962cfe362e0c8763fa5
diff --git a/extra/util-linux/patches/posix.patch b/extra/util-linux/patches/posix.patch
index 3dcd7250..2b9a6711 100644
--- a/extra/util-linux/patches/posix.patch
+++ b/extra/util-linux/patches/posix.patch
@@ -1,28 +1,25 @@
 diff --git a/tools/all_syscalls b/tools/all_syscalls
-index 9c14778..8f0d582 100755
+index eccb0d0..3d7a34f 100755
 --- a/tools/all_syscalls
 +++ b/tools/all_syscalls
-@@ -1,4 +1,4 @@
+@@ -1,7 +1,6 @@
 -#!/bin/bash
 +#!/bin/sh
  
  set -e
+-set -o pipefail
  
-@@ -7,9 +7,14 @@ SYSCALL_INCLUDES="
+ SED="$1"
+ shift
+@@ -10,9 +9,9 @@ SYSCALL_INCLUDES="
  #include <sys/syscall.h>
  "
  
--trap 'rm $OUTPUT $OUTPUT.deps' ERR
-+trap '[ $? -eq 0 ] || rm $OUTPUT $OUTPUT.deps' EXIT
+-trap 'rm -f $OUTPUT $OUTPUT.deps' ERR
++trap '[ $? -eq 0 ] || rm -f $OUTPUT $OUTPUT.deps' EXIT
  
 -"$@" -MD -MF "$OUTPUT.deps" <<< "$SYSCALL_INCLUDES" -dM -E - \
--	| gawk 'match($0, /^#define __NR_([^ ]+)/, res) { print "UL_SYSCALL(\"" res[1] "\", __NR_" res[1] ")" }' \
 +echo "$SYSCALL_INCLUDES" | "$@" -MD -MF "$OUTPUT.deps" -dM -E - \
-+	| awk 'match($0, /^#define __NR_([^ ]+)/) {
-+		split(substr($0, RSTART + 1, RLENGTH - 1), syscall_split)
-+		syscall_nr_def = syscall_split[2]
-+		syscall_name = substr(syscall_nr_def, 6)
-+		print "UL_SYSCALL(\"" syscall_name "\", " syscall_nr_def ")"
-+	}' \
+ 	| "$SED" -n -e 's/^#define __NR_\([^ ]*\).*$/UL_SYSCALL("\1", __NR_\1)/p' \
  	| sort \
  	> "$OUTPUT"
diff --git a/extra/util-linux/sources b/extra/util-linux/sources
index ff52c15b..40fb4249 100644
--- a/extra/util-linux/sources
+++ b/extra/util-linux/sources
@@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.tar.xz
+https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.1.tar.xz
 patches/posix.patch
diff --git a/extra/util-linux/version b/extra/util-linux/version
index d9e6960d..3fb476cf 100644
--- a/extra/util-linux/version
+++ b/extra/util-linux/version
@@ -1 +1 @@
-2.40 1
+2.40.1 1