diff -Nru autofs-5.1.7/debian/changelog autofs-5.1.7/debian/changelog
--- autofs-5.1.7/debian/changelog	2021-06-21 21:44:14.000000000 +0000
+++ autofs-5.1.7/debian/changelog	2021-08-12 07:55:36.000000000 +0000
@@ -1,3 +1,9 @@
+autofs (5.1.7-1ubuntu1) impish; urgency=medium
+
+  * Use default stack size for threads to avoid FTBFS with glibc 2.34
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 12 Aug 2021 07:55:36 +0000
+
 autofs (5.1.7-1build1) impish; urgency=medium
 
   * No-change rebuild due to OpenLDAP soname bump.
diff -Nru autofs-5.1.7/debian/control autofs-5.1.7/debian/control
--- autofs-5.1.7/debian/control	2021-02-04 12:23:08.000000000 +0000
+++ autofs-5.1.7/debian/control	2021-08-11 08:17:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: autofs
 Section: utils
 Priority: optional
-Maintainer: Mike Gabriel <sunweaver@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Mike Gabriel <sunweaver@debian.org>
 Uploaders:
  Debian Edu Packaging Team <debian-edu-pkg-team@lists.alioth.debian.org>,
 Build-Depends:
diff -Nru autofs-5.1.7/debian/patches/autofs-5.1.7-use-default-stack-size-for-threads.patch autofs-5.1.7/debian/patches/autofs-5.1.7-use-default-stack-size-for-threads.patch
--- autofs-5.1.7/debian/patches/autofs-5.1.7-use-default-stack-size-for-threads.patch	1970-01-01 00:00:00.000000000 +0000
+++ autofs-5.1.7/debian/patches/autofs-5.1.7-use-default-stack-size-for-threads.patch	2021-08-11 08:39:57.000000000 +0000
@@ -0,0 +1,82 @@
+Description: Use default stack size for threads
+Origin: vendor, https://src.fedoraproject.org/rpms/autofs/c/cb8d3f75960a5966056d9bd9c000b3adbe2d15a3
+Author: Ian Kent <raven@themaw.net>
+Last-Update: 2021-06-19
+
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -81,7 +81,6 @@
+ /* Attributes for creating detached and joinable threads */
+ pthread_attr_t th_attr;
+ pthread_attr_t th_attr_detached;
+-size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144;
+ 
+ struct master_readmap_cond mrc = {
+ 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
+@@ -2602,34 +2601,6 @@
+ 		if (start_pipefd[1] != -1) {
+ 			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+ 			close(start_pipefd[1]);
+-		}
+-		release_flag_file();
+-		macro_free_global_table();
+-		exit(1);
+-	}
+-
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-	if (pthread_attr_setstacksize(
+-			&th_attr_detached, detached_thread_stack_size)) {
+-		logerr("%s: failed to set stack size thread attribute!",
+-		       program);
+-		if (start_pipefd[1] != -1) {
+-			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+-			close(start_pipefd[1]);
+-		}
+-		release_flag_file();
+-		macro_free_global_table();
+-		exit(1);
+-	}
+-#endif
+-
+-	if (pthread_attr_getstacksize(
+-			&th_attr_detached, &detached_thread_stack_size)) {
+-		logerr("%s: failed to get detached thread stack size!",
+-		       program);
+-		if (start_pipefd[1] != -1) {
+-			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+-			close(start_pipefd[1]);
+ 		}
+ 		release_flag_file();
+ 		macro_free_global_table();
+--- a/daemon/state.c
++++ b/daemon/state.c
+@@ -1173,12 +1173,8 @@
+ 	status = pthread_attr_init(pattrs);
+ 	if (status)
+ 		pattrs = NULL;
+-	else {
++	else
+ 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
+-#endif
+-	}
+ 
+ 	status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
+ 
+--- a/lib/alarm.c
++++ b/lib/alarm.c
+@@ -270,12 +270,8 @@
+ 	status = pthread_attr_init(pattrs);
+ 	if (status)
+ 		pattrs = NULL;
+-	else {
++	else
+ 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
+-#endif
+-	}
+ 
+ 	status = pthread_condattr_init(&condattrs);
+ 	if (status)
diff -Nru autofs-5.1.7/debian/patches/series autofs-5.1.7/debian/patches/series
--- autofs-5.1.7/debian/patches/series	2021-02-04 12:13:20.000000000 +0000
+++ autofs-5.1.7/debian/patches/series	2021-08-11 08:14:29.000000000 +0000
@@ -9,3 +9,4 @@
 spelling-error-fixes.patch
 fix-lookup-ldap-crash.patch
 fix-nfs4-mounts-in-auto-net.patch
+autofs-5.1.7-use-default-stack-size-for-threads.patch