gentoo xmass resync : 25.12.2021

4 files changed, 96 insertions, 7 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f4e061c8d2e4..de5f34a4aa9e 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index c75b3ba765ef..25f53334aeaa 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -4,12 +4,14 @@ AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf44
 AUX autofs-5.1.7-glibc-2.34.patch 3439 BLAKE2B 9ad024413e1bbb0c2d953ee9355dc6ac6fbf13d4475a14f9183c5092c4850441a7b7f1809452c96d0020b4fb4105f6724e3f04b817ad5b143b9074662f35a87b SHA512 e22fa260123823fa6109d8b2737877a39e15c696ab1e506a8bdeb2a1feebaec965a577a645c9e9edd19547a2b2237e06191f91107b8025b985b7f4f3137685fa
 AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
 AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4
+AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b
 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
+DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
 EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d
 EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d
-EBUILD autofs-5.1.8.ebuild 3273 BLAKE2B 814d139eb64c83169094a0813c2244c12873ab72d0d80fab9e72d065b3db64431fd6512be2dbfca885ede59f3f5fde1c1851b9d1c7344c24eea5675af66e04dc SHA512 72f74df90fec36661642177b7d9c3a887b8a9cb7bb41acd12ae85519338c4a4c472add2972d69b461d0fae7dd2a347bdbf558526810c49a9f0208e4425af9a0b
+EBUILD autofs-5.1.8-r1.ebuild 3275 BLAKE2B ac50e477c362a8a32a5aae66b0482f81ab4e64451f98735547ea4c2deb892e7d3b980e54a5b3e9b27f49af8f92e78856594038202cefeb31f1d9d11638674760 SHA512 f31bc210fd2369819a2df723d0392e7c59526dcbab5821d8a8e4caa4fdae0b2f51104de5cf86e84413067fcef12cdd6561f32bc81846fadce066e0d34e35a945
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.8.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index 3c519f852c70..019f79e0808e 100644
--- a/net-fs/autofs/autofs-5.1.8.ebuild
+++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild
@@ -7,11 +7,12 @@ inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="Kernel based automounter"
 HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz
+	https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-0.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
@@ -40,11 +41,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.1.7-glibc.patch"
-	"${FILESDIR}/${PN}-5.1.6-musl.patch"
-	"${FILESDIR}/${PN}-5.1.6-pid.patch"
-	"${FILESDIR}/${PN}-5.1.6-pid.patch"
+	"${WORKDIR}"/${P}-patches/
 	"${FILESDIR}/${P}-dmalloc.patch"
+	"${FILESDIR}/${P}-nfsv4-mount.patch"
 )
 
 pkg_setup() {
diff --git a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
new file mode 100644
index 000000000000..eb1bc6cb4241
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
@@ -0,0 +1,88 @@
+autofs-5.1.8 - fix nfsv4 only mounts should not use rpcbind
+
+From: Ian Kent <raven@xxxxxxxxxx>
+
+Commit 606795ecfaa1 ("autofs-5.1.7 - also require TCP_REQUESTED when
+setting NFS port" together with commit 26fb6b5408be) caused NFSv4 only
+mounts to also use rpcbind to probe availability which breaks the
+requirememt that this type of mount not use rpcbind at all.
+
+Fix this by treating fstype=nfs4 mounts as a special case which doesn't
+use rpcbind.
+---
+ CHANGELOG            |    1 +
+ include/replicated.h |    2 ++
+ modules/mount_nfs.c  |   13 +++++++------
+ modules/replicated.c |    4 ++--
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/include/replicated.h b/include/replicated.h
+index 95ff1f0d..f889a56a 100644
+--- a/include/replicated.h
++++ b/include/replicated.h
+@@ -35,6 +35,8 @@
+ #define NFS3_REQUESTED		NFS3_SUPPORTED
+ #define NFS4_REQUESTED		NFS4_SUPPORTED
+ 
++#define NFS4_ONLY_REQUESTED	0x0800
++
+ #define TCP_SUPPORTED		0x0001
+ #define UDP_SUPPORTED		0x0002
+ #define TCP_REQUESTED		TCP_SUPPORTED
+diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
+index 0ab87dcf..feb5afcd 100644
+--- a/modules/mount_nfs.c
++++ b/modules/mount_nfs.c
+@@ -92,7 +92,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 	mount_default_proto = defaults_get_mount_nfs_default_proto();
+ 	vers = NFS_VERS_DEFAULT | NFS_PROTO_DEFAULT;
+ 	if (strcmp(fstype, "nfs4") == 0)
+-		vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED;
++		vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
+ 	else if (mount_default_proto == 4)
+ 		vers = vers | NFS4_VERS_DEFAULT;
+ 
+@@ -157,15 +157,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 			} else {
+ 				/* Is any version of NFSv4 in the options */
+ 				if (_strncmp("vers=4", cp, 6) == 0 ||
+-				    _strncmp("nfsvers=4", cp, 9) == 0)
+-					vers = NFS4_VERS_MASK | TCP_SUPPORTED;
+-				else if (_strncmp("vers=3", cp, o_len) == 0 ||
++				    _strncmp("nfsvers=4", cp, 9) == 0) {
++					vers &= ~(NFS_VERS_MASK);
++					vers |= NFS4_VERS_MASK | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
++				} else if (_strncmp("vers=3", cp, o_len) == 0 ||
+ 					 _strncmp("nfsvers=3", cp, o_len) == 0) {
+-					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
++					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
+ 					vers |= NFS3_REQUESTED;
+ 				} else if (_strncmp("vers=2", cp, o_len) == 0 ||
+ 					 _strncmp("nfsvers=2", cp, o_len) == 0) {
+-					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
++					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
+ 					vers |= NFS2_REQUESTED;
+ 				} else if (strstr(cp, "port=") == cp &&
+ 					 o_len - 5 < 25) {
+diff --git a/modules/replicated.c b/modules/replicated.c
+index 09075dd0..cdb7c617 100644
+--- a/modules/replicated.c
++++ b/modules/replicated.c
+@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
+ 
+ 	rpc_info->proto = proto;
+ 	if (port < 0) {
+-		if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED))
++		if (version & NFS4_REQUESTED && (version & NFS4_ONLY_REQUESTED))
+ 			rpc_info->port = NFS_PORT;
+ 		else
+ 			port = 0;
+@@ -525,7 +525,7 @@ static int get_vers_and_cost(unsigned logopt, struct host *host,
+ {
+ 	struct conn_info pm_info, rpc_info;
+ 	time_t timeout = RPC_TIMEOUT;
+-	unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK);
++	unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK | NFS4_ONLY_REQUESTED);
+ 	int ret = 0;
+ 
+ 	if (!check_address_proto(logopt, host, version))