Merge ~ahasenack/ubuntu/+source/autofs:focal-autofs-merge into ubuntu/+source/autofs:debian/sid

[Andreas Hasenack]

Merge from debian. Dropped a patch that was taken by upstream. The other one about ldap lookups is still needed I'm afraid. I tried a build without it and the service crashes on startup when there is an ldap map. Upstream back then, when I sent it to them, said they were doing the right thing already and this patch shouldn't be needed. It's likely due to our use of -Wl,-Bsymbolic-functions.

So, the two remaining pieces of delta we have are due to ubuntu's use of -Bsymbolic-functions by default.

Bileto ticket, only failure is i386 due to dependencies: https://bileto.ubuntu.com/#/ticket/3870

[Lucas Kanashiro (lucaskanashiro)]

LGTM, +1 on those changes.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading d03f1a731e795ebc66453a254bcaabf2e0cbdafc

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

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

[Christian Ehrhardt  (paelzer)]

FYI - this is good in proposed except the i386 test (no more built) failing.
This will be resolved as part of the global i386 removal.

Merged as it is in Focal (-proposed)

diff --git a/debian/changelog b/debian/changelog
index adfa930..b46f6de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+autofs (5.1.6-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - 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)
+      [Refreshed, since the patch now applies to a different function]
+  * Dropped:
+    - d/p/16group_buffer_size.patch
+      [Fixed in 5.1.6]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 12 Dec 2019 11:32:09 -0300
+
 autofs (5.1.6-1) unstable; urgency=medium
 
   * New upstream release.
@@ -23,6 +37,30 @@ autofs (5.1.5-2) unstable; urgency=medium
 
  -- Mike Gabriel <[e-mail]>  Fri, 02 Aug 2019 19:47:29 +0200
 
+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 ]
@@ -86,6 +124,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.
@@ -94,6 +158,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.
@@ -142,6 +236,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).
@@ -153,6 +279,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].
@@ -205,6 +364,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).
@@ -235,6 +430,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
@@ -321,6 +559,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]
@@ -406,6 +672,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.
@@ -414,6 +790,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.
@@ -422,6 +836,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 68d2c48..d7a7726 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.4.1
diff --git a/debian/patches/fix-lookup-ldap-crash.patch b/debian/patches/fix-lookup-ldap-crash.patch
new file mode 100644
index 0000000..aa37646
--- /dev/null
+++ b/debian/patches/fix-lookup-ldap-crash.patch
@@ -0,0 +1,27 @@
+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
+
+--- a/modules/lookup_ldap.c
++++ b/modules/lookup_ldap.c
+@@ -1711,6 +1711,11 @@
+ 		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..9fafba0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,7 @@ remove-kernel-mount.nfs-version-check.patch
 mount-hidden-samba-shares.patch
 hardening-flags.patch
 spelling-error-fixes.patch
+#
+# Ubuntu patches
+#
+fix-lookup-ldap-crash.patch
diff --git a/debian/rules b/debian/rules
index a1e3ce6..32b4165 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 $@