diff --git a/nfs-utils-2.3.3-man-tcpwrappers.patch b/nfs-utils-2.3.3-man-tcpwrappers.patch index 65fee3a..83fcb10 100644 --- a/nfs-utils-2.3.3-man-tcpwrappers.patch +++ b/nfs-utils-2.3.3-man-tcpwrappers.patch @@ -1,8 +1,8 @@ -diff -up nfs-utils-2.3.3/utils/mountd/mountd.man.orig nfs-utils-2.3.3/utils/mountd/mountd.man ---- nfs-utils-2.3.3/utils/mountd/mountd.man.orig 2018-09-06 14:09:08.000000000 -0400 -+++ nfs-utils-2.3.3/utils/mountd/mountd.man 2018-10-26 09:53:10.005127368 -0400 -@@ -232,36 +232,7 @@ section include - which each have same same meaning as given by +diff -up nfs-utils-2.5.4/utils/mountd/mountd.man.orig nfs-utils-2.5.4/utils/mountd/mountd.man +--- nfs-utils-2.5.4/utils/mountd/mountd.man.orig 2022-01-22 16:56:29.715967394 -0500 ++++ nfs-utils-2.5.4/utils/mountd/mountd.man 2022-01-22 16:57:07.494103095 -0500 +@@ -291,36 +291,7 @@ section include + which each have the same meaning as given by .BR rpc.nfsd (8). -.SH TCP_WRAPPERS SUPPORT @@ -39,7 +39,7 @@ diff -up nfs-utils-2.3.3/utils/mountd/mountd.man.orig nfs-utils-2.3.3/utils/moun TI-RPC is a pre-requisite for supporting NFS on IPv6. If TI-RPC support is built into .BR rpc.mountd , -@@ -288,7 +259,6 @@ table of clients accessing server's expo +@@ -347,7 +318,6 @@ table of clients accessing server's expo .BR nfs (5), .BR nfs.conf (5), .BR tcpd (8), @@ -47,10 +47,10 @@ diff -up nfs-utils-2.3.3/utils/mountd/mountd.man.orig nfs-utils-2.3.3/utils/moun .BR iptables (8), .BR netconfig (5) .sp -diff -up nfs-utils-2.3.3/utils/statd/statd.man.orig nfs-utils-2.3.3/utils/statd/statd.man ---- nfs-utils-2.3.3/utils/statd/statd.man.orig 2018-10-26 09:52:27.609358805 -0400 -+++ nfs-utils-2.3.3/utils/statd/statd.man 2018-10-26 09:53:37.345978117 -0400 -@@ -319,28 +319,6 @@ chooses, simply use +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 2022-01-22 16:56:29.718967405 -0500 ++++ nfs-utils-2.5.4/utils/statd/statd.man 2022-01-22 16:57:07.495103099 -0500 +@@ -325,28 +325,6 @@ chooses, simply use .BR chown (1) to set the owner of the state directory. @@ -79,7 +79,7 @@ diff -up nfs-utils-2.3.3/utils/statd/statd.man.orig nfs-utils-2.3.3/utils/statd/ .SH ADDITIONAL NOTES Lock recovery after a reboot is critical to maintaining data integrity and preventing unnecessary application hangs. -@@ -445,7 +423,6 @@ network transport capability database +@@ -451,7 +429,6 @@ network transport capability database .BR rpc.nfsd (8), .BR rpcbind (8), .BR tcpd (8), diff --git a/nfs-utils-2.5.4-mount-nov2.patch b/nfs-utils-2.5.4-mount-nov2.patch index db73a09..32beaab 100644 --- a/nfs-utils-2.5.4-mount-nov2.patch +++ b/nfs-utils-2.5.4-mount-nov2.patch @@ -1,8 +1,8 @@ diff --git a/nfs.conf b/nfs.conf -index b4c0da02..bc1de8d1 100644 +index 8c714ff7..21d3e7b2 100644 --- a/nfs.conf +++ b/nfs.conf -@@ -68,7 +68,6 @@ use-gss-proxy=1 +@@ -68,7 +68,6 @@ # lease-time=90 # udp=n # tcp=y @@ -10,6 +10,18 @@ index b4c0da02..bc1de8d1 100644 # vers3=y # vers4=y # vers4.0=y +diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man +index 4436a38a..be487a11 100644 +--- a/systemd/nfs.conf.man ++++ b/systemd/nfs.conf.man +@@ -171,7 +171,6 @@ Recognized values: + .BR lease-time , + .BR udp , + .BR tcp , +-.BR vers2 , + .BR vers3 , + .BR vers4 , + .BR vers4.0 , diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c index 3d3684ef..1d88cbfc 100644 --- a/utils/mount/configfile.c @@ -172,6 +184,22 @@ index fa67a66f..3c4e218a 100644 /* * Avoid retry and negotiation logic when remounting */ +diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man +index 77e6299a..a206a3e2 100644 +--- a/utils/mountd/mountd.man ++++ b/utils/mountd/mountd.man +@@ -286,10 +286,9 @@ The values recognized in the + section include + .BR TCP , + .BR UDP , +-.BR vers2 , + .BR vers3 ", and" + .B vers4 +-which each have same same meaning as given by ++which each have the same meaning as given by + .BR rpc.nfsd (8). + + .SH TCP_WRAPPERS SUPPORT diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index b0741718..4016a761 100644 --- a/utils/nfsd/nfsd.c @@ -193,7 +221,7 @@ index b0741718..4016a761 100644 break; default: diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man -index 2701ba78..716f538b 100644 +index 2701ba78..634b8a63 100644 --- a/utils/nfsd/nfsd.man +++ b/utils/nfsd/nfsd.man @@ -57,7 +57,7 @@ This option can be used to request that @@ -214,3 +242,12 @@ index 2701ba78..716f538b 100644 .TP .B \-L " or " \-\-lease-time seconds Set the lease-time used for NFSv4. This corresponds to how often +@@ -156,8 +156,6 @@ Enable (with "on" or "yes" etc) or disable ("off", "no") UDP support. + .B TCP + Enable or disable TCP support. + .TP +-.B vers2 +-.TP + .B vers3 + .TP + .B vers4 diff --git a/nfs-utils.spec b/nfs-utils.spec index 8b22cc4..0dc85a3 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.5.4 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 # group all 32bit related archs @@ -448,6 +448,9 @@ fi %{_mandir}/*/nfsiostat.8.gz %changelog +* Sat Jan 22 2022 Steve Dickson 2.5.4-9 +- manpage: remove the no longer supported value "vers2" (bz 1966643) + * Thu Jan 13 2022 Steve Dickson 2.5.4-8 - Added the tests directory for the gatings tests (bz 1996211)