Merge ~paelzer/ubuntu/+source/autofs:5.1.6-4-hirsute into ubuntu/+source/autofs:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Essentially the same (e.g. reasoning why delta is still needed) as
https://code.launchpad.net/~ahasenack/ubuntu/+source/autofs/+git/autofs/+merge/389124

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4340/

It is really trivial, but since I had them I pushed the tags along:

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/autofs
 * [new tag] lp9999999/logical/5.1.6-3ubuntu1 -> lp9999999/logical/5.1.6-3ubuntu1
 * [new tag] lp9999999/new/debian -> lp9999999/new/debian
 * [new tag] lp9999999/old/debian -> lp9999999/old/debian
 * [new tag] lp9999999/old/ubuntu -> lp9999999/old/ubuntu
 * [new tag] lp9999999/reconstruct/5.1.6-3ubuntu1 -> lp9999999/reconstruct/5.1.6-3ubuntu1
 * [new tag] lp9999999/split/5.1.6-3ubuntu1 -> lp9999999/split/5.1.6-3ubuntu1

[Bryce Harrington (bryce)]

+1 straightforward carry of delta to new version. LGTM

review: Approve

[Christian Ehrhardt  (paelzer)]

No tests listed because only exceptions are shown - gladly my cli tool can unveil them :-)
https://bileto.ubuntu.com/excuses/4340/hirsute.html
All tests good - uploading

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/autofs
 * [new tag] upload/5.1.6-4ubuntu1 -> upload/5.1.6-4ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading autofs_5.1.6-4ubuntu1.dsc: done.
  Uploading autofs_5.1.6.orig.tar.xz: done.
  Uploading autofs_5.1.6-4ubuntu1.debian.tar.xz: done.
  Uploading autofs_5.1.6-4ubuntu1_source.buildinfo: done.
  Uploading autofs_5.1.6-4ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Hrm while this built fine yesterday in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4340/ as of today it fails at https://launchpad.net/ubuntu/+source/autofs/5.1.6-4ubuntu1 with "Missing build dependencies: python3 (< 3.9)".

And indeed python3 was started 14h ago
https://launchpad.net/ubuntu/+source/python3-defaults/3.9.0-3

Autofs has no own build-dep to this python version, it must be a secondary one due to indirect dependencies.

I guess we have to do nothing, but retrying the build once this settled.

