gentoo resync : 29.01.2021

3 files changed, 112 insertions, 3 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 49a3fb8dc027..b576d907657c 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,8 +1,10 @@
 AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc
 AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6
+AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
+DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
 EBUILD autofs-5.1.6-r1.ebuild 3071 BLAKE2B 5c64c0658a1241bd58699cac218c5b7812e211b385377fd33055d1599abf2062f5fa74fa4b9baa1e7c94d61aaa0b2115c1e328b885c4a1761b5c1d1835ac3d71 SHA512 e08b9bbf3cf13f170ddf32fde3029a68d02a8843c7a392f448cf543ed5936d017e3e3473673f35c37259909c479f81f6d39e45e52458e78a8f35cb412c50c2c6
-EBUILD autofs-5.1.6.ebuild 2941 BLAKE2B 133ebfdfd49766dbe8bd9968e959b8793188ccb64c080519818d166f6bfd17bd153785b38ede0c7feaed577c2baf60aaf40282e5cd0e7903dfab86ba71483378 SHA512 518bf239e6664cc5f0590c5698b6fa0538c4e3c87eb6a27defef8f146416902c444fd6eba70c8c0bc9fb255aa6e4071f1e299e20eea37fcb640ba12a7dcd214d
+EBUILD autofs-5.1.7.ebuild 3084 BLAKE2B 13858264dacc7da28d78c3aa037254b19ad7fa949d514b636283378a25f8eff68ae3408de0c72b35f2c176f02ee81e626ccf221c53d7c0066b491efd7d7dfeb1 SHA512 d446d1cbb0a5e5ffcd3e87092b8a4fff0eb733fa2cc964ed0f1f2d277eda79a8df87e04543c2b86c4aa4243f2e6b1045c381c006322ab0dce755243e145dbc5e
 MISC metadata.xml 976 BLAKE2B 4aa6e19a7966c42af8daca6be175f33769d75b6342a114d42b47e374f6b8df3ec0cc5c25d1c7a295f3d11f54555e4a2b1dc654aa335a89ee79bdb47fb796eaf1 SHA512 23aff908ddf72ab528f025b750bc48af90864c39c7ffb44537b87992d7b5d802d46f355ee7af38d57514a66894596a91a027b2db13940106d3a74ffa53d6758d
diff --git a/net-fs/autofs/autofs-5.1.6.ebuild b/net-fs/autofs/autofs-5.1.7.ebuild
index 530cce170c8a..5dfef5feafa3 100644
--- a/net-fs/autofs/autofs-5.1.6.ebuild
+++ b/net-fs/autofs/autofs-5.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
@@ -36,6 +36,11 @@ BDEPEND="
 	virtual/yacc
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-glibc.patch"
+	"${FILESDIR}/${PN}-5.1.6-pid.patch"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -84,6 +89,11 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	export DONTSTRIP=1
+	default
+}
+
 src_install() {
 	default
 	rmdir "${D}"/run
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc.patch b/net-fs/autofs/files/autofs-5.1.7-glibc.patch
new file mode 100644
index 000000000000..2a0f415fbee7
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.7-glibc.patch
@@ -0,0 +1,97 @@
+diff --git a/daemon/lookup.c b/daemon/lookup.c
+index 2fea0c0..3b3aa3e 100644
+--- a/daemon/lookup.c
++++ b/daemon/lookup.c
+@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
+ 		return NSS_STATUS_NOTFOUND;
+ 	}
+ 
+-	if (st.st_mode & __S_IEXEC)
++	if (st.st_mode & S_IEXEC)
+ 		type = src_prog;
+ 	else
+ 		type = src_file;
+@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
+ 		return NSS_STATUS_NOTFOUND;
+ 	}
+ 
+-	if (st.st_mode & __S_IEXEC)
++	if (st.st_mode & S_IEXEC)
+ 		type = src_prog;
+ 	else
+ 		type = src_file;
+@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
+ 	if (!S_ISREG(st.st_mode))
+ 		return NULL;
+ 
+-	if (st.st_mode & __S_IEXEC)
++	if (st.st_mode & S_IEXEC)
+ 		type = "program";
+ 	else
+ 		type = "file";
+diff --git a/include/automount.h b/include/automount.h
+index 1ae4078..c2e8dba 100644
+--- a/include/automount.h
++++ b/include/automount.h
+@@ -13,6 +13,7 @@
+ #include <limits.h>
+ #include <time.h>
+ #include <syslog.h>
++#include <sys/procfs.h>
+ #include <sys/types.h>
+ #include <pthread.h>
+ #include <sched.h>
+@@ -42,6 +43,16 @@
+ #include <dmalloc.h>
+ #endif
+ 
++#ifndef __SWORD_TYPE
++#if __WORDSIZE == 32
++# define __SWORD_TYPE		int
++#elif __WORDSIZE == 64
++# define __SWORD_TYPE		long int
++#else
++#error
++#endif
++#endif
++
+ #define ENABLE_CORES	1
+ 
+ /* We MUST have the paths to mount(8) and umount(8) */
+diff --git a/include/nsswitch.h b/include/nsswitch.h
+index d3e4027..8376113 100644
+--- a/include/nsswitch.h
++++ b/include/nsswitch.h
+@@ -24,6 +24,10 @@
+ #include <netdb.h>
+ #include "list.h"
+ 
++#ifndef _PATH_NSSWITCH_CONF
++#define _PATH_NSSWITCH_CONF "/dev/null"
++#endif
++
+ #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
+ 
+ enum nsswitch_status {
+diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
+index fadd2ea..cf109de 100644
+--- a/modules/lookup_multi.c
++++ b/modules/lookup_multi.c
+@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
+ 				continue;
+ 			}
+ 
+-			if (st.st_mode & __S_IEXEC)
++			if (st.st_mode & S_IEXEC)
+ 				type = src_prog;
+ 			else
+ 				type = src_file;
+@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
+ 					continue;
+ 				}
+ 
+-				if (st.st_mode & __S_IEXEC)
++				if (st.st_mode & S_IEXEC)
+ 					type = src_prog;
+ 				else
+ 					type = src_file;