From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 707EF15838C for ; Thu, 25 Jan 2024 11:08:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3E51E2A9B; Thu, 25 Jan 2024 11:08:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90F38E2A9B for ; Thu, 25 Jan 2024 11:08:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9946E343228 for ; Thu, 25 Jan 2024 11:08:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B4E3BE7 for ; Thu, 25 Jan 2024 11:08:02 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1706180868.c54cb04aac675eebda4970990d7fd073f0d56e40.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild X-VCS-Directories: net-fs/nfs-utils/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c54cb04aac675eebda4970990d7fd073f0d56e40 X-VCS-Branch: master Date: Thu, 25 Jan 2024 11:08:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25300fae-8a78-4b84-b01b-febd29add6bb X-Archives-Hash: 0d0a3520544e65717157ee3ea1e440f9 commit: c54cb04aac675eebda4970990d7fd073f0d56e40 Author: David Seifert gentoo org> AuthorDate: Thu Jan 25 11:07:48 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 25 11:07:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54cb04a net-fs/nfs-utils: remove USE={idmap,nfsdcld} * The absence of idmap leads to obscure issues on NFSv4. Closes: https://github.com/gentoo/gentoo/pull/34988 Bug: https://bugs.gentoo.org/798831 Bug: https://bugs.gentoo.org/914203 Signed-off-by: David Seifert gentoo.org> ...s-2.6.4-r2.ebuild => nfs-utils-2.6.4-r3.ebuild} | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild similarity index 88% rename from net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild index bf04672be1de..ae1a7eca66e6 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.4-r2.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild @@ -19,8 +19,8 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv3 +nfsv4 sasl selinux tcpd +uuid" -REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 ) nfsdcld? ( nfsv4 )" +IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid" +REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 )" # bug #315573 RESTRICT="test" @@ -78,10 +78,9 @@ PATCHES=( pkg_setup() { linux-info_pkg_setup - if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then + if use nfsv4 && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then ewarn "Your NFS server will be unable to track clients across server restarts!" - ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode" - ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" + ewarn "Please enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" ewarn "support the legacy, in-kernel client tracker." fi } @@ -99,7 +98,7 @@ src_prepare() { src_configure() { # Our DEPEND forces this. export libsqlite3_cv_is_recent=yes - export ac_cv_header_keyutils_h=$(usex nfsidmap) + export ac_cv_header_keyutils_h=$(usex nfsv4) # SASL is consumed in a purely automagic way export ac_cv_header_sasl_h=no @@ -121,9 +120,9 @@ src_configure() { $(use_enable kerberos svcgss) $(use_enable ldap) $(use_enable libmount libmount-mount) - $(use_enable nfsdcld) - $(use_enable nfsdcld nfsdcltrack) $(use_enable nfsv4) + $(use_enable nfsv4 nfsdcld) + $(use_enable nfsv4 nfsdcltrack) $(use_enable nfsv4 nfsv41) $(use_enable nfsv4 nfsv4server) $(use_enable uuid) @@ -157,7 +156,7 @@ src_install() { dodir /sbin mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die - if use nfsv4 && use nfsidmap ; then + if use nfsv4 ; then insinto /etc doins support/nfsidmap/idmapd.conf @@ -181,12 +180,6 @@ src_install() { newinitd "${FILESDIR}"/${f}.initd ${f} done - # Nuke after 2015/08/01 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - # bug #234132 sed -i \ -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \