8 files changed, 2 insertions, 436 deletions
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 2dc7b26bd919..28faaa9a16c6 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 8a71ae9340bf..d2dad2bbdc2e 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,13 +1,6 @@
-AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4
-AUX autofs-5.1.8-mount_conflict.patch 801 BLAKE2B a9c26656e04c2e9b3be849012c46008521111c922ea4ac40de8cd724a9defe3e8432f6919c808d165f8c45f7ccd46ec1d4fe694213879cd4763f648159d3f091 SHA512 e72cdafc793985af661633bc9c11a66b03c7dd68151a7fadefcd54039ad5a803307e6fe52a2ed178c7373f6e42747332e8b8f2b08b8b0b02005942fcde38da43
-AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b
 AUX autofs-5.1.9-c99.patch 2057 BLAKE2B 520c81142472e8be9a5e2fe462f51ae75807209d3ffed34558a34bec0acfdb84269184cf80654d582c12be311c78de5394ec47d9d9e65613d11104cdcf719d21 SHA512 4476c5a1ff41931d9852cd16dc98c040845ac193ef22cca64d86c14eb52064e40a2042101602cc4ae8bac6eaaf71783f2157bd58882434df70ad10e10742f862
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
-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
 DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc
-EBUILD autofs-5.1.8-r1.ebuild 3454 BLAKE2B 576471f4390927fdd494150694ff8b3add940dec28062d6a1257b5648b6661c62066a38ce57ce01948ece92b3a7ac6801157589fedcc28e4d15ae55c6ae60795 SHA512 0ba64b4ed9006877c964fc52252900fa658f2063db17d6176f25abb4369365fc7b6e6078ba3d6ab24045f5a7a0b7622bcbd7a17183a28fd7fbc2e2d0633d9975
-EBUILD autofs-5.1.9-r1.ebuild 3276 BLAKE2B caa18f7f634e3ae3bd576f5961a15b7434c595f796eefb3b8d83892af17be2104ce60a6129c317dec7ff9597702b69bb64e347f2424868fbd408f8410a2fa6b8 SHA512 9ec12e4c52b18653a4939e05b564bc34abcf1683314503c03664a0680417d97e2cd37b8a014fc7b872e285e00ddc5d10fb7b4a571bfe3cbabe80b59f618fba6e
-EBUILD autofs-5.1.9.ebuild 3226 BLAKE2B 10262657be28d458b7a749e77f4cb43dec611e16b66c502f9e8e123a737dc721a07e5a1515074a48f04441df4028c18787d3eb84bdcf48805d589f77802d27e5 SHA512 e5063c76b5ab9c15c9aef1b46d3d05045497195db323ca10ab2301ceed2448559bcc9dfaee404ee0cc0c41516f35c8d3745c22e32178329cd36e5310be0b0506
+EBUILD autofs-5.1.9-r1.ebuild 3270 BLAKE2B e62cd102cda4e7970374837672bfe8bd2e541dc64c853831ee542406b35230ed6bc5a1a3d964f35c6684466b9f3e975acb320711b8263ac72506fe373f54eff1 SHA512 ae921c027e47a9abee276f2ad9bc2827ff7a0a3b50d8c97612a710516a7423aef6e1dcb9801f1f1e404b3438815458848680b7d105bc8ca25611102cd9e4343d
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
deleted file mode 100644
index 490ca32bfe1b..000000000000
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git"
-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 ~riscv sparc x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
-	net-libs/libnsl:=
-	>=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? (
-		>=net-nds/openldap-2.0:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
-	app-alternatives/lex
-	virtual/pkgconfig
-	app-alternatives/yacc
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-automount )"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patches/
-	"${FILESDIR}/${P}-dmalloc.patch"
-	"${FILESDIR}/${P}-nfsv4-mount.patch"
-	"${FILESDIR}/${P}-mount_conflict.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK
-
-	if kernel_is -ge 4 18; then
-		CONFIG_CHECK="~AUTOFS_FS"
-	else
-		CONFIG_CHECK="~AUTOFS4_FS"
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
-	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
-
-	# Install samples including autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake STRIP=: DONTSTRIP=1
-}
-
-src_install() {
-	default
-	rmdir "${D}"/run
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.9-r1.ebuild b/net-fs/autofs/autofs-5.1.9-r1.ebuild
index efcc4e9ebb83..d23797ae4841 100644
--- a/net-fs/autofs/autofs-5.1.9-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.9-r1.ebuild
@@ -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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/autofs/autofs-5.1.9.ebuild b/net-fs/autofs/autofs-5.1.9.ebuild
deleted file mode 100644
index f21b6430b76e..000000000000
--- a/net-fs/autofs/autofs-5.1.9.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
-	net-libs/libnsl:=
-	>=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? (
-		>=net-nds/openldap-2.0:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
-	app-alternatives/lex
-	virtual/pkgconfig
-	app-alternatives/yacc
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-automount )"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK
-
-	if kernel_is -ge 4 18; then
-		CONFIG_CHECK="~AUTOFS_FS"
-	else
-		CONFIG_CHECK="~AUTOFS4_FS"
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
-	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
-
-	# Install samples including autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake STRIP=: DONTSTRIP=1
-}
-
-src_install() {
-	default
-	rmdir "${D}"/run
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
deleted file mode 100644
index e2ed58fb1766..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/include/mounts.h b/include/mounts.h
-index ddb7e4c..854e1fb 100644
---- a/include/mounts.h
-+++ b/include/mounts.h
-@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n);
- struct tree_ops {
- 	tree_new_t new;
- 	tree_cmp_t cmp;
--	tree_free_t free;
-+	tree_free_t set_free;
- };
- 
- typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr);
-diff --git a/lib/mounts.c b/lib/mounts.c
-index 4c86688..1e54a33 100644
---- a/lib/mounts.c
-+++ b/lib/mounts.c
-@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n);
- static struct tree_ops mnt_ops = {
- 	.new = tree_mnt_new,
- 	.cmp = tree_mnt_cmp,
--	.free = tree_mnt_free,
-+	.set_free = tree_mnt_free,
- };
- static struct tree_ops *tree_mnt_ops = &mnt_ops;
- 
-@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n);
- static struct tree_ops host_ops = {
- 	.new = tree_host_new,
- 	.cmp = tree_host_cmp,
--	.free = tree_host_free,
-+	.set_free = tree_host_free,
- };
- static struct tree_ops *tree_host_ops = &host_ops;
- 
-@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n);
- static struct tree_ops mapent_ops = {
- 	.new = tree_mapent_new,
- 	.cmp = tree_mapent_cmp,
--	.free = tree_mapent_free,
-+	.set_free = tree_mapent_free,
- };
- static struct tree_ops *tree_mapent_ops = &mapent_ops;
- 
-@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root)
- 		tree_free(root->right);
- 	if (root->left)
- 		tree_free(root->left);
--	ops->free(root);
-+	ops->set_free(root);
- }
- 
- int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr)
diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
deleted file mode 100644
index e2a94bf82542..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Avoid conflicts between sys/mount.h and linux/mount.h
-
-linux/fs.h includes linux/mount.h and this include file is unused so
-do not include it and avoid conflict too with glibc 2.36+ see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/modules/parse_amd.c
-+++ b/modules/parse_amd.c
-@@ -27,7 +27,6 @@
- #include <sys/utsname.h>
- #include <netinet/in.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
- 
- #define MODULE_PARSE
- #include "automount.h"
---- a/modules/parse_sun.c
-+++ b/modules/parse_sun.c
-@@ -30,7 +30,6 @@
- #include <sys/utsname.h>
- #include <netinet/in.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
- 
- #define MODULE_PARSE
- #include "automount.h"
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
deleted file mode 100644
index eb1bc6cb4241..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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))