Accepting request 871017 from home:sbrabec:branches:util-linux-boo1181750

- libmount: don't use "symfollow" for helpers on user mounts
  (boo#1181750, util-linux-libmount-dont-use-symfollow.patch)

OBS-URL: https://build.opensuse.org/request/show/871017
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=445

python3-libmount.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
+
+- libmount: don't use "symfollow" for helpers on user mounts
+  (boo#1181750, util-linux-libmount-dont-use-symfollow.patch)
+
 -------------------------------------------------------------------
 Tue Feb  9 11:19:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 

python3-libmount.spec

@@ -79,7 +79,7 @@ Name:           python3-libmount
 %endif
 Summary:        %main_summary
 License:        GPL-2.0-or-later
-Group:          %group_pl
+Group:          %main_group
 BuildRequires:  audit-devel
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -152,6 +152,8 @@ Patch1:         libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
 Patch2:         Add-documentation-on-blacklisted-modules-to-mount-8-.patch
 # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices
 Patch3:         util-linux-sulogin4bsc1175514.patch
+# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193
+Patch4:         util-linux-libmount-dont-use-symfollow.patch
 #
 %if %build_util_linux
 Supplements:    filesystem(minix)

util-linux-libmount-dont-use-symfollow.patch

@@ -0,0 +1,37 @@
+From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 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
+--- 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)

util-linux-systemd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
+
+- libmount: don't use "symfollow" for helpers on user mounts
+  (boo#1181750, util-linux-libmount-dont-use-symfollow.patch)
+
 -------------------------------------------------------------------
 Tue Feb  9 11:19:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 

util-linux-systemd.spec

@@ -152,6 +152,8 @@ Patch1:         libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
 Patch2:         Add-documentation-on-blacklisted-modules-to-mount-8-.patch
 # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices
 Patch3:         util-linux-sulogin4bsc1175514.patch
+# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193
+Patch4:         util-linux-libmount-dont-use-symfollow.patch
 #
 %if %build_util_linux
 Supplements:    filesystem(minix)

util-linux.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
+
+- libmount: don't use "symfollow" for helpers on user mounts
+  (boo#1181750, util-linux-libmount-dont-use-symfollow.patch)
+
 -------------------------------------------------------------------
 Tue Feb  9 11:19:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 

util-linux.spec

@@ -152,6 +152,8 @@ Patch1:         libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
 Patch2:         Add-documentation-on-blacklisted-modules-to-mount-8-.patch
 # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices
 Patch3:         util-linux-sulogin4bsc1175514.patch
+# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193
+Patch4:         util-linux-libmount-dont-use-symfollow.patch
 #
 %if %build_util_linux
 Supplements:    filesystem(minix)