diff --git a/debian/changelog b/debian/changelog
index b6dbcfe..3e16f47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+autofs (5.1.6-4ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Allow administrative shares to work (LP 1680224):
+      + d/p/lp1680224-fix-double-quoting-in-auto_smb.patch
+      + d/p/lp1680224-fix-and-double-quoting-in-auto_smb.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Nov 2020 16:05:17 +0100
+
 autofs (5.1.6-4) unstable; urgency=medium
 
   * debian/patches:
@@ -9,6 +18,15 @@ autofs (5.1.6-4) unstable; urgency=medium
 
  -- Mike Gabriel <[e-mail]>  Mon, 26 Oct 2020 21:46:29 +0100
 
+autofs (5.1.6-3ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+  - Allow administrative shares to work (LP #1680224):
+    + d/p/lp1680224-fix-double-quoting-in-auto_smb.patch
+    + d/p/lp1680224-fix-and-double-quoting-in-auto_smb.patch
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 11 Aug 2020 17:57:17 -0300
+
 autofs (5.1.6-3) unstable; urgency=medium
 
   * debian/patches:
@@ -20,6 +38,15 @@ autofs (5.1.6-3) unstable; urgency=medium
 
  -- Mike Gabriel <[e-mail]>  Mon, 29 Jun 2020 13:21:47 +0200
 
+autofs (5.1.6-2ubuntu1) groovy; urgency=medium
+
+  [ Andreas Hasenack ]
+  * Allow administrative shares to work (LP: #1680224):
+    - d/p/lp1680224-fix-double-quoting-in-auto_smb.patch
+    - d/p/lp1680224-fix-and-double-quoting-in-auto_smb.patch
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 03 Jun 2020 00:30:58 +0000
+
 autofs (5.1.6-2) unstable; urgency=medium
 
   [ Andreas Hasenack ]
diff --git a/debian/control b/debian/control
index 9db5882..d272719 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: autofs
 Section: utils
 Priority: optional
-Maintainer: Mike Gabriel <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Mike Gabriel <[e-mail]>
 Uploaders:
  Debian Edu Packaging Team <[e-mail]>,
 Standards-Version: 4.5.0
diff --git a/debian/patches/lp1680224-fix-and-double-quoting-in-auto_smb.patch b/debian/patches/lp1680224-fix-and-double-quoting-in-auto_smb.patch
new file mode 100644
index 0000000..3654ba3
--- /dev/null
+++ b/debian/patches/lp1680224-fix-and-double-quoting-in-auto_smb.patch
@@ -0,0 +1,26 @@
+Description: fix double quoting for AND in auto.smb
+
+The example program mount script installed to /etc/auto.smb incorrectly adds a
+quote for the trailing AND signal of special Windows mounts. But they are
+already surrounded by double quotes. This may have been handled by mount.cifs
+at some point but it's failing now.
+
+NOTE: This hasn't been done in upstream yet, although upstream maintainer said
+it should. Please verify if this patch can be updated by the official one next
+time this package is managed.
+
+Author: Rafael David Tinoco <[e-mail]>
+Forwarded: https://www.spinics.net/lists/autofs/msg02231.html
+Bug-Ubuntu: https://launchpad.net/bugs/1680224
+Last-Update: 2020-06-03
+
+--- autofs-5.1.6.orig/samples/auto.smb
++++ autofs-5.1.6/samples/auto.smb
+@@ -75,7 +75,6 @@ $SMBCLIENT $smbopts -gL "$key" 2>/dev/nu
+ 		  dir = $2
+ 		  loc = $2
+ 		  # Enclose mount dir and location in quotes
+-		  gsub(/\&/,"\\\\&",loc)
+ 		  print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\""
+ 		}
+ 	END 	{ if (!first) print "\n"; else exit 1 }
diff --git a/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch b/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch
new file mode 100644
index 0000000..c7bed6f
--- /dev/null
+++ b/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch
@@ -0,0 +1,26 @@
+Description: autofs-5.1.6 - fix double quoting in auto.smb
+
+The example program mount script installed to /etc/auto.smb incorrectly adds a
+quote for the trailing dollar of special Windows mounts. But they are already
+surrounded by double quotes. This may have been handled by mount.cifs at some
+point but it's failing now.
+
+Signed-off-by: Ian Kent <[e-mail]>
+
+Author: Ian Kent <[e-mail]>
+Origin: upstream, https://tinyurl.com/ydavbsel
+Bug-Ubuntu: https://launchpad.net/bugs/1680224
+Reviewed-By: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-06-03
+
+--- autofs-5.1.6.orig/samples/auto.smb
++++ autofs-5.1.6/samples/auto.smb
+@@ -75,8 +75,6 @@ $SMBCLIENT $smbopts -gL "$key" 2>/dev/nu
+ 		  dir = $2
+ 		  loc = $2
+ 		  # Enclose mount dir and location in quotes
+-		  # Double quote "$" in location as it is special
+-		  gsub(/\$$/, "\\$", loc);
+ 		  gsub(/\&/,"\\\\&",loc)
+ 		  print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\""
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index 5ea43d3..a596c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ fix-lookup-ldap-crash.patch
 make-bind-mounts-propagation-slave-by-default.patch
 fix-autofs-schema.patch
 fix-nfs4-mounts-in-auto-net.patch
+lp1680224-fix-double-quoting-in-auto_smb.patch
+lp1680224-fix-and-double-quoting-in-auto_smb.patch