Merge ~rafaeldtinoco/ubuntu/+source/autofs:lp1680224-groovy into ubuntu/+source/autofs:ubuntu/devel

Proposed by Rafael David Tinoco
Status: Superseded
Proposed branch: ~rafaeldtinoco/ubuntu/+source/autofs:lp1680224-groovy
Merge into: ubuntu/+source/autofs:ubuntu/devel
Diff against target: 112 lines (+72/-0) (has conflicts)
5 files modified
debian/changelog (+10/-0)
debian/control (+5/-0)
debian/patches/lp1680224-fix-and-double-quoting-in-auto_smb.patch (+26/-0)
debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch (+26/-0)
debian/patches/series (+5/-0)
Conflict in debian/changelog
Conflict in debian/control
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Andreas Hasenack Needs Fixing
Canonical Server Pending
Review via email: mp+385013@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Can you also please push this patch to debian at https://salsa.debian.org/debian/autofs/ ?

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Upon rechecking the bug, turns out "&" is also problematic, but looks like removing its escaping is also enough to fix the problem. I sent an email upstream. Until then, I'll mark this as n/f as we might have to amend the patch to also include "&". I pasted a new test script in the bug, and it's also below:
#!/bin/bash

set -e
set -x

sudo apt update
sudo apt dist-upgrade -y
sudo apt install autofs samba smbclient cifs-utils -y
sudo mkdir /myshare /c /a\&b
echo "This is myshare." | sudo tee /myshare/myshare.txt
echo "This is C." | sudo tee /c/c.txt
echo "This is a&b." | sudo tee /a\&b/a\&b.txt
echo "
[myshare]
    path = /myshare
    read only = yes
    guest ok = yes

[C$]
    path = /c
    read only = yes
    guest ok = yes

[a&b]
    path = /a&b
    read only = yes
    guest ok = yes
" | sudo tee -a /etc/samba/smb.conf

echo "/cifs /etc/auto.smb --timeout=300" | sudo tee -a /etc/auto.master

sudo systemctl restart smbd nmbd autofs

echo "
Run these commands now:

cat /cifs/localhost/myshare/myshare.txt
cat /cifs/localhost/C$/c.txt
cat /cifs/localhost/C\\$/c.txt
cat /cifs/localhost/a\&b/a\&b.txt
"

review: Needs Fixing

Unmerged commits

decf3da... by Rafael David Tinoco

update-maintainer

a73b582... by Rafael David Tinoco

changelog

b6b4691... by Rafael David Tinoco

* 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

f522470... by Mike Gabriel

Import patches-unapplied version 5.1.6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9d09e62f18c337dfca3ff629a1ea2930f023ce84

