Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/, net-fs/autofs/files/
Date: Mon, 10 Jan 2022 22:33:15
Message-Id: 1641853881.30f36210abdf309dbd48f6f4a66da56a9dc328e9.dlan@gentoo
1 commit: 30f36210abdf309dbd48f6f4a66da56a9dc328e9
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 10 21:58:04 2022 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 10 22:31:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f36210
7
8 net-fs/autofs: cleanup old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 net-fs/autofs/Manifest | 2 -
14 net-fs/autofs/autofs-5.1.6-r2.ebuild | 128 ---------------------
15 net-fs/autofs/autofs-5.1.7-r1.ebuild | 130 ----------------------
16 net-fs/autofs/files/autofs-5.1.6-glibc.patch | 110 ------------------
17 net-fs/autofs/files/autofs-5.1.6-musl.patch | 12 --
18 net-fs/autofs/files/autofs-5.1.6-pid.patch | 14 ---
19 net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch | 107 ------------------
20 net-fs/autofs/files/autofs-5.1.7-glibc.patch | 97 ----------------
21 8 files changed, 600 deletions(-)
22
23 diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
24 index c45ff7bcda9b..364aa0a32804 100644
25 --- a/net-fs/autofs/Manifest
26 +++ b/net-fs/autofs/Manifest
27 @@ -1,4 +1,2 @@
28 -DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
29 -DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
30 DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
31 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
32
33 diff --git a/net-fs/autofs/autofs-5.1.6-r2.ebuild b/net-fs/autofs/autofs-5.1.6-r2.ebuild
34 deleted file mode 100644
35 index 616efb49c330..000000000000
36 --- a/net-fs/autofs/autofs-5.1.6-r2.ebuild
37 +++ /dev/null
38 @@ -1,128 +0,0 @@
39 -# Copyright 1999-2021 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -inherit linux-info systemd toolchain-funcs
45 -
46 -DESCRIPTION="Kernel based automounter"
47 -HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
48 -SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
53 -IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
54 -
55 -# currently, sasl code assumes the presence of kerberosV
56 -RDEPEND="
57 - net-libs/libnsl:=
58 - >=sys-apps/util-linux-2.20
59 - dmalloc? ( dev-libs/dmalloc[threads] )
60 - ldap? ( >=net-nds/openldap-2.0
61 - sasl? (
62 - dev-libs/cyrus-sasl
63 - dev-libs/libxml2
64 - virtual/krb5
65 - )
66 - )
67 - systemd? ( sys-apps/systemd )
68 - libtirpc? ( net-libs/libtirpc )
69 - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
70 -"
71 -DEPEND="${RDEPEND}
72 - libtirpc? ( net-libs/rpcsvc-proto )
73 -"
74 -BDEPEND="
75 - sys-devel/flex
76 - virtual/pkgconfig
77 - virtual/yacc
78 -"
79 -
80 -PATCHES=(
81 - "${FILESDIR}/${P}-glibc.patch"
82 - "${FILESDIR}/${P}-musl.patch"
83 - "${FILESDIR}/${P}-pid.patch"
84 -)
85 -
86 -pkg_setup() {
87 - linux-info_pkg_setup
88 -
89 - local CONFIG_CHECK
90 -
91 - if kernel_is -ge 4 18; then
92 - CONFIG_CHECK="~AUTOFS_FS"
93 - else
94 - CONFIG_CHECK="~AUTOFS4_FS"
95 - fi
96 -
97 - check_extra_config
98 -}
99 -
100 -src_prepare() {
101 - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
102 - sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334
103 -
104 - # Install samples including autofs.service
105 - sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
106 -
107 - default
108 -}
109 -
110 -src_configure() {
111 - # bug #483716
112 - tc-export AR
113 - # --with-confdir is for bug #361481
114 - # --with-mapdir is for bug #385113
115 - local myeconfargs=(
116 - --with-confdir=/etc/conf.d
117 - --with-mapdir=/etc/autofs
118 - $(use_with dmalloc)
119 - $(use_with ldap openldap)
120 - $(use_with libtirpc)
121 - $(use_with sasl)
122 - $(use_enable mount-locking)
123 - $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
124 - --without-hesiod
125 - --disable-ext-env
126 - --enable-sloppy-mount # bug #453778
127 - --enable-force-shutdown
128 - --enable-ignore-busy
129 - RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
130 - )
131 - econf "${myeconfargs[@]}"
132 -}
133 -
134 -src_compile() {
135 - export DONTSTRIP=1
136 - default
137 -}
138 -
139 -src_install() {
140 - default
141 - rmdir "${D}"/run
142 -
143 - if kernel_is -lt 2 6 30; then
144 - # kernel patches
145 - docinto patches
146 - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
147 - fi
148 - newinitd "${FILESDIR}"/autofs5.initd autofs
149 - insinto etc/autofs
150 - newins "${FILESDIR}"/autofs5-auto.master auto.master
151 -}
152 -
153 -pkg_postinst() {
154 - if kernel_is -lt 2 6 30; then
155 - elog "This version of ${PN} requires a kernel with autofs4 supporting"
156 - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
157 - elog "been installed into"
158 - elog "${EROOT}/usr/share/doc/${P}/patches."
159 - elog "For further instructions how to patch the kernel, please refer to"
160 - elog "${EROOT}/usr/share/doc/${P}/INSTALL."
161 - elog
162 - fi
163 - elog "If you plan on using autofs for automounting remote NFS mounts,"
164 - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
165 - elog "are running."
166 -}
167
168 diff --git a/net-fs/autofs/autofs-5.1.7-r1.ebuild b/net-fs/autofs/autofs-5.1.7-r1.ebuild
169 deleted file mode 100644
170 index dc05275932e3..000000000000
171 --- a/net-fs/autofs/autofs-5.1.7-r1.ebuild
172 +++ /dev/null
173 @@ -1,130 +0,0 @@
174 -# Copyright 1999-2021 Gentoo Authors
175 -# Distributed under the terms of the GNU General Public License v2
176 -
177 -EAPI=7
178 -
179 -inherit linux-info systemd toolchain-funcs
180 -
181 -DESCRIPTION="Kernel based automounter"
182 -HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
183 -SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
184 -
185 -LICENSE="GPL-2"
186 -SLOT="0"
187 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
188 -IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
189 -
190 -# currently, sasl code assumes the presence of kerberosV
191 -RDEPEND="
192 - net-libs/libnsl:=
193 - >=sys-apps/util-linux-2.20
194 - dmalloc? ( dev-libs/dmalloc[threads] )
195 - ldap? ( >=net-nds/openldap-2.0
196 - sasl? (
197 - dev-libs/cyrus-sasl
198 - dev-libs/libxml2
199 - virtual/krb5
200 - )
201 - )
202 - systemd? ( sys-apps/systemd )
203 - libtirpc? ( net-libs/libtirpc )
204 - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
205 -"
206 -DEPEND="${RDEPEND}
207 - libtirpc? ( net-libs/rpcsvc-proto )
208 -"
209 -BDEPEND="
210 - sys-devel/flex
211 - virtual/pkgconfig
212 - virtual/yacc
213 -"
214 -
215 -PATCHES=(
216 - "${FILESDIR}/${P}-glibc.patch"
217 - "${FILESDIR}/${PN}-5.1.6-musl.patch"
218 - "${FILESDIR}/${PN}-5.1.6-pid.patch"
219 - "${FILESDIR}/${PN}-5.1.7-glibc-2.34.patch"
220 -)
221 -
222 -pkg_setup() {
223 - linux-info_pkg_setup
224 -
225 - local CONFIG_CHECK
226 -
227 - if kernel_is -ge 4 18; then
228 - CONFIG_CHECK="~AUTOFS_FS"
229 - else
230 - CONFIG_CHECK="~AUTOFS4_FS"
231 - fi
232 -
233 - check_extra_config
234 -}
235 -
236 -src_prepare() {
237 - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
238 - sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334
239 -
240 - # Install samples including autofs.service
241 - sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
242 -
243 - default
244 -}
245 -
246 -src_configure() {
247 - # bug #483716
248 - tc-export AR
249 - # --with-confdir is for bug #361481
250 - # --with-mapdir is for bug #385113
251 - local myeconfargs=(
252 - --with-confdir=/etc/conf.d
253 - --with-mapdir=/etc/autofs
254 - $(use_with dmalloc)
255 - $(use_with ldap openldap)
256 - $(use_with libtirpc)
257 - $(use_with sasl)
258 - $(use_enable mount-locking)
259 - $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
260 - --without-hesiod
261 - --disable-ext-env
262 - --enable-sloppy-mount # bug #453778
263 - --enable-force-shutdown
264 - --enable-ignore-busy
265 - RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
266 - )
267 -
268 - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
269 -}
270 -
271 -src_compile() {
272 - export DONTSTRIP=1
273 - default
274 -}
275 -
276 -src_install() {
277 - default
278 - rmdir "${D}"/run
279 -
280 - if kernel_is -lt 2 6 30; then
281 - # kernel patches
282 - docinto patches
283 - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
284 - fi
285 - newinitd "${FILESDIR}"/autofs5.initd autofs
286 - insinto etc/autofs
287 - newins "${FILESDIR}"/autofs5-auto.master auto.master
288 -}
289 -
290 -pkg_postinst() {
291 - if kernel_is -lt 2 6 30; then
292 - elog "This version of ${PN} requires a kernel with autofs4 supporting"
293 - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
294 - elog "been installed into"
295 - elog "${EROOT}/usr/share/doc/${P}/patches."
296 - elog "For further instructions how to patch the kernel, please refer to"
297 - elog "${EROOT}/usr/share/doc/${P}/INSTALL."
298 - elog
299 - fi
300 - elog "If you plan on using autofs for automounting remote NFS mounts,"
301 - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
302 - elog "are running."
303 -}
304
305 diff --git a/net-fs/autofs/files/autofs-5.1.6-glibc.patch b/net-fs/autofs/files/autofs-5.1.6-glibc.patch
306 deleted file mode 100644
307 index 338d885ae1e1..000000000000
308 --- a/net-fs/autofs/files/autofs-5.1.6-glibc.patch
309 +++ /dev/null
310 @@ -1,110 +0,0 @@
311 -diff --git a/daemon/lookup.c b/daemon/lookup.c
312 -index 60a48f3..bbd65e0 100644
313 ---- a/daemon/lookup.c
314 -+++ b/daemon/lookup.c
315 -@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
316 - if (!S_ISREG(st.st_mode))
317 - return NSS_STATUS_NOTFOUND;
318 -
319 -- if (st.st_mode & __S_IEXEC)
320 -+ if (st.st_mode & S_IEXEC)
321 - type = src_prog;
322 - else
323 - type = src_file;
324 -@@ -937,7 +937,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
325 - if (!S_ISREG(st.st_mode))
326 - return NSS_STATUS_NOTFOUND;
327 -
328 -- if (st.st_mode & __S_IEXEC)
329 -+ if (st.st_mode & S_IEXEC)
330 - type = src_prog;
331 - else
332 - type = src_file;
333 -@@ -1113,7 +1113,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
334 - if (!S_ISREG(st.st_mode))
335 - return NULL;
336 -
337 -- if (st.st_mode & __S_IEXEC)
338 -+ if (st.st_mode & S_IEXEC)
339 - type = "program";
340 - else
341 - type = "file";
342 -diff --git a/include/automount.h b/include/automount.h
343 -index 4fd0ba9..7b855a7 100644
344 ---- a/include/automount.h
345 -+++ b/include/automount.h
346 -@@ -13,6 +13,7 @@
347 - #include <limits.h>
348 - #include <time.h>
349 - #include <syslog.h>
350 -+#include <sys/procfs.h>
351 - #include <sys/types.h>
352 - #include <pthread.h>
353 - #include <sched.h>
354 -@@ -142,6 +143,16 @@ struct autofs_point;
355 - #define UMOUNT_RETRIES 8
356 - #define EXPIRE_RETRIES 3
357 -
358 -+#ifndef __SWORD_TYPE
359 -+#if __WORDSIZE == 32
360 -+# define __SWORD_TYPE int
361 -+#elif __WORDSIZE == 64
362 -+# define __SWORD_TYPE long int
363 -+#else
364 -+#error
365 -+#endif
366 -+#endif
367 -+
368 - static u_int32_t inline hash(const char *key, unsigned int size)
369 - {
370 - u_int32_t hashval;
371 -diff --git a/include/nsswitch.h b/include/nsswitch.h
372 -index d3e4027..8376113 100644
373 ---- a/include/nsswitch.h
374 -+++ b/include/nsswitch.h
375 -@@ -24,6 +24,10 @@
376 - #include <netdb.h>
377 - #include "list.h"
378 -
379 -+#ifndef _PATH_NSSWITCH_CONF
380 -+#define _PATH_NSSWITCH_CONF "/dev/null"
381 -+#endif
382 -+
383 - #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
384 -
385 - enum nsswitch_status {
386 -diff --git a/include/rpc_subs.h b/include/rpc_subs.h
387 -index 6e35eed..7ba4b93 100644
388 ---- a/include/rpc_subs.h
389 -+++ b/include/rpc_subs.h
390 -@@ -18,7 +18,7 @@
391 -
392 - #include <rpc/rpc.h>
393 - #include <rpc/pmap_prot.h>
394 --#include <nfs/nfs.h>
395 -+#include <linux/nfs.h>
396 - #include <linux/nfs2.h>
397 - #include <linux/nfs3.h>
398 -
399 -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
400 -index fadd2ea..cf109de 100644
401 ---- a/modules/lookup_multi.c
402 -+++ b/modules/lookup_multi.c
403 -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
404 - continue;
405 - }
406 -
407 -- if (st.st_mode & __S_IEXEC)
408 -+ if (st.st_mode & S_IEXEC)
409 - type = src_prog;
410 - else
411 - type = src_file;
412 -@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
413 - continue;
414 - }
415 -
416 -- if (st.st_mode & __S_IEXEC)
417 -+ if (st.st_mode & S_IEXEC)
418 - type = src_prog;
419 - else
420 - type = src_file;
421
422 diff --git a/net-fs/autofs/files/autofs-5.1.6-musl.patch b/net-fs/autofs/files/autofs-5.1.6-musl.patch
423 deleted file mode 100644
424 index bdcc0db9a9f3..000000000000
425 --- a/net-fs/autofs/files/autofs-5.1.6-musl.patch
426 +++ /dev/null
427 @@ -1,12 +0,0 @@
428 ---- a/include/automount.h
429 -+++ b/include/automount.h
430 -@@ -25,6 +25,9 @@
431 - #include "list.h"
432 -
433 - #include <linux/auto_fs4.h>
434 -+#ifndef __GLIBC__
435 -+#include <bits/reg.h>
436 -+#endif
437 -
438 - #include "defaults.h"
439 - #include "state.h"
440
441 diff --git a/net-fs/autofs/files/autofs-5.1.6-pid.patch b/net-fs/autofs/files/autofs-5.1.6-pid.patch
442 deleted file mode 100644
443 index 1766c34e989e..000000000000
444 --- a/net-fs/autofs/files/autofs-5.1.6-pid.patch
445 +++ /dev/null
446 @@ -1,14 +0,0 @@
447 -diff --git a/include/log.h b/include/log.h
448 -index 69eed96..14051cc 100644
449 ---- a/include/log.h
450 -+++ b/include/log.h
451 -@@ -46,6 +46,8 @@ extern void log_crit(unsigned, const char* msg, ...);
452 - extern void log_debug(unsigned int, const char* msg, ...);
453 - extern void logmsg(const char* msg, ...);
454 -
455 -+#include <unistd.h> /* Required for pid_t */
456 -+
457 - extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
458 -
459 - #define debug(opt, msg, args...) \
460 -
461
462 diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
463 deleted file mode 100644
464 index 8b0ddd75eb23..000000000000
465 --- a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
466 +++ /dev/null
467 @@ -1,107 +0,0 @@
468 -https://src.fedoraproject.org/rpms/autofs/raw/rawhide/f/autofs-5.1.7-use-default-stack-size-for-threads.patch
469 -https://bugzilla.redhat.com/show_bug.cgi?id=1984813
470 -https://bugs.gentoo.org/803938
471 -
472 -autofs-5.1.7 - use default stack size for threads
473 -
474 -From: Ian Kent <raven@××××××.net>
475 -
476 -autofs uses PTHREAD_STACK_MIN to set the stack size for threads it
477 -creates.
478 -
479 -In two cases it is used to reduce the stack size for long running
480 -service threads while it's used to allocate a larger stack for worker
481 -threads that can have larger memory requirements.
482 -
483 -In recent glibc releases PTHREAD_STACK_MIN is no longer a constant
484 -which can lead to unexpectedly different stack sizes on different
485 -architectures and the autofs assumption it's a constant causes a
486 -compile failure.
487 -
488 -The need to alter the stack size was due to observed stack overflow
489 -which was thought to be due the thread stack being too small for autofs
490 -and glibc alloca(3) usage.
491 -
492 -Quite a bit of that alloca(3) usage has been eliminated from autofs now,
493 -particularly those that might be allocating largish amounts of storage,
494 -and there has been a lot of change in glibc too so using the thread
495 -default stack should be ok.
496 -
497 -Signed-off-by: Ian Kent <raven@××××××.net>
498 ---- a/daemon/automount.c
499 -+++ b/daemon/automount.c
500 -@@ -84,7 +84,6 @@ static size_t kpkt_len;
501 - /* Attributes for creating detached and joinable threads */
502 - pthread_attr_t th_attr;
503 - pthread_attr_t th_attr_detached;
504 --size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144;
505 -
506 - struct master_readmap_cond mrc = {
507 - PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
508 -@@ -2620,34 +2619,6 @@ int main(int argc, char *argv[])
509 - exit(1);
510 - }
511 -
512 --#ifdef _POSIX_THREAD_ATTR_STACKSIZE
513 -- if (pthread_attr_setstacksize(
514 -- &th_attr_detached, detached_thread_stack_size)) {
515 -- logerr("%s: failed to set stack size thread attribute!",
516 -- program);
517 -- if (start_pipefd[1] != -1) {
518 -- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
519 -- close(start_pipefd[1]);
520 -- }
521 -- release_flag_file();
522 -- macro_free_global_table();
523 -- exit(1);
524 -- }
525 --#endif
526 --
527 -- if (pthread_attr_getstacksize(
528 -- &th_attr_detached, &detached_thread_stack_size)) {
529 -- logerr("%s: failed to get detached thread stack size!",
530 -- program);
531 -- if (start_pipefd[1] != -1) {
532 -- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
533 -- close(start_pipefd[1]);
534 -- }
535 -- release_flag_file();
536 -- macro_free_global_table();
537 -- exit(1);
538 -- }
539 --
540 - info(logging, "Starting automounter version %s, master map %s",
541 - version, master_list->name);
542 - info(logging, "using kernel protocol version %d.%02d",
543 ---- a/daemon/state.c
544 -+++ b/daemon/state.c
545 -@@ -1177,12 +1177,8 @@ int st_start_handler(void)
546 - status = pthread_attr_init(pattrs);
547 - if (status)
548 - pattrs = NULL;
549 -- else {
550 -+ else
551 - pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
552 --#ifdef _POSIX_THREAD_ATTR_STACKSIZE
553 -- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
554 --#endif
555 -- }
556 -
557 - status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
558 -
559 ---- a/lib/alarm.c
560 -+++ b/lib/alarm.c
561 -@@ -270,12 +270,8 @@ int alarm_start_handler(void)
562 - status = pthread_attr_init(pattrs);
563 - if (status)
564 - pattrs = NULL;
565 -- else {
566 -+ else
567 - pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
568 --#ifdef _POSIX_THREAD_ATTR_STACKSIZE
569 -- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
570 --#endif
571 -- }
572 -
573 - status = pthread_condattr_init(&condattrs);
574 - if (status)
575
576 diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc.patch b/net-fs/autofs/files/autofs-5.1.7-glibc.patch
577 deleted file mode 100644
578 index 2a0f415fbee7..000000000000
579 --- a/net-fs/autofs/files/autofs-5.1.7-glibc.patch
580 +++ /dev/null
581 @@ -1,97 +0,0 @@
582 -diff --git a/daemon/lookup.c b/daemon/lookup.c
583 -index 2fea0c0..3b3aa3e 100644
584 ---- a/daemon/lookup.c
585 -+++ b/daemon/lookup.c
586 -@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
587 - return NSS_STATUS_NOTFOUND;
588 - }
589 -
590 -- if (st.st_mode & __S_IEXEC)
591 -+ if (st.st_mode & S_IEXEC)
592 - type = src_prog;
593 - else
594 - type = src_file;
595 -@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
596 - return NSS_STATUS_NOTFOUND;
597 - }
598 -
599 -- if (st.st_mode & __S_IEXEC)
600 -+ if (st.st_mode & S_IEXEC)
601 - type = src_prog;
602 - else
603 - type = src_file;
604 -@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
605 - if (!S_ISREG(st.st_mode))
606 - return NULL;
607 -
608 -- if (st.st_mode & __S_IEXEC)
609 -+ if (st.st_mode & S_IEXEC)
610 - type = "program";
611 - else
612 - type = "file";
613 -diff --git a/include/automount.h b/include/automount.h
614 -index 1ae4078..c2e8dba 100644
615 ---- a/include/automount.h
616 -+++ b/include/automount.h
617 -@@ -13,6 +13,7 @@
618 - #include <limits.h>
619 - #include <time.h>
620 - #include <syslog.h>
621 -+#include <sys/procfs.h>
622 - #include <sys/types.h>
623 - #include <pthread.h>
624 - #include <sched.h>
625 -@@ -42,6 +43,16 @@
626 - #include <dmalloc.h>
627 - #endif
628 -
629 -+#ifndef __SWORD_TYPE
630 -+#if __WORDSIZE == 32
631 -+# define __SWORD_TYPE int
632 -+#elif __WORDSIZE == 64
633 -+# define __SWORD_TYPE long int
634 -+#else
635 -+#error
636 -+#endif
637 -+#endif
638 -+
639 - #define ENABLE_CORES 1
640 -
641 - /* We MUST have the paths to mount(8) and umount(8) */
642 -diff --git a/include/nsswitch.h b/include/nsswitch.h
643 -index d3e4027..8376113 100644
644 ---- a/include/nsswitch.h
645 -+++ b/include/nsswitch.h
646 -@@ -24,6 +24,10 @@
647 - #include <netdb.h>
648 - #include "list.h"
649 -
650 -+#ifndef _PATH_NSSWITCH_CONF
651 -+#define _PATH_NSSWITCH_CONF "/dev/null"
652 -+#endif
653 -+
654 - #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
655 -
656 - enum nsswitch_status {
657 -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
658 -index fadd2ea..cf109de 100644
659 ---- a/modules/lookup_multi.c
660 -+++ b/modules/lookup_multi.c
661 -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
662 - continue;
663 - }
664 -
665 -- if (st.st_mode & __S_IEXEC)
666 -+ if (st.st_mode & S_IEXEC)
667 - type = src_prog;
668 - else
669 - type = src_file;
670 -@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
671 - continue;
672 - }
673 -
674 -- if (st.st_mode & __S_IEXEC)
675 -+ if (st.st_mode & S_IEXEC)
676 - type = src_prog;
677 - else
678 - type = src_file;