commit: 96166c8ac1333556c1c547950247b0ab622f11f5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Nov 20 20:30:44 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Nov 20 20:31:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96166c8a
sys-apps/util-linux: Revbump to fix user mount Closes: https://bugs.gentoo.org/755878 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> ...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 ++++++++++++++++++++++ ...x-2.36.1.ebuild => util-linux-2.36.1-r1.ebuild} | 4 +++ 2 files changed, 44 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch new file mode 100644 index 00000000000..7c0b73f49d7 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch @@ -0,0 +1,40 @@ +From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +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 <[email protected]> +--- + 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 +--- a/libmount/src/context_mount.c ++++ b/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.29.2 + diff --git a/sys-apps/util-linux/util-linux-2.36.1.ebuild b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild similarity index 99% rename from sys-apps/util-linux/util-linux-2.36.1.ebuild rename to sys-apps/util-linux/util-linux-2.36.1-r1.ebuild index 902e36ad068..f7acbfdb151 100644 --- a/sys-apps/util-linux/util-linux-2.36.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild @@ -75,6 +75,10 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-libmount_dont_use_symfollow.patch" #755878 +) + src_prepare() { default
