Rebased to upstream release: nfs-utils-2-5-4 (bz 1971684)

Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: bz1971684
This commit is contained in:
Steve Dickson 2021-06-24 14:54:25 -04:00
parent 1beea9af33
commit ce3155bb7d
6 changed files with 18 additions and 1278 deletions

4
.gitignore vendored
View File

@ -1,4 +1,4 @@
x86_64
Makefile
nfs-utils-2.5.3/
/nfs-utils-2.5.3.tar.xz
/nfs-utils-2.5.4.tar.xz
nfs-utils-2.5.4/

View File

@ -1,6 +1,6 @@
diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/statd/sm-notify.man
--- nfs-utils-2.1.1/utils/statd/sm-notify.man.orig 2017-04-26 12:45:14.205742654 -0400
+++ nfs-utils-2.1.1/utils/statd/sm-notify.man 2017-04-26 12:45:44.042630801 -0400
diff -up nfs-utils-2.5.4/utils/statd/sm-notify.man.orig nfs-utils-2.5.4/utils/statd/sm-notify.man
--- nfs-utils-2.5.4/utils/statd/sm-notify.man.orig 2021-06-10 14:07:47.000000000 -0400
+++ nfs-utils-2.5.4/utils/statd/sm-notify.man 2021-06-24 14:46:32.413626193 -0400
@@ -184,7 +184,7 @@ where NSM state information resides.
If this option is not specified,
.B sm-notify
@ -10,7 +10,7 @@ diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/st
by default.
.IP
After starting,
@@ -330,13 +330,13 @@ Currently, the
@@ -338,13 +338,13 @@ Currently, the
command supports sending notification only via datagram transport protocols.
.SH FILES
.TP 2.5i
@ -27,10 +27,10 @@ diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/st
NSM state number for this host
.TP 2.5i
.I /proc/sys/fs/nfs/nsm_local_state
diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/statd.man
--- nfs-utils-2.1.1/utils/statd/statd.man.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/utils/statd/statd.man 2017-04-26 12:45:44.043630798 -0400
@@ -253,7 +253,7 @@ where NSM state information resides.
diff -up nfs-utils-2.5.4/utils/statd/statd.man.orig nfs-utils-2.5.4/utils/statd/statd.man
--- nfs-utils-2.5.4/utils/statd/statd.man.orig 2021-06-10 14:07:47.000000000 -0400
+++ nfs-utils-2.5.4/utils/statd/statd.man 2021-06-24 14:46:32.414626197 -0400
@@ -251,7 +251,7 @@ where NSM state information resides.
If this option is not specified,
.B rpc.statd
uses
@ -39,7 +39,7 @@ diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/
by default.
.IP
After starting,
@@ -425,13 +425,13 @@ If set to a positive integer, has the sa
@@ -431,13 +431,13 @@ If set to a positive integer, has the sa
.IR \-\-no\-notify .
.SH FILES
.TP 2.5i
@ -55,4 +55,4 @@ diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/
+.I /var/lib/nfs/statd/state
NSM state number for this host
.TP 2.5i
.I /var/run/run.statd.pid
.I /run/run.statd.pid

View File

@ -1,16 +0,0 @@
diff -up nfs-utils-2.5.3/nfs.conf.orig nfs-utils-2.5.3/nfs.conf
--- nfs-utils-2.5.3/nfs.conf.orig 2021-03-16 13:38:43.922161313 -0400
+++ nfs-utils-2.5.3/nfs.conf 2021-03-16 13:39:24.560299448 -0400
@@ -72,9 +72,9 @@ use-gss-proxy=1
# vers4.0=y
# vers4.1=y
# vers4.2=y
-# rdma=n
-# rdma-port=20049
-#
+rdma=y
+rdma-port=20049
+
[statd]
# debug=0
# port=0

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
Name: nfs-utils
URL: http://linux-nfs.org/
Version: 2.5.3
Release: 2.rc1%{?dist}.1
Version: 2.5.4
Release: 0%{?dist}
Epoch: 1
# group all 32bit related archs
@ -17,9 +17,6 @@ Source5: nfsconvert.sh
Source6: nfs-convert.service
Source7: 10-nfsv4.conf
Patch001: nfs-utils-2.5.4-rc1.patch
Patch002: nfs-utils-2.5.3-rdma-on.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
@ -454,6 +451,9 @@ fi
%{_mandir}/*/nfsiostat.8.gz
%changelog
* Thu Jun 24 2021 Steve Dickson <steved@redhat.com> 2.5.4-0
- Rebased to upstream release: nfs-utils-2-5-4 (bz 1971684)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.5.3-2.rc1.1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

View File

@ -1 +1 @@
SHA512 (nfs-utils-2.5.3.tar.xz) = 1c6301b7b9abe38320508da7eb6d428f85f4a093fc6b5bd24139cbfb1d6010f982021eb113e2977b27f8e0eedcf29958b152f6d5321614ace74f9648b47d8cc2
SHA512 (nfs-utils-2.5.4.tar.xz) = 1519e24ecaf6981b49115b1e92e8af30eacd042dd172e75a7008a25e4726c374afdc43e563768a030363d59adbbdec1d6797090060b93bd9ee18d44191130327