aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2026-09-04 18:38:28 +0900
committerOphestra <cat@gensokyo.uk>2026-09-04 18:38:57 +0900
commitf8bd988752dbee079ea6f1bfa69a5bd3bf16baea (patch)
tree92a946889317c21b90074eeb6cd1c779aa3de079
parent3eafb6d1bf1640c197176a4aa61a50263a186bcf (diff)
internal/rosa/package/util-linux: 2.42.2 to 2.42.3
This includes patch to fix glibc-ism. Signed-off-by: Ophestra <cat@gensokyo.uk>
-rw-r--r--internal/rosa/package/util-linux/a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch35
-rw-r--r--internal/rosa/package/util-linux/package.az (renamed from internal/rosa/package/util-linux.az)5
2 files changed, 38 insertions, 2 deletions
diff --git a/internal/rosa/package/util-linux/a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch b/internal/rosa/package/util-linux/a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch
new file mode 100644
index 00000000..36d6f968
--- /dev/null
+++ b/internal/rosa/package/util-linux/a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch
@@ -0,0 +1,35 @@
+From a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 2 Sep 2026 13:32:27 +0200
+Subject: [PATCH] libmount: add missing fileutils.h include to hook_idmap.c
+
+The hook_idmap.c uses RESOLVE_NO_SYMLINKS (added by commit fb8e26535)
+but does not include fileutils.h, which provides the fallback #define
+for this constant.
+
+On Fedora (glibc 2.40+), this is masked because glibc's
+<bits/fcntl-linux.h> transitively includes <linux/openat2.h>, which
+defines RESOLVE_NO_SYMLINKS. On Ubuntu (and other distros with older
+glibc), <fcntl.h> does not pull in openat2.h, so the build fails:
+
+ hook_idmap.c:335:33: error: 'RESOLVE_NO_SYMLINKS' undeclared
+
+Fixes: fb8e26535 ("libmount: pin source path with openat2() for restricted users")
+Signed-off-by: Karel Zak <kzak@redhat.com>
+(cherry picked from commit 7e2e010874b10b3aabdc3c4c844c9ffc46a4a374)
+---
+ libmount/src/hook_idmap.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
+index 77494e29810..2c697b17154 100644
+--- a/libmount/src/hook_idmap.c
++++ b/libmount/src/hook_idmap.c
+@@ -23,6 +23,7 @@
+
+ #include "strutils.h"
+ #include "all-io.h"
++#include "fileutils.h"
+ #include "namespace.h"
+
+ #include "mountP.h"
diff --git a/internal/rosa/package/util-linux.az b/internal/rosa/package/util-linux/package.az
index 405f2ab7..f065718a 100644
--- a/internal/rosa/package/util-linux.az
+++ b/internal/rosa/package/util-linux/package.az
@@ -5,7 +5,7 @@ package util-linux {
// release candidates confuse Anitya
latest = anityaFallback;
- version# = "2.42.2";
+ version# = "2.42.3";
source = remoteTar {
url = "https://www.kernel.org/pub/linux/utils/util-linux/"+
"v"+join {
@@ -19,9 +19,10 @@ package util-linux {
};
sep = ".";
}+"/util-linux-"+version+".tar.gz";
- checksum = "Z4IZapPCKQP37aeWMDhxcvuOCy-IR_aHZvfUEMZ0T7trwC1znZACKH_3ddqXwBCg";
+ checksum = "VQ3NCM4kt0-TTrdJElBfckXNCGBv6UfXGTRm1poQ0XP0WBND4eG-O7n5Ly_a-Iw_";
compress = gzip;
};
+ patches = [ "a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch" ];
bin = [ "bash" ];
exec = make {