Merge ~ahasenack/ubuntu/+source/autofs:cosmic-merge-5.1.2-3 into ubuntu/+source/autofs:debian/sid

[Andreas Hasenack]

Merge from debian's 5.1.2-3, plus an extra fix for bug #1754506.

PPA with test packages: sudo add-apt-repository ppa:ahasenack/autofs-merge-5.1.2-3
(https://launchpad.net/~ahasenack/+archive/ubuntu/autofs-merge-5.1.2-3)

To test:
apt install cifs-utils smbclient autofs

Add this to /etc/auto.master:

# trailing slash in /cifs is what triggers the bug
/cifs/ /etc/auto.smb --timeout=30

Restart autofs:
sudo systemctl restart autofs

Assuming "cifs-server" is a valid CIFS server dns name, and "pub" is a
valid share, navigate to it:

cd /cifs/cifs-server/pub
ls

Navigate away:
cd /

Confirm cifs is mounted:
mount -t cifs

After the timeout passes, it will still be mounted.

If instead you use "/cifs /etc/auto.smb --timeout=30" (without the ending
slash in /cifs) in /etc/auto.master, then it works. If using the fixed packages, then the trailing slash represents no problem and the timeout works as expected.

[Christian Ehrhardt  (paelzer)]

Started review and added generic server-team review slot to show up in our overview

[Christian Ehrhardt  (paelzer)]

Hi,
tags LGTM
dropped changes: ack
retained changes: correctly retained

So this is all good, but has some optional things we might want to look into on this merge.

I wonder on the two older kept changes, both about 3 years old:
+ - Add LDFLAGS to avoid issues with accessing global variables in
+ shared libraries (LP #1470687, LP #1472115).
+ - d/p/fix-lookup-ldap-crash.patch: fix crash on startup due to uninitialized
+ config.
There should be either of the following:
a) dropping the code, build it and retest the old bugs - still triggers -> submit to Debian as well
b) dropping the code, build it and retest the old bugs - no more triggers -> Drop Delta

On the crash I'd assume it still appears and needs to be reported.
On the LDFLAGS instead I doubt this still really works.
First our build log [1] still has symbolic-functions while Debian [2] has not.
So the fix might be incomplete these days or is it no more important?

Anyway I'd appreciate if you would look into those two Deltas.

Also you mentioned segfaults when building that on Ubuntu - was that riddle solved as well?

Finally I have two super-minor changelog nit picks that you can consider (or not) depending on your mood.

[1]: https://launchpadlibrarian.net/365726198/buildlog_ubuntu-bionic-amd64.autofs_5.1.2-1ubuntu3_BUILDING.txt.gz
[2]: https://buildd.debian.org/status/fetch.php?pkg=autofs&arch=amd64&ver=5.1.2-3&stamp=1518905129&raw=0

review: Needs Information

[Andreas Hasenack (ahasenack)]

On Thu, Jun 7, 2018 at 4:40 AM,  Christian Ehrhardt  <email address hidden> wrote:

    I wonder on the two older kept changes, both about 3 years old:
    + - Add LDFLAGS to avoid issues with accessing global variables in
    + shared libraries (LP #1470687, LP #1472115).
    + - d/p/fix-lookup-ldap-crash.patch: fix crash on startup due to uninitialized
    + config.
    There should be either of the following:
    a) dropping the code, build it and retest the old bugs - still triggers -> submit to Debian as well
    b) dropping the code, build it and retest the old bugs - no more triggers -> Drop Delta

    On the crash I'd assume it still appears and needs to be reported.

I'll check the ldap case.

    On the LDFLAGS instead I doubt this still really works.
    First our build log [1] still has symbolic-functions while Debian [2] has not.
    So the fix might be incomplete these days or is it no more important?

dpkg-buildflags in Ubuntu outputs the symbolic-functions setting, but Debian's does not. If the build happens with that linker flag set, automount segfaults on startup on a null pointer deref. The global variable holding the config suddenly becomes a NULL as autofs plugins are loaded. So there is no need to push this one to Debian.

    Anyway I'd appreciate if you would look into those two Deltas.

    Also you mentioned segfaults when building that on Ubuntu - was that riddle solved as well?

It was a one-line incorrect merge on my part that didn't remove the symbolic-functions flag, and that causes a crash on startup as explained above.

[Andreas Hasenack (ahasenack)]

Without the lookup-ldap patch, ubuntu's automount crashes on startup if there is an ldap configuration in /etc/auto.master:

