From 9450c91ec9617b7c4d303cd0a5d042d382f1ddcc Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Thu, 16 Jan 2025 12:51:09 -0500
Subject: [PATCH] nfsdcltrack related manpage and configure file cleanup
 (RHEL-73500)

Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: RHEL-73500
---
 nfs-utils-2.8.2-nfsdcltrack-cleanup.patch | 58 +++++++++++++++++++++++
 nfs-utils.spec                            | 10 +++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 nfs-utils-2.8.2-nfsdcltrack-cleanup.patch

diff --git a/nfs-utils-2.8.2-nfsdcltrack-cleanup.patch b/nfs-utils-2.8.2-nfsdcltrack-cleanup.patch
new file mode 100644
index 0000000..cd30121
--- /dev/null
+++ b/nfs-utils-2.8.2-nfsdcltrack-cleanup.patch
@@ -0,0 +1,58 @@
+commit 968f7b646ff70ff1d4669138c617ae5f1591e9b6
+Author: Steve Dickson <steved@redhat.com>
+Date:   Sat Jan 11 04:51:33 2025 -0500
+
+    nfsdcltrack related manpage and configure file cleanup
+    
+    Reported-by: Yongcheng Yang <yoyang@redhat.com>
+    Reviewed-by: Jeff Layton <jlayton@kernel.org>
+    Fixes: https://issues.redhat.com/browse/RHEL-73500
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/nfs.conf b/nfs.conf
+index 087d7372..3cca68c3 100644
+--- a/nfs.conf
++++ b/nfs.conf
+@@ -60,10 +60,6 @@
+ # debug=0
+ # storagedir=/var/lib/nfs/nfsdcld
+ #
+-[nfsdcltrack]
+-# debug=0
+-# storagedir=/var/lib/nfs/nfsdcltrack
+-#
+ [nfsd]
+ # debug=0
+ # threads=16
+diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man
+index d03fc887..e6a84a97 100644
+--- a/systemd/nfs.conf.man
++++ b/systemd/nfs.conf.man
+@@ -158,19 +158,6 @@ is equivalent to providing the
+ .B \-\-log\-auth
+ option.
+ 
+-.TP
+-.B nfsdcltrack
+-Recognized values:
+-.BR storagedir .
+-
+-The
+-.B nfsdcltrack
+-program is run directly by the Linux kernel and there is no
+-opportunity to provide command line arguments, so the configuration
+-file is the only way to configure this program.  See
+-.BR nfsdcltrack (8)
+-for details.
+-
+ .TP
+ .B nfsd
+ Recognized values:
+@@ -329,7 +316,6 @@ for deatils.
+ Various configuration files read in order.  Later settings override
+ earlier settings.
+ .SH SEE ALSO
+-.BR nfsdcltrack (8),
+ .BR rpc.nfsd (8),
+ .BR rpc.mountd (8),
+ .BR nfsmount.conf (5).
diff --git a/nfs-utils.spec b/nfs-utils.spec
index ef3722e..4e36fca 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.8.2
-Release: 0%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -14,6 +14,11 @@ Source2: lockd.conf
 Source3: 24-nfs-server.conf
 Source4: 10-nfsv4.conf
 
+#
+# RHEL10.0
+#
+Patch001: nfs-utils-2.8.2-nfsdcltrack-cleanup.patch
+
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
 Patch103: nfs-utils-2.3.1-systemd-gssproxy-restart.patch
@@ -427,6 +432,9 @@ rm -rf /etc/systemd/system/rpc-*.requires
 %{_mandir}/*/nfsiostat.8.gz
 
 %changelog
+* Thu Jan 16 2025 Steve Dickson <steved@redhat.com> 2.8.2-1
+- nfsdcltrack related manpage and configure file cleanup (RHEL-73500)
+
 * Tue Dec 10 2024 Scott Mayhew <smayhew@redhat.com> 2.8.2-0
 - Updated to the latest release: nfs-utils-2-8-2 (RHEL-67786)
   Resolves: RHEL-65826