New changelog entries:
  [ Andreas Hasenack ]
  * d/p/fix-lookup-ldap-crash.patch: fix crash on startup due to uninitialized
    config. (LP #1503034). (Closes: #901344).
  * d/rules: Add LDFLAGS to avoid issues with accessing global variables in
    shared libraries (LP #1470687, LP #1472115).

9d09e62... by Mike Gabriel

Import patches-unapplied version 5.1.6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 1ea82b58cf6f07450b96e8a944b2b7696dbb2bcb

New changelog entries:
  * New upstream release.
  * debian/patches:
    + Rebase 11default_automaster_location.patch,
      12disable_default_auto_master.patch and spelling-error-fixes.patch.
    + Add two more spelling fixes to spelling-error-fixes.patch.
  * debian/{control,compat}:
    + Switch to debhelper-compat notation.
    + Bump to DH compat level version 12.
    + Drop autoconf from B-D.
  * debian/control:
    + Bump Standards-Version: to 4.4.1. No changes needed.
    + Add Rules-Requires-Root: field and set it to "no".
  * debian/rules:
    + Drop --with systemd. No longer provided in DH compat level >= 11.

1ea82b5... by Mike Gabriel

Import patches-unapplied version 5.1.5-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0ebca1b0b648f23d6b1429f8599faf8d3e87adb6

New changelog entries:
  * Upload to unstable as is.

0ebca1b... by Mike Gabriel

Import patches-unapplied version 5.1.5-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 93f939ff89e81be78716e791e48f37f1b136c920

New changelog entries:
  [ Mike Gabriel ]
  * New upstream release.
    - Make browsable_dirs option functional. Configurable in autofs.conf.
      (Closes: #784301).
    - Fix FTBFS with clang. (Closes: #757038).
    - Fix specification of nfsvers=4.1 (with minor version numbers) in
      auto.master. (Closes: #892374).
  * debian/patches:
    + Rebase some patches.
    + Drop do-not-check-for-modprobe-procfs-or-load-module.patch,
      fix-autofs-manpage-whatis.patch, fix-autofsconf-manpage-section.patch.
      Fixes shipped by upstream.
    + Add mount-hidden-samba-shares.patch. Fix regression between 5.0.8 and
      5.1.1 regarding the mounting of hidden samba shares. (Closes: #787202,
      #910367).
    + Add spelling-error-fixes.patch, fixing tons of spelling fixes. Thanks
      lintian.
  * debian/rules:
    + Add get-orig-source target.
    + Evoke install_samples upstream Makefile target explicitly during
      dh_auto_install.
    + Enable all hardening flags.
  * debian/control:
    + Bump to Standards-Version: 4.3.0. No changes needed.
    + Adopt autofs package. Thanks to Dmitry Smirnov and other contributors
      for all the previous work. (Closes: #849148).
    + Explicit B-D on pkg-config.
    + Update Vcs-*: fields. Packaging has moved to salsa.debian.org.
      (Closes: #902565).
    + Add B-D on dpkg-dev (>= 1.16.1.1~) for full hardening flag support.
    + Use secure URL in Homepage: field.
  * debian/source/options:
    + Drop custom compression for debian/ folder's tarball.
  * debian/autofs-ldap.<scripts>:
    + Ensure file permissions of /etc/autofs_ldap_auth.conf are set to
      root:root:0600 via dpkg-statoverride. (Closes: #805028).
  * debian/autofs.service:
    + Add nfs-client.target to Wants= key. Hopefully, this is sufficient to
      fix #842199, if not, please reopen the bug. (Closes: #842199).
    + PID file is in /run, not /var/run (which is a symlink to /run).
    + Add Documentation= key.
  * debian/copyright:
    + Drop outdated information from main header. Use https:// in URLs.
  [ Stefan Potyra ]
  * debian/control:
    + Add libtirpc-dev to build-depends.
  * debian/rules:
    + Add option --with-libtirpc to configure. (Closes: #737679, #709366).
  [ Andreas Hasenack ]
  * debian/tests:
    + Add nfs-mount and smb-mount tests. (Closes: #901554).
  [ Vincent McIntyre ]
  * debian/patches:
    + Add hardening-flags.patch. Assure that automount is built with
      DAEMON_CFLAGS. (Closes: #864857).

93f939f... by Adam Borowski

Import patches-unapplied version 5.1.2-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d949d6efcc14da18e8c0385734721be86d462453

New changelog entries:
  * QA upload.
  * Fix doubled .conf in a man page's filename, fixing FTBFS.
    (Closes: #903167)

d949d6e... by Andreas Henriksson

Import patches-unapplied version 5.1.2-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 393e7b5d3ab7f97cc6c8ffbfb381901a7744fec9

New changelog entries:
  * QA upload.
  [ Laurent Bigonville ]
  * debian/control: Switch all the packages to Arch:linux-any
  [ Andreas Henriksson ]
  * Add e2fsprogs to build-dep and recommends (Closes: #887284)
  * Drop incorrect depends on lsb-base
  * Drop incorrect *build*-dep on lsb-base

393e7b5... by Laurent Bigonville

Import patches-unapplied version 5.1.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 668770d5718242d2937ae9eb60aad24b95ff1166

New changelog entries:
  * QA upload.
  [ Laurent Bigonville ]
  * Orphan the package, see #849148
  * debian/watch: Update the URL now that kernel.org ftp has been shutdown
    (Closes: #864849)
  * debian/control: Add dependency against lsb-base (Closes: #864852)
  * debian/autofs.postrm: Remove /etc/autofs.conf on purge (Closes: #788129)
  * debian/autofs.dirs: Install empty /etc/auto.master.d directory (Closes:
    #884233)
  * debian/rules: Don't strip the binaries during the build so the dbgsym
    packages actually contain the debugging symbols
  * debian/control: Bump Standards-Version to 4.1.2 and bump the packages
    priority from extra to optional, the former is now deprecated
  * debian/control: Drop dh-systemd build-dependency and bump debhelper to (>=
    9.20160709)
  * debian/rules: Really enable the force shutdown signal handler as intended
    (Closes: #743654)
  * d/p/fix-autofsconf-manpage-section.patch: Fix manpage section
  * d/p/fix-autofs-manpage-whatis.patch: Fix whatis entry for autofs.8
    manpage (Closes: #864853)
  * Move autofs.conf.5 manpage from autofs-ldap to the main autofs package
    (Closes: #870653)
  * debian/rules: Set --enable-sloppy-mount instead of modifying the
    include/config.h file manually
  * debian/control: Drop autofs5 transitional packages (Closes: #878205)
  [ Timo Aaltonen ]
  * Replace fix-ssldir.patch with fix-ssslib-search.patch, which is more
    upstreamable. Preseed sssldir in rules.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 54f8538..e4f184a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,13 @@
6+<<<<<<< debian/changelog
7+=======
8+autofs (5.1.6-2ubuntu1) groovy; urgency=medium
9+
10+ * Allow administrative shares to work (LP: #1680224):
11+ - d/p/lp1680224-fix-double-quoting-in-auto_smb.patch
12+
13+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Wed, 03 Jun 2020 00:30:58 +0000
14+
15+>>>>>>> debian/changelog
16 autofs (5.1.6-2) unstable; urgency=medium
17
18 [ Andreas Hasenack ]
19diff --git a/debian/control b/debian/control
20index 68d2c48..39e7f66 100644
21--- a/debian/control
22+++ b/debian/control
23@@ -1,7 +1,12 @@
24 Source: autofs
25 Section: utils
26 Priority: optional
27+<<<<<<< debian/control
28 Maintainer: Mike Gabriel <sunweaver@debian.org>
29+=======
30+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
31+XSBC-Original-Maintainer: Mike Gabriel <sunweaver@debian.org>
32+>>>>>>> debian/control
33 Uploaders:
34 Debian Edu Packaging Team <debian-edu-pkg-team@lists.alioth.debian.org>,
35 Standards-Version: 4.4.1
36diff --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
37new file mode 100644
38index 0000000..3654ba3
39--- /dev/null
40+++ b/debian/patches/lp1680224-fix-and-double-quoting-in-auto_smb.patch
41@@ -0,0 +1,26 @@
42+Description: fix double quoting for AND in auto.smb
43+
44+The example program mount script installed to /etc/auto.smb incorrectly adds a
45+quote for the trailing AND signal of special Windows mounts. But they are
46+already surrounded by double quotes. This may have been handled by mount.cifs
47+at some point but it's failing now.
48+
49+NOTE: This hasn't been done in upstream yet, although upstream maintainer said
50+it should. Please verify if this patch can be updated by the official one next
51+time this package is managed.
52+
53+Author: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
54+Forwarded: https://www.spinics.net/lists/autofs/msg02231.html
55+Bug-Ubuntu: https://launchpad.net/bugs/1680224
56+Last-Update: 2020-06-03
57+
58+--- autofs-5.1.6.orig/samples/auto.smb
59++++ autofs-5.1.6/samples/auto.smb
60+@@ -75,7 +75,6 @@ $SMBCLIENT $smbopts -gL "$key" 2>/dev/nu
61+ dir = $2
62+ loc = $2
63+ # Enclose mount dir and location in quotes
64+- gsub(/\&/,"\\\\&",loc)
65+ print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\""
66+ }
67+ END { if (!first) print "\n"; else exit 1 }
68diff --git a/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch b/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch
69new file mode 100644
70index 0000000..c7bed6f
71--- /dev/null
72+++ b/debian/patches/lp1680224-fix-double-quoting-in-auto_smb.patch
73@@ -0,0 +1,26 @@
74+Description: autofs-5.1.6 - fix double quoting in auto.smb
75+
76+The example program mount script installed to /etc/auto.smb incorrectly adds a
77+quote for the trailing dollar of special Windows mounts. But they are already
78+surrounded by double quotes. This may have been handled by mount.cifs at some
79+point but it's failing now.
80+
81+Signed-off-by: Ian Kent <raven@themaw.net>
82+
83+Author: Ian Kent <raven@themaw.net>
84+Origin: upstream, https://tinyurl.com/ydavbsel
85+Bug-Ubuntu: https://launchpad.net/bugs/1680224
86+Reviewed-By: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
87+Last-Update: 2020-06-03
88+
89+--- autofs-5.1.6.orig/samples/auto.smb
90++++ autofs-5.1.6/samples/auto.smb
91+@@ -75,8 +75,6 @@ $SMBCLIENT $smbopts -gL "$key" 2>/dev/nu
92+ dir = $2
93+ loc = $2
94+ # Enclose mount dir and location in quotes
95+- # Double quote "$" in location as it is special
96+- gsub(/\$$/, "\\$", loc);
97+ gsub(/\&/,"\\\\&",loc)
98+ print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\""
99+ }
100diff --git a/debian/patches/series b/debian/patches/series
101index 9d4d7b6..e7197f6 100644
102--- a/debian/patches/series
103+++ b/debian/patches/series
104@@ -8,3 +8,8 @@ mount-hidden-samba-shares.patch
105 hardening-flags.patch
106 spelling-error-fixes.patch
107 fix-lookup-ldap-crash.patch
108+<<<<<<< debian/patches/series
109+=======
110+lp1680224-fix-double-quoting-in-auto_smb.patch
111+lp1680224-fix-and-double-quoting-in-auto_smb.patch
112+>>>>>>> debian/patches/series

Subscribers

People subscribed via source and target branches