[arch-commits] Commit in util-linux/trunk (1 file)

[Christian Hesse]

    Date: Friday, February 12, 2021 @ 15:00:54
  Author: eworm
Revision: 407883

clean up unused patch

Deleted:
  util-linux/trunk/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch

--------------------------------------------------------------------+
 0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch |   37 ----------
 1 file changed, 37 deletions(-)

Deleted: 0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch
===================================================================
--- 0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch	2021-02-12 15:00:15 UTC (rev 407882)
+++ 0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch	2021-02-12 15:00:54 UTC (rev 407883)
@@ -1,37 +0,0 @@
-From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-Date: Thu, 19 Nov 2020 09:49:16 +0100
-Subject: 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 at 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
---- 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)