Merge ~paelzer/ubuntu/+source/autofs:lp-1818121-nfs4.x-disco into ubuntu/+source/autofs:ubuntu/disco-devel

[Christian Ehrhardt ]

[Andreas Hasenack (ahasenack)]

taking a look

[Andreas Hasenack (ahasenack)]

I don't think this is worth a backport note, since you just removed an obvious hunk that is not relevant and did not change any of the bits that are being applied. I think the backport note you added in the description explains well enough what was done and why, and it's even below the signed off part the author added.

+1, up to you.

review: Approve

[Christian Ehrhardt  (paelzer)]

I thought the note can't hurt, so i'll keep it.
Thanks for checking this!

[Christian Ehrhardt  (paelzer)]

Tagged and uploaded to Disco

diff --git a/debian/changelog b/debian/changelog
index 789fbce..65d2234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+autofs (5.1.2-4ubuntu2) disco; urgency=medium
+
+  * d/p/autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch:
+    fix usage of NFS 4.x subversions (LP: #1818121)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 07 Mar 2019 13:03:35 +0100
+
 autofs (5.1.2-4ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch b/debian/patches/autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch
new file mode 100644
index 0000000..fdb0cd0
--- /dev/null
+++ b/debian/patches/autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch
@@ -0,0 +1,42 @@
+From aa1f432180f3878c303088def8d647f1bd50b10b Mon Sep 17 00:00:00 2001
+From: Ian Kent <[e-mail]>
+Date: Thu, 19 Oct 2017 08:48:44 +0800
+Subject: [PATCH] autofs-5.1.3 - handle additional nfs versions in mount_nfs.c
+
+Since NFSv4 can now have a subversion it needs to be allowed for.
+
+It's enough to check for an options string starting with "vers=4" or
+"nfsvers=4" because it's used only to set a flag used for special
+casing the availibility probe for any NFS version 4 version.
+
+Signed-off-by: Ian Kent <[e-mail]>
+
+Backport Note: skip the hunk on CHANGELOG as it is not needed and lacks
+               the 5.1.3 context it needs
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Ian Kent <[e-mail]>
+Origin: backport, https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=aa1f432180f3878c303088def8d647f1bd50b10b
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/<todo-bug>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=<todo-bug>
+Last-Update: 2019-03-07
+
+---
+ CHANGELOG           | 1 +
+ modules/mount_nfs.c | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/modules/mount_nfs.c
++++ b/modules/mount_nfs.c
+@@ -148,8 +148,9 @@ int mount_mount(struct autofs_point *ap,
+ 			} else if (_strncmp("use-weight-only", cp, o_len) == 0) {
+ 				flags |= MOUNT_FLAG_USE_WEIGHT_ONLY;
+ 			} else {
+-				if (_strncmp("vers=4", cp, o_len) == 0 ||
+-				    _strncmp("nfsvers=4", cp, o_len) == 0)
++				/* Is any version of NFSv4 in the options */
++				if (_strncmp("vers=4", cp, 6) == 0 ||
++				    _strncmp("nfsvers=4", cp, 9) == 0)
+ 					vers = NFS4_VERS_MASK | TCP_SUPPORTED;
+ 				else if (_strncmp("vers=3", cp, o_len) == 0 ||
+ 					 _strncmp("nfsvers=3", cp, o_len) == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 6e57a85..209e009 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-autofs-manpage-whatis.patch
 16group_buffer_size.patch
 fix-lookup-ldap-crash.patch
 autofs-5.1.4-dont-allow-trailing-slash-in-master-map-mount-points.patch
+autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch