Merge ~ahasenack/ubuntu/+source/autofs:eoan-autofs-merge-5.1.5 into ubuntu/+source/autofs:debian/experimental

[Andreas Hasenack]

PPA with test packages: https://launchpad.net/~ahasenack/+archive/ubuntu/autofs-515-merge

sudo add-apt-repository ppa:ahasenack/autofs-515-merge -y -u

Merge of latest upstream version, 5.1.5, which debian has in experimental.

Good chunks of delta dropped. I also emailed upstream about d/p/16group_buffer_size.patch, which we have been carrying since 2010. Updated the patch's DEP3 header with that info, and depending on the outcome, it's something we will be able to drop soon as well.

I'm running DEP8 tests locally, will update this MP once they are done.

[Andreas Hasenack (ahasenack)]

DEP8 tests passed:

(...)
autopkgtest [18:18:00]: test nfs-mount: -----------------------]
autopkgtest [18:18:00]: test nfs-mount: - - - - - - - - - - results - - - - - - - - - -
nfs-mount PASS
autopkgtest [18:18:01]: @@@@@@@@@@@@@@@@@@@@ summary
smb-mount PASS
nfs-mount PASS
qemu-system-x86_64: terminating on signal 15 from pid 8990 (/usr/bin/python3)

[Christian Ehrhardt  (paelzer)]

Lol - I yesterday already had a console open to do that as well, but got interrupted by that VMX bug. Thanks for beating me :-)

/me closes windows and does a review instead (I updated the roadmap card to be in May and be labeled as started)

[Christian Ehrhardt  (paelzer)]

Great, ack to dropped Delta.

A bit confusing at first that we strip Symboli-Functions but then still need to patch it in fix-lookup-ldap-crash.patch. But thanks to a patch header things amke sense (uses $(krb5-config --libs)). This is an example of our discussion yesterday were we both agreed that delta with proper headers is so much more manageable.

Maybe this could be "revived" upstream with a reply: https://www.spinics.net/lists/autofs/msg01968.html
to one day be able to drop it.

Thanks for doing the same already with 16group_buffer_size.patch

I found that via Debian there is a new build deps, do these create runtime dep issues?
 71 [ Stefan Potyra ]
 72 * debian/control:
 73 + Add libtirpc-dev to build-depends.
 74 * debian/rules:
 75 + Add option --with-libtirpc to configure. (Closes: #737679, #709366).

Old:
 checking if libtirpc is requested and available... no
New:
 checking for TIRPC... yes
 [...]
 Depends: libc6 (>= 2.28), libtirpc3 (>= 1.0.2), libxml2 (>= 2.7.4), ucf

But:
root@e:~# apt-cache policy libtirpc3
libtirpc3:
  Installed: (none)
  Candidate: 1.1.4-0.4
  Version table:
     1.1.4-0.4 500
        500 http://archive.ubuntu.com/ubuntu eoan/main amd64 Packages
So everything is ok.

That Debain change also is a good use of dpkg-statoverride - nice to see that.
BTW - this is another arcane tool that is worth to know about.

+1 for the Merge

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks for catching the libtirpc dependency.

If it works this time, it will fix https://bugs.launchpad.net/ubuntu/+source/autofs/+bug/1101779 and other ipv6-related bugs. Last time I tried to use an older tirpc version, but it introduced segfaults (https://bugs.launchpad.net/ubuntu/+source/autofs/+bug/1745817) , and I had to revert that decision.

I'll test the package in the scenario that caused segfaults, and if it works this time, will upload and mark the ipv6 bugs as fixed.

[Andreas Hasenack (ahasenack)]

The newer libtirpc works just fine, I just tested. And I had done that before, as seen in https://bugs.launchpad.net/ubuntu/+source/autofs/+bug/1745817/comments/11

[Andreas Hasenack (ahasenack)]

root@eoan-autofs:~# apt-cache policy autofs
autofs:
  Installed: 5.1.5-1ubuntu1~ppa1
  Candidate: 5.1.5-1ubuntu1~ppa1
  Version table:
 *** 5.1.5-1ubuntu1~ppa1 500
        500 http://ppa.launchpad.net/ahasenack/autofs-515-merge/ubuntu eoan/main amd64 Packages

autofs ready:
root@eoan-autofs:~# mount|grep /net
cgroup on /sys/fs/cgroup/net_cls,net_prio type cgroup (rw,nosuid,nodev,noexec,relatime,net_cls,net_prio)
-hosts on /net type autofs (rw,relatime,fd=6,pgrp=630,timeout=60,minproto=5,maxproto=5,indirect,pipe_ino=19960)

# this will trigger a list of "nfs shares" from 192.168.122.136
root@eoan-autofs:~# cd /net/192.168.122.136
root@eoan-autofs:/net/192.168.122.136# ls -la
total 0
drwxr-xr-x 3 root root 0 May 24 13:52 .
drwxr-xr-x 3 root root 0 May 24 13:52 ..
drwxr-xr-x 2 root root 0 May 24 13:52 pub

# entering the pub nfs share will mount it
root@eoan-autofs:/net/192.168.122.136# cd pub
lroot@eoan-autofs:/net/192.168.122.136/pub# ls -la
total 8
drwxrwxrwt 2 root root 4096 May 24 13:45 .
drwxr-xr-x 3 root root 0 May 24 13:52 ..
-rw-r--r-- 1 nobody nogroup 0 May 24 13:45 foo
-rw-r--r-- 1 root root 38 May 24 13:27 hello.txt

# and now we have an nfs mount (last line):
root@eoan-autofs:/net/192.168.122.136/pub# mount|grep /net
cgroup on /sys/fs/cgroup/net_cls,net_prio type cgroup (rw,nosuid,nodev,noexec,relatime,net_cls,net_prio)
-hosts on /net type autofs (rw,relatime,fd=6,pgrp=630,timeout=60,minproto=5,maxproto=5,indirect,pipe_ino=19960)
-hosts on /net/192.168.122.136/pub type autofs (rw,relatime,fd=6,pgrp=630,timeout=60,minproto=5,maxproto=5,offset,pipe_ino=19960)
192.168.122.136:/pub on /net/192.168.122.136/pub type nfs4 (rw,nosuid,nodev,relatime,vers=4.2,rsize=262144,wsize=262144,namlen=255,soft,proto=tcp,timeo=600,retrans=2,sec=sys,clientaddr=192.168.122.75,local_lock=none,addr=192.168.122.136)

[Andreas Hasenack (ahasenack)]

Tagged and uploaded:

$ git push pkg upload/5.1.5-1ubuntu1
Enumerating objects: 40, done.
Counting objects: 100% (40/40), done.
Delta compression using up to 4 threads
Compressing objects: 100% (33/33), done.
Writing objects: 100% (33/33), 9.75 KiB | 908.00 KiB/s, done.
Total 33 (delta 21), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/autofs
 * [new tag] upload/5.1.5-1ubuntu1 -> upload/5.1.5-1ubuntu1

$ dput ubuntu ../autofs_5.1.5-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../autofs_5.1.5-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../autofs_5.1.5-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading autofs_5.1.5-1ubuntu1.dsc: done.
  Uploading autofs_5.1.5.orig.tar.xz: done.
  Uploading autofs_5.1.5-1ubuntu1.debian.tar.xz: done.
  Uploading autofs_5.1.5-1ubuntu1_source.buildinfo: done.
  Uploading autofs_5.1.5-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/debian/changelog b/debian/changelog
index a544842..d11378a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+autofs (5.1.5-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/16group_buffer_size.patch
+      [Refreshed for 5.1.5, and added Forwarded DEP-3 header]
+    - d/rules: 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.  (LP #1503034)
+  * Dropped:
+    - 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.
+      [Fixed upstream]
+    - d/p/autofs-5.1.3-handle-additional-nfs-versions-in-mount.patch:
+      fix usage of NFS 4.x subversions (LP #1818121)
+      [Fixed upstream]
+    - d/t/control, d/t/smb-mount: add smb automount DEP8 test
+      [In 5.1.5-1]
+    - d/t/control, d/t/nfs-mount: add nfs automount DEP8 test
+      [In 5.1.5-1]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 23 May 2019 18:02:02 -0300
+
 autofs (5.1.5-1) experimental; urgency=medium
 
   [ Mike Gabriel ]
@@ -61,6 +85,32 @@ autofs (5.1.5-1) experimental; urgency=medium
 
  -- Mike Gabriel <[e-mail]>  Thu, 14 Mar 2019 19:42:50 +0100
 
+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:
+    - d/p/16group_buffer_size.patch
+    - d/rules: 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.  (LP #1503034)
+      [Added Forwarded info to the DEP3 header]
+    - 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.
+    - d/t/control, d/t/smb-mount: add smb automount DEP8 test
+      [Added note about it having been forwarded to Debian]
+    - d/t/control, d/t/nfs-mount: add nfs automount DEP8 test
+      [Added note about it having been forwarded to Debian]
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 18 Jul 2018 10:56:43 -0300
+
 autofs (5.1.2-4) unstable; urgency=medium
 
   * QA upload.
@@ -69,6 +119,36 @@ autofs (5.1.2-4) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  Mon, 09 Jul 2018 02:09:42 +0200
 
+autofs (5.1.2-3ubuntu2) cosmic; urgency=medium
+
+  * Add DEP8 tests (LP: #1677751):
+    - d/tests/control, d/tests/smb-mount: smb automount DEP8 test
+    - d/tests/control, d/tests/nfs-mount: nfs automount DEP8 test
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 12 Jun 2018 17:35:31 -0300
+
+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.
@@ -117,6 +197,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).
@@ -128,6 +240,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].
@@ -180,6 +325,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).
@@ -210,6 +391,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
@@ -296,6 +520,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]
@@ -381,6 +633,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.
@@ -389,6 +751,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.
@@ -397,6 +797,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 56f7d29..3dfffe8 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.3.0
diff --git a/debian/patches/16group_buffer_size.patch b/debian/patches/16group_buffer_size.patch
new file mode 100644
index 0000000..613979b
--- /dev/null
+++ b/debian/patches/16group_buffer_size.patch
@@ -0,0 +1,19 @@
+Author: Joel Ebel <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/591100
+Forwarded: https://www.spinics.net/lists/autofs/msg02115.html
+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
+@@ -1541,7 +1541,7 @@
+ 		status = getgrgid_r(gid, pgr, gr_tmp, tmplen, ppgr);
+ 		if (status != ERANGE)
+ 			break;
+-		tmplen += grplen;
++		tmplen *= 2;
+ 
+ 		/* Don't tempt glibc to alloca() larger than is (likely)
+ 		 * available on the stack if limit-getgrgid-size is enabled.
diff --git a/debian/patches/fix-lookup-ldap-crash.patch b/debian/patches/fix-lookup-ldap-crash.patch
new file mode 100644
index 0000000..176537c
--- /dev/null
+++ b/debian/patches/fix-lookup-ldap-crash.patch
@@ -0,0 +1,29 @@
+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
+Forwarded: https://www.spinics.net/lists/autofs/msg01903.html
+
+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 fa750d9..fc7d213 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,8 @@ remove-kernel-mount.nfs-version-check.patch
 mount-hidden-samba-shares.patch
 hardening-flags.patch
 spelling-error-fixes.patch
+#
+# Ubuntu patches
+#
+16group_buffer_size.patch
+fix-lookup-ldap-crash.patch
diff --git a/debian/rules b/debian/rules
index 9822036..84ab603 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,11 @@ include /usr/share/dpkg/buildflags.mk
 # 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