diff --git a/0001-fix-typos-in-error-messages.patch b/0001-fix-typos-in-error-messages.patch new file mode 100644 index 0000000000000000000000000000000000000000..17a625120b06a23beb8b7258348c4e54961f2c8a --- /dev/null +++ b/0001-fix-typos-in-error-messages.patch @@ -0,0 +1,123 @@ +From 368f83426782c144ce6012278cc6cef442baa52d Mon Sep 17 00:00:00 2001 +From: zhangyaqi +Date: Mon, 18 Mar 2024 17:29:56 +0800 +Subject: [PATCH] fix typos in error messages + +--- + support/export/export.c | 2 +- + support/export/v4root.c | 2 +- + utils/exportfs/exports.man | 2 +- + utils/mount/mount_libmount.c | 2 +- + utils/mount/nfs.man | 2 +- + utils/mount/nfsmount.conf.man | 2 +- + utils/nfsdcld/nfsdcld.man | 2 +- + utils/nfsdcltrack/nfsdcltrack.man | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/support/export/export.c b/support/export/export.c +index 3e48c42..dcacd28 100644 +--- a/support/export/export.c ++++ b/support/export/export.c +@@ -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/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/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 7a41042..6684130 100644 +--- a/utils/mount/nfs.man ++++ b/utils/mount/nfs.man +@@ -1806,7 +1806,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..201991d 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". +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 +-- +2.27.0 + diff --git a/nfs-utils.spec b/nfs-utils.spec index 2705e42ad57952e8ed682f38a8c8766e8faa7083..16a9b3a8b432aac29b7e0cb02894aa4a0412246a 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -4,7 +4,7 @@ Name: nfs-utils Version: 2.6.3 -Release: 1 +Release: 2 Epoch: 2 Summary: The Linux NFS userland utility package License: MIT and GPLv2 and GPLv2+ and BSD @@ -18,6 +18,7 @@ Patch2: 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch Patch3: 0003-export-fix-handling-of-error-from-match_fsid.patch Patch4: 0004-export-move-cache_open-before-workers-are-forked.patch Patch5: 0005-gssd-fix-handling-DNS-lookup-failure.patch +Patch6: 0001-fix-typos-in-error-messages.patch BuildRequires: libevent-devel,libcap-devel, libtirpc-devel libblkid-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 @@ -290,6 +291,9 @@ fi %{_mandir}/*/* %changelog +* Mon Mar 18 2024 zhangyaqi - 2:2.6.3-2 +- fix typos in error messages + * Wed Jan 10 2024 wuguanghao - 2:2.6.3-1 - upgrade version to 2.6.3