From 696732bbde0c0e63a9eb16f717c55a8bd5a51df7 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Wed, 24 Jan 2024 10:51:47 -0500 Subject: [PATCH] Updated to the latest RC release: nfs-utils-2-7-1-rc4 Signed-off-by: Steve Dickson --- ...7.1-rc3.patch => nfs-utils.2.7.1-rc4.patch | 220 +++++++++++++++++- nfs-utils.spec | 7 +- 2 files changed, 218 insertions(+), 9 deletions(-) rename nfs-utils.2.7.1-rc3.patch => nfs-utils.2.7.1-rc4.patch (75%) diff --git a/nfs-utils.2.7.1-rc3.patch b/nfs-utils.2.7.1-rc4.patch similarity index 75% rename from nfs-utils.2.7.1-rc3.patch rename to nfs-utils.2.7.1-rc4.patch index 064452a..433e9d5 100644 --- a/nfs-utils.2.7.1-rc3.patch +++ b/nfs-utils.2.7.1-rc4.patch @@ -37,7 +37,7 @@ index 93a1202..58d1728 100644 AC_DEFINE(HAVE_JUNCTION_SUPPORT, 1, [Define this if you want junction support compiled in]) diff --git a/support/export/export.c b/support/export/export.c -index 3e48c42..100912c 100644 +index 3e48c42..2c8c333 100644 --- a/support/export/export.c +++ b/support/export/export.c @@ -119,7 +119,7 @@ export_read(char *fname, int ignore_hosts) @@ -49,6 +49,28 @@ index 3e48c42..100912c 100644 exp = export_lookup(eep->e_hostname, eep->e_path, ignore_hosts); if (!exp) { if (export_create(eep, 0)) +@@ -140,7 +140,7 @@ export_read(char *fname, int ignore_hosts) + continue; + + if (exp->m_export.e_flags & NFSEXP_FSID) { +- xlog(L_ERROR, "When a reexport= option is present no manully assigned numerical fsid= options are allowed"); ++ xlog(L_ERROR, "When a reexport= option is present no manually assigned numerical fsid= options are allowed"); + return -1; + } + } +diff --git a/support/export/v4root.c b/support/export/v4root.c +index 03805dc..c3b17a5 100644 +--- a/support/export/v4root.c ++++ b/support/export/v4root.c +@@ -137,7 +137,7 @@ v4root_support(void) + if (!warned) { + xlog(L_WARNING, "Kernel does not have pseudo root support."); + xlog(L_WARNING, "NFS v4 mounts will be disabled unless fsid=0"); +- xlog(L_WARNING, "is specfied in /etc/exports file."); ++ xlog(L_WARNING, "is specified in /etc/exports file."); + warned++; + } + return 0; diff --git a/support/export/xtab.c b/support/export/xtab.c index e210ca9..282f15b 100644 --- a/support/export/xtab.c @@ -432,18 +454,20 @@ index 3e62b3f..51750ea 100644 return 1; } diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c -index 7851658..c7bff6a 100644 +index 7851658..1febf59 100644 --- a/support/reexport/reexport.c +++ b/support/reexport/reexport.c -@@ -7,6 +7,7 @@ +@@ -7,7 +7,9 @@ #endif #include #include +#include #include ++#include #include "nfsd_path.h" -@@ -21,6 +22,7 @@ static int fsidd_srv = -1; + #include "conffile.h" +@@ -21,6 +23,7 @@ static int fsidd_srv = -1; static bool connect_fsid_service(void) { struct sockaddr_un addr; @@ -451,7 +475,7 @@ index 7851658..c7bff6a 100644 char *sock_file; int ret; int s; -@@ -33,9 +35,12 @@ static bool connect_fsid_service(void) +@@ -33,9 +36,12 @@ static bool connect_fsid_service(void) memset(&addr, 0, sizeof(struct sockaddr_un)); addr.sun_family = AF_UNIX; strncpy(addr.sun_path, sock_file, sizeof(addr.sun_path) - 1); @@ -465,7 +489,7 @@ index 7851658..c7bff6a 100644 s = socket(AF_UNIX, SOCK_SEQPACKET, 0); if (s == -1) { -@@ -43,7 +48,7 @@ static bool connect_fsid_service(void) +@@ -43,7 +49,7 @@ static bool connect_fsid_service(void) return false; } @@ -474,6 +498,50 @@ index 7851658..c7bff6a 100644 if (ret == -1) { xlog(L_WARNING, "Unable to connect %s: %m, is fsidd running?\n", sock_file); return false; +diff --git a/systemd/nfs-blkmap.service b/systemd/nfs-blkmap.service +index 6aa45ba..5718163 100644 +--- a/systemd/nfs-blkmap.service ++++ b/systemd/nfs-blkmap.service +@@ -1,5 +1,6 @@ + [Unit] + Description=pNFS block layout mapping daemon ++Documentation=man:blkmapd(8) + DefaultDependencies=no + Conflicts=umount.target + After=rpc_pipefs.target +diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service +index 198ca87..d820f10 100644 +--- a/systemd/nfs-idmapd.service ++++ b/systemd/nfs-idmapd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=NFSv4 ID-name mapping service ++Documentation=man:idmapd(8) + DefaultDependencies=no + Requires=rpc_pipefs.target + After=rpc_pipefs.target local-fs.target network-online.target +diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service +index e8ece53..4618fab 100644 +--- a/systemd/nfs-mountd.service ++++ b/systemd/nfs-mountd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=NFS Mount Daemon ++Documentation=man:rpc.mountd(8) + DefaultDependencies=no + Requires=proc-fs-nfsd.mount + Wants=network-online.target +diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service +index 2cdd786..ac17d52 100644 +--- a/systemd/nfs-server.service ++++ b/systemd/nfs-server.service +@@ -1,5 +1,6 @@ + [Unit] + Description=NFS server and services ++Documentation=man:rpc.nfsd(8) man:exportfs(8) + DefaultDependencies=no + Requires=network.target proc-fs-nfsd.mount + Requires=nfs-mountd.service diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man index 866939a..d03fc88 100644 --- a/systemd/nfs.conf.man @@ -547,6 +615,61 @@ index 46b476a..df89ddd 100644 .SH SEE ALSO .BR systemd.unit (5), .BR nfs.conf (5), +diff --git a/systemd/nfsdcld.service b/systemd/nfsdcld.service +index a32d243..3ced565 100644 +--- a/systemd/nfsdcld.service ++++ b/systemd/nfsdcld.service +@@ -1,5 +1,6 @@ + [Unit] + Description=NFSv4 Client Tracking Daemon ++Documentation=man:nfsdcld(8) + DefaultDependencies=no + Conflicts=umount.target + Requires=rpc_pipefs.target proc-fs-nfsd.mount +diff --git a/systemd/rpc-gssd.service.in b/systemd/rpc-gssd.service.in +index 6807db3..38382ed 100644 +--- a/systemd/rpc-gssd.service.in ++++ b/systemd/rpc-gssd.service.in +@@ -1,5 +1,6 @@ + [Unit] + Description=RPC security service for NFS client and server ++Documentation=man:rpc.gssd(8) + DefaultDependencies=no + Conflicts=umount.target + Requires=rpc_pipefs.target +diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service +index aad4c0d..962f18b 100644 +--- a/systemd/rpc-statd-notify.service ++++ b/systemd/rpc-statd-notify.service +@@ -1,5 +1,6 @@ + [Unit] + Description=Notify NFS peers of a restart ++Documentation=man:sm-notify(8) man:rpc.statd(8) + DefaultDependencies=no + Wants=network-online.target + After=local-fs.target network-online.target nss-lookup.target +diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service +index 392750d..660ed86 100644 +--- a/systemd/rpc-statd.service ++++ b/systemd/rpc-statd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=NFS status monitor for NFSv2/3 locking. ++Documentation=man:rpc.statd(8) + DefaultDependencies=no + Conflicts=umount.target + Requires=nss-lookup.target rpcbind.socket +diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service +index cb2bcd4..401fba1 100644 +--- a/systemd/rpc-svcgssd.service ++++ b/systemd/rpc-svcgssd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=RPC security service for NFS server ++Documentation=man:rpc.svcgssd(8) + DefaultDependencies=no + After=local-fs.target + PartOf=nfs-server.service diff --git a/tools/locktest/testlk.c b/tools/locktest/testlk.c index ea51f78..c9bd6ba 100644 --- a/tools/locktest/testlk.c @@ -588,6 +711,19 @@ index b2ef96d..bd9d527 100644 /* --dump mode, output the current configuration */ if (mode == MODE_DUMP) { +diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man +index b758277..58537a2 100644 +--- a/utils/exportfs/exports.man ++++ b/utils/exportfs/exports.man +@@ -298,7 +298,7 @@ set. + + The + .I nocrossmnt +-option can explictly disable ++option can explicitly disable + .I crossmnt + if it was previously set. This is rarely useful. + .TP diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index a96647d..7629de0 100644 --- a/utils/gssd/gssd_proc.c @@ -659,10 +795,54 @@ index a96647d..7629de0 100644 /* Success !!! */ rpc_clnt->cl_auth = auth; *clnt_return = rpc_clnt; +diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c +index aa4ac5c..fd6cb2c 100644 +--- a/utils/mount/mount_libmount.c ++++ b/utils/mount/mount_libmount.c +@@ -442,7 +442,7 @@ int main(int argc, char *argv[]) + mnt_init_debug(0); + cxt = mnt_new_context(); + if (!cxt) { +- nfs_error(_("Can't initilize libmount: %s"), ++ nfs_error(_("Can't initialize libmount: %s"), + strerror(errno)); + rc = EX_FAIL; + goto done; +diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man +index c0ba4d0..7103d28 100644 +--- a/utils/mount/nfs.man ++++ b/utils/mount/nfs.man +@@ -964,7 +964,7 @@ Some server features misbehave in the face of a migration-compatible + identification string. + The + .B nomigration +-option retains the use of a traditional client indentification string ++option retains the use of a traditional client identification string + which is compatible with legacy NFS servers. + This is also the behavior if neither option is specified. + A client's open and lock state cannot be migrated transparently +@@ -1832,7 +1832,7 @@ auxiliary services such as the NLM service can choose + any unused port number at random. + .P + Common firewall configurations block the well-known rpcbind port. +-In the absense of an rpcbind service, ++In the absence of an rpcbind service, + the server administrator fixes the port number + of NFS-related services so that the firewall + can allow access to specific NFS service ports. diff --git a/utils/mount/nfsmount.conf.man b/utils/mount/nfsmount.conf.man -index 34879c8..10287cd 100644 +index 34879c8..6419190 100644 --- a/utils/mount/nfsmount.conf.man +++ b/utils/mount/nfsmount.conf.man +@@ -43,7 +43,7 @@ and will be shifted to lower case before being passed to the filesystem. + .PP + Boolean mount options which do not need an equals sign must be given as + .RI \[dq] option =True". +-Instead of preceeding such an option with ++Instead of preceding such an option with + .RB \[dq] no \[dq] + its negation must be given as + .RI \[dq] option =False". @@ -115,16 +115,17 @@ All mounts to the '/export/home' export will be performed in the background (i.e. done asynchronously). .RE @@ -690,6 +870,32 @@ index 34879c8..10287cd 100644 .PD .SH SEE ALSO .BR nfs (5), +diff --git a/utils/nfsdcld/nfsdcld.man b/utils/nfsdcld/nfsdcld.man +index 861f1c4..ee6e9dc 100644 +--- a/utils/nfsdcld/nfsdcld.man ++++ b/utils/nfsdcld/nfsdcld.man +@@ -198,7 +198,7 @@ initialize client tracking in the following order: First, the \fBnfsdcld\fR upc + the \fBnfsdcltrack\fR usermodehelper upcall. Finally, the legacy client tracking. + .PP + This daemon should be run as root, as the pipe that it uses to communicate +-with the kernel is only accessable by root. The daemon however does drop all ++with the kernel is only accessible by root. The daemon however does drop all + superuser capabilities after starting. Because of this, the \fIstoragedir\fR + should be owned by root, and be readable and writable by owner. + .PP +diff --git a/utils/nfsdcltrack/nfsdcltrack.man b/utils/nfsdcltrack/nfsdcltrack.man +index cc24b7a..3905ba4 100644 +--- a/utils/nfsdcltrack/nfsdcltrack.man ++++ b/utils/nfsdcltrack/nfsdcltrack.man +@@ -80,7 +80,7 @@ section. For example: + .br + storagedir = /shared/nfs/nfsdcltrack + .in -5 +-Debuging to syslog can also be enabled by setting "debug = 1" in this file. ++Debugging to syslog can also be enabled by setting "debug = 1" in this file. + .SH "LEGACY TRANSITION MECHANISM" + .IX Header "LEGACY TRANSITION MECHANISM" + The Linux kernel NFSv4 server has historically tracked this information diff --git a/utils/nfsref/nfsref.c b/utils/nfsref/nfsref.c index 7f97d01..aa8414b 100644 --- a/utils/nfsref/nfsref.c diff --git a/nfs-utils.spec b/nfs-utils.spec index e6988d1..9756971 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.6.4 -Release: 0.rc3%{?dist}.1 +Release: 0.rc4%{?dist} Epoch: 1 # group all 32bit related archs @@ -14,7 +14,7 @@ Source2: lockd.conf Source3: 24-nfs-server.conf Source4: 10-nfsv4.conf -Patch001: nfs-utils.2.7.1-rc3.patch +Patch001: nfs-utils.2.7.1-rc4.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch102: nfs-utils-1.2.5-idmap-errmsg.patch @@ -432,6 +432,9 @@ rm -rf /etc/systemd/system/rpc-*.requires %{_mandir}/*/nfsiostat.8.gz %changelog +* Wed Jan 24 2024 Steve Dickson 2.6.4-0.rc4 +- Updated to the latest RC release: nfs-utils-2-7-1-rc4 + * Sun Jan 21 2024 Fedora Release Engineering - 1:2.6.4-0.rc3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild