Merge ~sergiodj/ubuntu/+source/util-linux:bug1905510-user-mount-cifs-break into ubuntu/+source/util-linux:ubuntu/devel

[Sergio Durigan Junior]

This is the fix for bug 1905510.

This bug has already been reported and fixed upstream here:

https://github.com/karelzak/util-linux/issues/1193

so this is just the backport of the (simple) patch. The issue is that, without the patch, the "symfollow" option (used when one does a user mount with mount.cifs, for example) is not recognized by util-linux, leading to an error message like:

[ 53.586709] CIFS: Attempting to mount //localhost/myshare1760
[ 53.586735] CIFS: Unknown mount option "symfollow"

This is needed in order to unblock samba from migrating (which itself is blocking Python 3.9), so you could say the priority is high.

I verified that this fix makes samba's dep8 tests pass:

autopkgtest [17:49:38]: @@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access PASS
cifs-share-access-uring PASS
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS
smbclient-share-access-uring PASS

I have also verified that util-linux's dep8 tests are still passing:

autopkgtest [18:10:33]: @@@@@@@@@@@@@@@@@@@@ summary
oversized-chunks PASS
libblkid-dev PASS (superficial)
libmount-dev PASS (superficial)
libsmartcols-dev PASS (superficial)
uuid-dev PASS (superficial)

[Sergio Durigan Junior (sergiodj)]

Adding the Foundations team to the list of reviewers because it's their package.

[Balint Reczey (rbalint)]

Uploaded, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 48ce17e..585cade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+util-linux (2.36.1-1ubuntu2) hirsute; urgency=medium
+
+  * Unbreak mount.cifs user mount (LP: #1905510)
+    - d/p/libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch:
+      Backport from upstream patch to fix user mounts on mount.cifs,
+      because the "symfollow" option became unknown.
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 26 Nov 2020 16:51:24 -0500
+
 util-linux (2.36.1-1ubuntu1) hirsute; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch b/debian/patches/libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch
new file mode 100644
index 0000000..0d08667
--- /dev/null
+++ b/debian/patches/libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch
@@ -0,0 +1,44 @@
+From: Karel Zak <[e-mail]>
+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 <[e-mail]>
+
+Author: Karel Zak <[e-mail]>
+Origin: upstream, https://github.com/karelzak/util-linux/commit/52f730e47869ce630fafb24fd46f755dc7ffc691
+Bug: https://github.com/karelzak/util-linux/issues/1193
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/util-linux/+bug/1905510
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975003
+Last-Update: 2020-11-26
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+---
+ 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 8c394c1..dd17861 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)
diff --git a/debian/patches/series b/debian/patches/series
index ee52246..0f2c20b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 sulogin-fallback-static-sh.patch                           
 sulogin-lockedpwd.patch
 verbose-tests.patch
+libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch