util-linux: update to 2.36.2.

This commit is contained in:
Anthony Iliopoulos 2021-02-12 17:18:15 +01:00 committed by Érico Nogueira Rolim
parent ccb55f4744
commit c1ab410875
2 changed files with 3 additions and 43 deletions

View File

@ -1,40 +0,0 @@
From 52f730e47869ce630fafb24fd46f755dc7ffc691 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 19 Nov 2020 09:49:16 +0100
Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
Addresses: https://github.com/karelzak/util-linux/issues/1193
Signed-off-by: Karel Zak <kzak@redhat.com>
---
libmount/src/context_mount.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 8c394c1ff..dd1786176 100644
--- libmount/src/context_mount.c
+++ libmount/src/context_mount.c
@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
* string, because there is nothing like MS_EXEC (we only have
* MS_NOEXEC in mount flags and we don't care about the original
* mount string in libmount for VFS options).
+ *
+ * This use-case makes sense for MS_SECURE flags only (see
+ * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
*/
if (!(cxt->mountflags & MS_NOEXEC))
mnt_optstr_append_option(optstr, "exec", NULL);
@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
mnt_optstr_append_option(optstr, "suid", NULL);
if (!(cxt->mountflags & MS_NODEV))
mnt_optstr_append_option(optstr, "dev", NULL);
- if (!(cxt->mountflags & MS_NOSYMFOLLOW))
- mnt_optstr_append_option(optstr, "symfollow", NULL);
}
-
if (cxt->flags & MNT_FL_SAVED_USER)
rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
if (rc)
--
2.30.1

View File

@ -1,8 +1,8 @@
# Template file for 'util-linux'
# Keep this package sync with util-linux-libs
pkgname=util-linux
version=2.36.1
revision=2
version=2.36.2
revision=1
hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
eudev-libudev-devel"
@ -13,7 +13,7 @@ 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}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
checksum=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
# Create uuidd system account for uuidd.
system_accounts="_uuidd"