Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/util-linux: upgrade to 2.41.1

Browse source 
https://github.com/util-linux/util-linux/compare/v2.41...v2.41.1
This commit is contained in:
fossdd 2025-06-28 12:19:35 +02:00 • committed by achill (fossdd)
parent f46db412cd
commit 4469657f75
2 changed files with 3 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/util-linux/APKBUILD
View file

@ -2,8 +2,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux
pkgver=2.41
pkgrel=9
pkgver=2.41.1
pkgrel=0
pkgdesc="Random collection of Linux utilities"
url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
@ -90,8 +90,6 @@ source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgve
rfkill.confd
rfkill.initd
su-l.pamd
libmount-fix-no-canonicalize-regression.patch
"
# secfixes:
@ -383,11 +381,10 @@ _py3() {
}
sha512sums="
800ff92ee7a047732c0accb9dd759d6ed659947373ca72e0dd3ca601d0a6fed9db92c0838cfaff6bcdb8c08bdc1ffa675721893f42945885c57ccd59ab676318 util-linux-2.41.tar.xz
12cf37ab2d62d0378b16a40e0194ef7131ef1ad06737cca3f169cfc04b9da08a4233076c819b30705e8fb2c3b8d91a1d83aac4f036ce58b9cf5928f545e511a2 util-linux-2.41.1.tar.xz
c1c9cd816d20582438cda75a9c0ea4e687eee124e657172729aff410f52558be19cc5d649dae07c03f7618411e5aa6c23bcebc3fdf25529517a61b6b343966ef utmps.patch
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h
401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd
b0e11226c611fd52d54f599a40d23c4f748d5bd6971732dba2d25581aedaf5d2c62bcb49515d175569ff9aa1cf49a3dff25d1a5d4dcd89428c7020fc7ea3a581 rfkill.initd
0c8e764308ac1d084ebb4246eb97203de983bc0170066c958a56b412d9fd2f98da7f78f059e59512542c56a2639d6b2da35eff6469a48ebce6b2c406e94a96a7 su-l.pamd
8dee9e9ff5a8c4aace166b81b65bbaff4b621750dac24685d3c81cecc078d61e1ae606cef00c2e38a537608ba2abb775c1b59bce84abe23bbcebceea1b3b4209 libmount-fix-no-canonicalize-regression.patch
"

40
main/util-linux/libmount-fix-no-canonicalize-regression.patch
View file

@ -1,40 +0,0 @@
From 77723beaaaca654f72ac9538772e69fbafa8835d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 24 Mar 2025 14:31:05 +0100
Subject: [PATCH] libmount: fix --no-canonicalize regression
Fixes: https://github.com/util-linux/util-linux/issues/3474
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7dbfe31a83f45d5aef2b508697e9511c569ffbc8)
---
libmount/src/context.c | 3 ---
sys-utils/mount.8.adoc | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libmount/src/context.c b/libmount/src/context.c
index 0323cb23d34..15a8ad3bbd0 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -530,9 +530,6 @@ int mnt_context_is_xnocanonicalize(
assert(cxt);
assert(type);
- if (mnt_context_is_nocanonicalize(cxt))
- return 1;
-
ol = mnt_context_get_optlist(cxt);
if (!ol)
return 0;
diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc
index 4f23f8d1f0e..5103b91c578 100644
--- a/sys-utils/mount.8.adoc
+++ b/sys-utils/mount.8.adoc
@@ -756,7 +756,7 @@ Allow to make a target directory (mountpoint) if it does not exist yet. The opti
*X-mount.nocanonicalize*[**=**_type_]::
Allows disabling of canonicalization for mount source and target paths. By default, the `mount` command resolves all paths to their absolute paths without symlinks. However, this behavior may not be desired in certain situations, such as when binding a mount over a symlink, or a symlink over a directory or another symlink. The optional argument _type_ can be either "source" or "target" (mountpoint). If no _type_ is specified, then canonicalization is disabled for both types. This mount option does not affect the conversion of source tags (e.g. LABEL= or UUID=) and fstab processing.
+
-The command line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but it does not modify flags for open_tree syscalls.
+The command-line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but for backward compatibility, it does not modify open_tree syscall flags and does not allow the bind-mount over a symlink use case.
+
Note that *mount*(8) still sanitizes and canonicalizes the source and target paths specified on the command line by non-root users, regardless of the X-mount.nocanonicalize setting.