root@cosmic-autofs:~# automount -v -f -d
Starting automounter version 5.1.2, master map /etc/auto.master
using kernel protocol version 5.02
lookup_nss_read_master: reading master file /etc/auto.master
do_init: parse(sun): init gathered global options: (null)
lookup_read_master: lookup(file): read entry +dir:/etc/auto.master.d
lookup_nss_read_master: reading master dir /etc/auto.master.d
lookup_read_master: lookup(dir): scandir: /etc/auto.master.d
lookup_read_master: lookup(file): read entry +auto.master
lookup_nss_read_master: reading master files auto.master
do_init: parse(sun): init gathered global options: (null)
lookup(file): failed to read included master map auto.master
lookup_read_master: lookup(file): read entry /cifs
lookup_read_master: lookup(file): read entry +ldap:automountMapName=auto.master.linux,ou=automount,ou=auto,dc=example,dc=com
lookup_nss_read_master: reading master ldap automountMapName=auto.master.linux,ou=automount,ou=auto,dc=example,dc=com
Segmentation fault (core dumped)
root@cosmic-autofs:~#

I'll check if that's still the case in debian. It's hard to imagine upstream autofs would have gone so long without fixing a basic ldap crash. The patch code isn't in upstream's git repo yet, so maybe it was fixed differently.

[Andreas Hasenack (ahasenack)]

Ok, so two things:

a) d/rules was incorrectly calling dpkg-buildflags. Fix:
 override_dh_auto_build:
        CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
- DONTSTRIP=1 LDFLAGS="$(dpkg-buildflags --get LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')" \
+ DONTSTRIP=1 LDFLAGS="$$(dpkg-buildflags --get LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')" \

b) Even with that, -Bsymbolic-functions is still leakoing, and guess what: just when building the lookup_ldap.so module. That would explain why we need the patch, and debian doesn't, because debian doesn't have the -Bsymbolic-functions flag. So the global variable suddenly becomes NULL.

The leak comes from KRB5_LIBS:
KRB5_LIBS=-L/usr/lib/x86_64-linux-gnu/mit-krb5 -Wl,-Bsymbolic-functions -Wl,-z,relro -lkrb5 -lk5crypto -lcom_err

Checking into that now.

[Andreas Hasenack (ahasenack)]

$ krb5-config --libs
-L/usr/lib/x86_64-linux-gnu/mit-krb5 -Wl,-Bsymbolic-functions -Wl,-z,relro -lkrb5 -lk5crypto -lcom_err

fun

[Christian Ehrhardt  (paelzer)]

On Thu, Jun 7, 2018 at 4:21 PM, Andreas Hasenack <email address hidden>
wrote:

> $ krb5-config --libs
> -L/usr/lib/x86_64-linux-gnu/mit-krb5 -Wl,-Bsymbolic-functions
> -Wl,-z,relro -lkrb5 -lk5crypto -lcom_err
>
> fun
>

So is it a problem that it is "there" ?

[Andreas Hasenack (ahasenack)]

The -Bsymbolic-functions flag has been in ubuntu for quite some time, according to dpkg's d/changelog, at least 10 years.

[Andreas Hasenack (ahasenack)]

Yes, when -Bsymbolic-functions is used, the global config variable "disappears" in autofs modules. The ensuing crash is a null pointer deref. What the lookup-ldap patch does is initialize it again inside the module. And it's only needed in that particular module because -Bsymbolic-functions, despite being stripped from LDFLAGS, leaks into the command line via the krb5 libraries, which come from a call to "krb5-config --libs".

I bet this is also the source of the segfaults I was seeing when autofs linked with tirpc. The segfault was happening inside such a module, and I couldn't figure out why certain variables were suddenly NULL pointers.

I'm not sure what to do here. -Bsymbolic-functions seems something foundations decided upon 10 years ago (and debian hasn't adopted yet). Stripping it from krb5-config --libs seems a bit too hardcore. I'm not sure what's the intention of this flag anyway: why is it something good to have? Knowing that would be needed before submitting the lookup-ldap patch upstream.

[Christian Ehrhardt  (paelzer)]

