From 0ef32ed0c9edc6a3fe79d816b41ebec947631dff Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 21 2023 08:47:02 +0000 Subject: import nfs-utils-2.3.3-57.el8_7.1 --- diff --git a/SOURCES/nfs-utils-2.3.3-mountd-v4clnts.patch b/SOURCES/nfs-utils-2.3.3-mountd-v4clnts.patch new file mode 100644 index 0000000..95aec88 --- /dev/null +++ b/SOURCES/nfs-utils-2.3.3-mountd-v4clnts.patch @@ -0,0 +1,24 @@ +diff -up nfs-utils-2.3.3/support/export/v4clients.c.orig nfs-utils-2.3.3/support/export/v4clients.c +--- nfs-utils-2.3.3/support/export/v4clients.c.orig 2022-09-26 11:36:22.803929066 -0400 ++++ nfs-utils-2.3.3/support/export/v4clients.c 2022-09-26 11:38:38.221187835 -0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include "export.h" + +@@ -23,6 +24,12 @@ static int clients_fd = -1; + + void v4clients_init(void) + { ++ struct stat sb; ++ ++ if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || ++ !S_ISDIR(sb.st_mode)) ++ return; ++ + if (clients_fd >= 0) + return; + clients_fd = inotify_init1(IN_NONBLOCK); diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec index 66786ba..151b250 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/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.3.3 -Release: 57%{?dist} +Release: 57%{?dist}.1 Epoch: 1 # group all 32bit related archs @@ -103,6 +103,11 @@ Patch053: nfs-utils-2.3.3-rpcctl-subparser.patch Patch054: nfs-utils-2.3.3-rpcctl-posixpath.patch Patch055: nfs-utils-2.3.3-systemd-rpcstatd.patch +# +# RHEL 8.7.z +# +Patch056: nfs-utils-2.3.3-mountd-v4clnts.patch + Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-2.3.3-idmap-errmsg.patch @@ -380,6 +385,9 @@ fi %{_libdir}/libnfsidmap.so %changelog +* Wed Dec 7 2022 Steve Dickson 2.3.3-57_7.1 +- mountd: Check 'nfsd/clients' directory presence (bz 2150899) + * Tue Aug 2 2022 Steve Dickson 2.3.3-57 - rpc-statd.service: Stop rpcbind and rpc.stat in an exit race (bz 2100395)