diff options
Diffstat (limited to 'internal/rosa/package/util-linux')
| -rw-r--r-- | internal/rosa/package/util-linux/a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch | 35 | ||||
| -rw-r--r-- | internal/rosa/package/util-linux/package.az | 62 |
2 files changed, 97 insertions, 0 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/package.az b/internal/rosa/package/util-linux/package.az new file mode 100644 index 00000000..f065718a --- /dev/null +++ b/internal/rosa/package/util-linux/package.az @@ -0,0 +1,62 @@ +package util-linux { + description = "a random collection of Linux utilities"; + website = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; + anitya = 8179; + // release candidates confuse Anitya + latest = anityaFallback; + + version# = "2.42.3"; + source = remoteTar { + url = "https://www.kernel.org/pub/linux/utils/util-linux/"+ + "v"+join { + elems = slice { + elems = split { + s = version; + sep = "."; + n = 3; + }; + end = 2; + }; + sep = "."; + }+"/util-linux-"+version+".tar.gz"; + checksum = "VQ3NCM4kt0-TTrdJElBfckXNCGBv6UfXGTRm1poQ0XP0WBND4eG-O7n5Ly_a-Iw_"; + compress = gzip; + }; + patches = [ "a323dddbcd1ed05a10e7e870b3e1a48b4ed44a43.patch" ]; + + bin = [ "bash" ]; + exec = make { + configure = { + "disable-use-tty-group"; + "disable-makeinstall-setuid"; + "disable-makeinstall-chown"; + + "enable-fs-paths-default": join { + elems = [ + "/system/sbin", + "/system/sbin/fs.d", + "/system/sbin/fs", + ]; + sep = ":"; + }; + + "disable-su"; + "disable-liblastlog2"; + "disable-pam-lastlog2"; + }; + + // check script claims: + // For development purpose only. + // Don't execute on production system! + check = nil; + }; + + inputs = [ + bash, + + ncurses, + kernel-headers, + ]; + + runtime = [ ncurses ]; +} |