>
> I'm not sure what to do here. -Bsymbolic-functions seems something
> foundations decided upon 10 years ago (and debian hasn't adopted yet).
> Stripping it from krb5-config --libs seems a bit too hardcore. I'm not sure
> what's the intention of this flag anyway: why is it something good to have?
> Knowing that would be needed before submitting the lookup-ldap patch
> upstream.
>
>
IMHO: Talk to Doko or Infinity on this please.

[Andreas Hasenack (ahasenack)]

I rebased and pushed again with the fix to the dpkg-buildflags call in d/rules, and added a note to the changelog. I'll update the ppa and retest. The ldap lookup patch is still there for this, though.

[Andreas Hasenack (ahasenack)]

I added some notes to the DEP3 description of the fix-lookup-ldap patch as well, explaining why it is still needed.

[Andreas Hasenack (ahasenack)]

Also emailed ubuntu-devel: https://lists.ubuntu.com/archives/ubuntu-devel/2018-June/040369.html

[Christian Ehrhardt  (paelzer)]

so a and b essentially were due to the same issue.
Interesting.

I think you are as good as you can be on this now.
We don't have to wait for the answers on the compile details.
You can do another upload if that changes things tremendously.

Therefore IMHO approved

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks. Can you please tag and upload? I just tested again after all these changelog changes and the $$(dpkg-buildflags ...) fix and it's still working fine. The HEAD hash is 1f864fae211cee7b2df471aa93d4c843c1ee7e81

[Andreas Hasenack (ahasenack)]

I got very useful replies in ubuntu-devel@. I will try to apply them and resubmit. Please disregard the request to push the upload tag and sponsor.

[Andreas Hasenack (ahasenack)]

Please review again. Noteworthy changes:
- debian bug filed: https://bugs.debian.org/901344
- email sent to upstream: https://www.spinics.net/lists/autofs/msg01903.html
- switched to using DEB_LDFLAGS_MAINT_STRIP instead of a simple sed to remove the -Wl,-Bsymbolic-functions linker option from the build. I grabbed your fix for bug #1636781

[Christian Ehrhardt  (paelzer)]

LGTM with the new fix now (how could I oppose my own change, well done :-) ).

I checked the buildlog of latest ppa upload you had with that change.
https://launchpadlibrarian.net/374085437/buildlog_ubuntu-cosmic-amd64.autofs_5.1.2-3ubuntu1~ppa6_BUILDING.txt.gz

I still see it leaking for KRB5, but you told me that is not a problem.
Is that correct:
gcc -Wl,-z,relro -shared -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DSSS_LIB_DIR=\"/usr/lib/x86_64-linux-gnu/sssd/modules\" -I../include -I../lib -fPIC -D_GNU_SOURCE -DAUTOFS_LIB_DIR=\"/usr/lib/x86_64-linux-gnu/autofs\" -DAUTOFS_MAP_DIR=\"/etc\" -DLDAP_DEPRECATED=1 -I/usr/include/libxml2 -DLDAP_THREAD_SAFE -isystem /usr/include/mit-krb5 -o lookup_ldap.so \
 lookup_ldap.c dclist.o base64.o cyrus-sasl.o cyrus-sasl-extern.o \
 -Wl,-z,relro ../lib/autofs.a -lldap -llber -lresolv -lxml2 -lsasl2 -L/usr/lib/x86_64-linux-gnu/mit-krb5 -Wl,-Bsymbolic-functions -Wl,-z,relro -lkrb5 -lk5crypto -lcom_err -lpthread -lnsl
: lookup_ldap.so

Given the former explanations I take it as a yes (the old sed based change also had this and worked), but I wanted to be sure and ask.

Some minor changes to the changelog requested (two of them inline), fix them if you want - but +1 in general already.

Ask for sponsoring if needed, thanks!
Christian

review: Approve

[Andreas Hasenack (ahasenack)]

Steve thinks that -Wl,-Bsymbolic-functions leaking through $(krb5-config --libs) is a bug (see the ubuntu-devel small thread). I quickly checked that shell script, and it definitely adds LDFLAGS to its output. I'm not ready to change that at this time, as it would have wide repercussions. This is what makes the ldap patch still necessary in this build.

[Andreas Hasenack (ahasenack)]

Agreed about changelog, changes made, rebased and push forced. This is good to go, hash d9bfb75656065c91f51a1290b2e40bb99a6ba49c. If you could please push the upload tag and dput, as I don't have upload rights for autofs.

[Christian Ehrhardt  (paelzer)]

Agreeing to the fixups and the krb5 explanation.

[Christian Ehrhardt  (paelzer)]

Tag pushed and after a final lintian run uploaded to cosmic.

[Andreas Hasenack (ahasenack)]

Thanks. As usual, I'll check its migration.

diff --git a/debian/changelog b/debian/changelog
index 3bc4d72..5efc4bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+autofs (5.1.2-3ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1775232). Remaining changes:
+    - d/p/16group_buffer_size.patch
+    - d/rules: Add LDFLAGS to avoid issues with accessing global variables in
+      shared libraries (LP #1470687, LP #1472115).
+      [Updated to use DEB_LDFLAGS_MAINT_STRIP instead of sed]
+    - d/p/fix-lookup-ldap-crash.patch: fix crash on startup due to uninitialized
+      config. (LP #1503034)
+      [Updated DEP3 header with why this patch is still needed]
+  * Dropped:
+    - debian/rules: build with sssldir path
+      [Adopted by Debian in 5.1.2-2]
+    - d/p/fix-ssslib-search.patch - parts replaced by fix-sssldir.patch
+      [Adopted by Debian in 5.1.2-2]
+  * Added:
+    - debian/patches/autofs-5.1.4-dont-allow-trailing-slash-in-master-map-
+      mount-points.patch: Don't allow trailing slash in master map mount
+      points.  Thanks to: Ian Kent <[e-mail]>.  Closes LP: #1754506.
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 05 Jun 2018 14:42:35 -0300
+
 autofs (5.1.2-3) unstable; urgency=medium
 
   * QA upload.
@@ -46,6 +68,38 @@ autofs (5.1.2-2) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Wed, 13 Dec 2017 10:28:56 +0100
 
+autofs (5.1.2-1ubuntu3) bionic; urgency=medium
+
+  * Revert the previous change, as it introduced a segfault when using the
+    builtin -hosts map. This will reopen #1101779. (LP: #1745817)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 13 Apr 2018 16:29:51 -0300
+
+autofs (5.1.2-1ubuntu2) bionic; urgency=medium
+
+  * Fix IPv6 support by linking with libtirpc (LP: #1101779, Closes: #737679):
+    - d/control: add libtirpc-dev to build-depends
+    - d/rules: add --with-libtirpc to configure call
+    Thanks to Stefan Potyra <[e-mail]>.
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 24 Jan 2018 14:01:38 -0200
+
+autofs (5.1.2-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+   - debian/rules: build with sssldir path
+   - d/p/fix-ssslib-search.patch
+   - d/p/16group_buffer_size.patch
+   - Add LDFLAGS to avoid issues with accessing global variables in shared
+     libraries.
+   - d/p/fix-lookup-ldap-crash.patch: fix crash on startup due to uninitialized
+     config.
+  * Drop changes:
+   - Replace systemd service with upstart service; we have been on systemd
+     since Xenial, so we should be fine to use the systemd service.
+
+ -- Robie Basak <[e-mail]>  Thu, 16 Feb 2017 19:10:50 +0000
+
 autofs (5.1.2-1) unstable; urgency=medium
 
   * New upstream release [June 2016] (Closes: #846054).
@@ -57,6 +111,39 @@ autofs (5.1.2-1) unstable; urgency=medium
 
  -- Dmitry Smirnov <[e-mail]>  Fri, 23 Dec 2016 10:34:46 +1100
 
+autofs (5.1.1-1ubuntu3) xenial; urgency=medium
+
+  [ Malcolm Scott ]
+  * d/p/fix-lookup-ldap-crash.patch:
+    - Fix crash on startup due to uninitialized config.  LP: #1503034
+
+  [ Michael Terry ]
+  * d/p/fix-lookup-ldap-crash.patch:
+    - Adjust above patch to be slightly more generic
+
+ -- Michael Terry <[e-mail]>  Thu, 19 Nov 2015 17:31:09 -0500
+
+autofs (5.1.1-1ubuntu2) wily; urgency=low
+
+  * Add LDFLAGS to avoid issues with accessing global variables in
+    shared libraries (LP: #1470687, LP: #1472115).
+
+ -- Stefan Bader <[e-mail]>  Tue, 07 Jul 2015 16:28:53 +0200
+
+autofs (5.1.1-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+   - autofs.upstart script
+   - debian/rules: build with sssldir path
+   - d/p/fix-ssslib-search.patch - parts replaced by fix-sssldir.patch
+   - d/p/16group_buffer_size.patch
+  * Dropped patches:
+    - CVE-2014-8169-add-a-prefix-to-program-map-stdvars.patch
+    - CVE-2014-8169-add-config-option-to-force-use-of-program-map-stdvars.patch
+    - lp1386869-fix-cant-automount-when--host-exist
+
+ -- Chris J Arges <[e-mail]>  Mon, 06 Jul 2015 14:59:51 -0500
+
 autofs (5.1.1-1) unstable; urgency=low
 
   * New upstream release [April 2015].
@@ -109,6 +196,42 @@ autofs (5.0.8-2) unstable; urgency=medium
 
  -- Dmitry Smirnov <[e-mail]>  Thu, 19 Mar 2015 18:38:23 +1100
 
+autofs (5.0.8-1ubuntu3.1) vivid; urgency=medium
+
+  * Fix mount issues when using '-host' in conf file. (LP: #1386869)
+
+ -- Seyeong Kim <[e-mail]>  Tue, 28 Apr 2015 11:53:54 -0500
+
+autofs (5.0.8-1ubuntu3) vivid; urgency=medium
+
+  * SECURITY UPDATE: privilege escalation via interpreter load path
+    - debian/patches/CVE-2014-8169-*.patch: add a prefix to program map
+      stdvars and a config option to override it in include/mounts.h,
+      lib/mounts.c, modules/lookup_program.c, modules/parse_sun.c,
+      include/defaults.h, lib/defaults.c, modules/lookup_program.c,
+      samples/autofs.conf.default.in, document changes in
+      man/autofs.5, man/auto.master.5.in.
+    - CVE-2014-8169
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 20 Mar 2015 16:04:47 -0400
+
+autofs (5.0.8-1ubuntu2) vivid; urgency=medium
+
+  * Build with -fgnu89-inline. Closes: #777787.
+
+ -- Matthias Klose <[e-mail]>  Wed, 04 Mar 2015 20:29:34 +0100
+
+autofs (5.0.8-1ubuntu1) utopic; urgency=low
+
+  [ Greg Lutostanski ]
+  * Merge from Debian unstable. (LP: #1351337) Remaining changes:
+    - debian/autofs.upstart - upstart job
+    - debian/patches/16group_buffer_size.patch:
+      + prevents package to eat the cpu if you have large groups.
+    - Add support for sssd backend
+
+ -- Luke Yelavich <[e-mail]>  Tue, 05 Aug 2014 13:30:18 +1000
+
 autofs (5.0.8-1) unstable; urgency=low
 
   * New upstream release [October 2013] (Closes: #729023).
@@ -139,6 +262,49 @@ autofs (5.0.8-1) unstable; urgency=low
 
  -- Dmitry Smirnov <[e-mail]>  Fri, 07 Mar 2014 12:52:31 +1100
 
+autofs (5.0.7-3ubuntu5) utopic; urgency=medium
+
+  * Fix file descriptor leak when reloading daemon. (LP: #1316125)
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 15 May 2014 18:05:40 -0300
+
+autofs (5.0.7-3ubuntu4) utopic; urgency=high
+
+  * No change rebuild against new dh_installinit, to call update-rc.d at
+    postinst.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 28 May 2014 10:38:57 +0100
+
+autofs (5.0.7-3ubuntu3) trusty; urgency=medium
+
+  * fix-ssslib-search.patch: Don't skip sssd autofs search if presseded.
+  * rules: set ssslibdir correctly when calling configure (LP: #1081489)
+
+ -- Adam Conrad <[e-mail]>  Sat, 05 Apr 2014 05:26:53 -0600
+
+autofs (5.0.7-3ubuntu2) trusty; urgency=medium
+
+  * Add support for sssd backend (LP: #1081489)
+    - control: Add sssd-common to build-depends.
+    - rules: Set sssldir for the sssd module so autoreconf knows about it.
+
+ -- Timo Aaltonen <[e-mail]>  Fri, 31 Jan 2014 13:57:03 +0200
+
+autofs (5.0.7-3ubuntu1) raring; urgency=low
+
+  * Merge from Debian, remaining changes are:
+    - debian/autofs.upstart - upstart job
+    - debian/patches/16group_buffer_size.patch:
+      + prevents package to eat the cpu if you have large groups.
+  
+  * Dropped changes, merged in Debian:
+    - Add patch to fix nsswitch parser to accept nsswitch.conf without an
+      automout stanza as valid file. (Closes: #602090) (LP: #488696)
+    - debian/patches/0001-Remove-kernel-mount.nfs-version-checks-on-Debian-Ubu.patch:
+      Remove kernel & mount.nfs version checks on Debian/Ubuntu. (LP: #1016673)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 14 Nov 2012 11:50:43 +0000
+
 autofs (5.0.7-3) unstable; urgency=low
 
   * pidfile is in /var/run not /run: fix the initscript
@@ -225,6 +391,34 @@ autofs (5.0.6-3) unstable; urgency=low
 
  -- Michael Tokarev <[e-mail]>  Sat, 25 Aug 2012 16:13:02 +0400
 
+autofs (5.0.6-2ubuntu2) quantal; urgency=low
+
+  * Add patch to fix nsswitch parser to accept nsswitch.conf without an
+    automout stanza as valid file. (Closes: #602090) (LP: #488696)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 12 Sep 2012 17:18:24 +0100
+
+autofs (5.0.6-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable (LP: #1006509), remaining changes:
+    - debian/autofs.upstart - upstart job
+    - debian/patches/16group_buffer_size.patch:
+      + prevents package to eat the cpu if you have large groups.
+
+  * Dropped changes:
+    - 17ld.patch, applied in debian as link-daemon-with-lpthread.patch
+      and save-hesiod-libs-correctly.patch
+  
+  * This upload renames autofs5 back to autofs, following debian's name
+    change.
+  
+  * Added patch descriptions/headers to 16group_buffer_size
+
+  * debian/patches/0001-Remove-kernel-mount.nfs-version-checks-on-Debian-Ubu.patch:
+    Remove kernel & mount.nfs version checks on Debian/Ubuntu. (LP: #1016673)
+  
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 20 Jun 2012 12:34:50 +0100
+
 autofs (5.0.6-2) unstable; urgency=low
 
   [Dmitry Smirnov]
@@ -310,6 +504,116 @@ autofs (5.0.6-1) unstable; urgency=low
 
  -- Dmitry Smirnov <[e-mail]>  Mon, 23 Apr 2012 00:30:51 +1000
 
+autofs5 (5.0.6-0ubuntu5) precise; urgency=low
+
+  * d/autofs5.autofs.upstart: Drop wait-for-state from configuration as 
+    waiting for NIS to start is already handled in the NIS package by 
+    the start-ypbind upstart configuration which supports autofs 
+    (LP: #958704). 
+
+ -- James Page <[e-mail]>  Thu, 22 Mar 2012 11:02:03 +0000
+
+autofs5 (5.0.6-0ubuntu4) precise; urgency=low
+
+  * d/autofs5.autofs.upstart: Wait for NIS if it is installed. Also
+    use the more generic runlevel event to start (LP: #573919)
+  * d/control: Depend on upstart >= 0.9.7-2 since we rely on wait-for-state.
+
+ -- Clint Byrum <[e-mail]>  Fri, 09 Mar 2012 16:47:40 -0800
+
+autofs5 (5.0.6-0ubuntu3) precise; urgency=low
+
+  * debian/rules:
+    - Don't strip symbols during the build; let dh_strip turn them into dbgsym
+      packages instead. Thanks, Adam Stokes! (LP: #924002)
+
+ -- Christopher James Halse Rogers <[e-mail]>  Fri, 17 Feb 2012 11:59:50 +1100
+
+autofs5 (5.0.6-0ubuntu2) oneiric; urgency=low
+
+  * debian/patches/non-ipv6-hostname-lookups.patch: Resolve regression of not 
+    being able to lookup non IPv6 hostnames, patch courtesy of upstream. 
+    (LP: #810397)
+  * debian/control: 
+    - Removed dpatch from build-dep as package is now using
+      quilt to handle patches.
+    - Bumped standards to 3.9.2, no changes required.
+  * debian/rules: Added targets build-arch & build-indep to satisfy lintian.
+
+ -- Dave Walker (Daviey) <[e-mail]>  Thu, 14 Jul 2011 12:38:56 +0100
+
+autofs5 (5.0.6-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - Dropped upstream patches 
+    - Refreshed debian/patches/17ld.patch.
+
+ -- Chuck Short <[e-mail]>  Sun, 03 Jul 2011 14:35:46 -0400
+
+autofs5 (5.0.5-0ubuntu7) oneiric; urgency=low
+
+  * Refresh upstream patches.
+  * Convert to dpkg-source 3.0 quilt format.
+
+ -- Chuck Short <[e-mail]>  Fri, 27 May 2011 09:21:06 -0400
+
+autofs5 (5.0.5-0ubuntu6) natty; urgency=low
+
+  * Remove mounting TYPE=nfs from start conditions, change to
+    start on filesystem and started networking to still solve
+    bug 733914 as well. (LP: #752730)
+  * Re-add sourcing of /etc/default/autofs to get OPTIONS so
+    upgrades won't lose their settings.
+
+ -- Clint Byrum <[e-mail]>  Sat, 09 Apr 2011 22:48:03 -0700
+
+autofs5 (5.0.5-0ubuntu5) natty; urgency=low
+
+  * Improve autofs.conf upstart script. Prevent race
+    when trying to start networking. (LP: #733914)
+  * debian/autofs5-ldap.install: Install schema in the right place.
+    (LP: #699855)
+  * Suggest smbfs if you want to use cifs. (LP: #579857)
+  * Dropped 13ldap_module_linkage.dpatch no longer needed.
+  * Refresh with missing upstream patches. 
+
+ -- Chuck Short <[e-mail]>  Sat, 02 Apr 2011 22:25:34 -0400
+
+autofs5 (5.0.5-0ubuntu4) natty; urgency=low
+
+  * Add missing space to autofs.conf which was stopping autofs job
+    from ending at shutdown (LP:#718664).
+
+ -- James Hunt <[e-mail]>  Mon, 14 Feb 2011 11:01:18 +0000
+
+autofs5 (5.0.5-0ubuntu3) natty; urgency=low
+
+  * Fix FTBFS with ld --no-add-needed.
+
+ -- Matthias Klose <[e-mail]>  Fri, 07 Jan 2011 15:40:32 +0100
+
+autofs5 (5.0.5-0ubuntu2) maverick; urgency=low
+
+  [Joel Ebel]
+  * debian/patches/16group_buffer_size.patch: Increase group buffer size 
+    geometrically rather than linearly when its found to be small.
+    (LP: #591100)
+
+  [Chuck Short]
+  * debian/control: Fix conflict resolution. (LP: #520601)
+
+ -- Chuck Short <[e-mail]>  Wed, 30 Jun 2010 08:06:45 -0400
+
+autofs5 (5.0.5-0ubuntu1) maverick; urgency=low
+
+  * New upstream version:
+    - Dropped 10lsb_initscript.dpatch since we dont ship an init script. 
+    - Fast forward through the upstream patches until 2010/06/21.
+    - Clean up lintian warnings.
+    - Bump to standards version 3.8.4.
+
+ -- Chuck Short <[e-mail]>  Mon, 21 Jun 2010 11:02:50 -0400
+
 autofs5 (5.0.4-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -318,6 +622,44 @@ autofs5 (5.0.4-3.2) unstable; urgency=low
 
  -- Holger Levsen <[e-mail]>  Sun, 14 Nov 2010 16:48:23 +0000
 
+autofs5 (5.0.4-3.1ubuntu5) lucid; urgency=low
+
+  FFE LP: #533029
+
+  * Replace init script with Upstart job:
+    - debian/rules, debian/autofs5.autofs.upstart: Add upstart job.  
+
+ -- Chuck Short <[e-mail]>  Mon, 12 Apr 2010 08:56:32 -0400
+
+autofs5 (5.0.4-3.1ubuntu4) lucid; urgency=low
+
+  * debian/control: Update maintainer. 
+
+ -- Chuck Short <[e-mail]>  Tue, 09 Feb 2010 09:39:56 -0500
+
+autofs5 (5.0.4-3.1ubuntu3) lucid; urgency=low
+
+  * debian/control: correctly define transitional packages for autofs,
+    autofs-ldap and autofs-hesiod (LP: #519119)
+
+ -- Andrew Pollock <[e-mail]>  Mon, 08 Feb 2010 22:38:34 -0800
+
+autofs5 (5.0.4-3.1ubuntu2) lucid; urgency=low
+
+  * debian/control: Provide a transitional package for upgrade from 
+    autofs4 to autofs5. 
+
+ -- Chuck Short <[e-mail]>  Thu, 04 Feb 2010 14:32:00 -0500
+
+autofs5 (5.0.4-3.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Removed experimental tag.
+    - Dropped Ubuntu fix for permissions of /etc/autofs_ldap_auth.conf in 
+      favor of Debian's.
+
+ -- Chuck Short <[e-mail]>  Fri, 29 Jan 2010 06:13:19 +0000
+
 autofs5 (5.0.4-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -326,6 +668,18 @@ autofs5 (5.0.4-3.1) unstable; urgency=low
 
  -- Patrick Winnertz <[e-mail]>  Sat, 23 Jan 2010 14:54:16 +0100
 
+autofs5 (5.0.4-3ubuntu2) lucid; urgency=low
+
+  * debian/rules: Fix permissions of /etc/autofs_ldap_auth.conf. (LP: #368715) 
+
+ -- Chuck Short <[e-mail]>  Thu, 07 Jan 2010 15:45:55 -0500
+
+autofs5 (5.0.4-3ubuntu1) lucid; urgency=low
+
+  * debian/control: Removed experimental tag 
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Dec 2009 14:39:24 -0500
+
 autofs5 (5.0.4-3) unstable; urgency=low
 
   * Fix LSB initscript header to use keywords that
diff --git a/debian/control b/debian/control
index bf3c1b9..c831128 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: autofs
 Section: utils
 Priority: optional
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Standards-Version: 4.1.2
 Build-Depends: debhelper (>= 9.20160709), autoconf,
  bison,
diff --git a/debian/patches/16group_buffer_size.patch b/debian/patches/16group_buffer_size.patch
new file mode 100644
index 0000000..135994b
--- /dev/null
+++ b/debian/patches/16group_buffer_size.patch
@@ -0,0 +1,18 @@
+Author: Joel Ebel <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/591100
+Description: Increase group buffer size geometrically rather than
+linearly when its found to be small.
+.
+This prevents package to eat the cpu if you have large groups.
+
+--- a/lib/mounts.c
++++ b/lib/mounts.c
+@@ -1245,7 +1245,7 @@
+ 		status = getgrgid_r(gid, pgr, gr_tmp, tmplen, ppgr);
+ 		if (status != ERANGE)
+ 			break;
+-		tmplen += grplen;
++		tmplen *= 2;
+ 	}
+ 
+ 	if (status || !pgr) {
diff --git a/debian/patches/autofs-5.1.4-dont-allow-trailing-slash-in-master-map-mount-points.patch b/debian/patches/autofs-5.1.4-dont-allow-trailing-slash-in-master-map-mount-points.patch
new file mode 100644
index 0000000..ca21037
--- /dev/null
+++ b/debian/patches/autofs-5.1.4-dont-allow-trailing-slash-in-master-map-mount-points.patch
@@ -0,0 +1,29 @@
+Description: Don't allow trailing slash in master map mount points
+ If a master map mount point path has a trailing '/' this can cause
+ problems so remove them at parse time.
+Author: From: Ian Kent <[e-mail]>
+Origin: upstream, https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=37dd05dd1bccdedc4157902420e1da506b2bf35f
+Bug-Debian: https://bugs.debian.org/900933
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/autofs/+bug/1754506
+Last-Update: 2018-06-05
+--- a/lib/master_parse.y
++++ b/lib/master_parse.y
+@@ -749,6 +749,7 @@
+ 	struct map_source *source;
+ 	unsigned int logopt = logging;
+ 	unsigned int m_logopt = master->logopt;
++	size_t mp_len;
+ 	int ret;
+ 
+ 	local_init_vars();
+@@ -763,6 +764,10 @@
+ 		return 0;
+ 	}
+ 
++	mp_len = strlen(path);
++	while (mp_len && path[--mp_len] == '/')
++		path[mp_len] = 0;
++
+ 	nc = master->nc;
+ 
+ 	/* Add null map entries to the null map cache */
diff --git a/debian/patches/fix-lookup-ldap-crash.patch b/debian/patches/fix-lookup-ldap-crash.patch
new file mode 100644
index 0000000..5420934
--- /dev/null
+++ b/debian/patches/fix-lookup-ldap-crash.patch
@@ -0,0 +1,28 @@
+Description: Fix segfault in lookup_ldap initialisation
+ lib/defaults.c doesn't initialise the config cache before lookup_ldap
+ attempts to read from it.
+ .
+ <andreas> lookup_ldap is the only module that is still built and linked
+ using -Bsymbolic-functions. d/rules tries to strip that option out of
+ LDFLAGS, but it leaks back in via $(krb5-config --libs) when lookup_ldap
+ is built.
+Author: Malcolm Scott <[e-mail]>
+Bug-Debian: https://bugs.debian.org/901344
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1503034
+
+Index: autofs-5.1.1/modules/lookup_ldap.c
+===================================================================
+--- autofs-5.1.1.orig/modules/lookup_ldap.c
++++ autofs-5.1.1/modules/lookup_ldap.c
+@@ -1665,6 +1665,11 @@ int lookup_init(const char *mapfmt, int
+ 		ctxt->check_defaults = 1;
+ 	}
+ 
++	if (!defaults_read_config(0)) {
++		free_context(ctxt);
++		return 1;
++	}
++
+ 	ctxt->timeout = defaults_get_ldap_timeout();
+ 	ctxt->network_timeout = defaults_get_ldap_network_timeout();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ba5598e..6e57a85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,9 @@ fix-ssslib-search.patch
 remove-kernel-mount.nfs-version-check.patch
 fix-autofsconf-manpage-section.patch
 fix-autofs-manpage-whatis.patch
+#
+# Ubuntu patches
+#
+16group_buffer_size.patch
+fix-lookup-ldap-crash.patch
+autofs-5.1.4-dont-allow-trailing-slash-in-master-map-mount-points.patch
diff --git a/debian/rules b/debian/rules
index d472b28..69cd455 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# Taken from #1636781 as it's the same problem here. Also see
+# https://lists.ubuntu.com/archives/ubuntu-devel/2018-June/040369.html
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+  export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
+endif
 
 %:
 	dh $@ --with systemd