Auto sync2gitlab import of nfs-utils-2.3.3-58.el8.src.rpm

This commit is contained in:
CentOS Sources 2022-11-30 02:12:48 +00:00
parent 3858f25064
commit 4f5a19af77
2 changed files with 33 additions and 1 deletions

View File

@ -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 <unistd.h>
#include <stdlib.h>
#include <sys/inotify.h>
+#include <sys/stat.h>
#include <errno.h>
#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);

View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://linux-nfs.org/ URL: http://linux-nfs.org/
Version: 2.3.3 Version: 2.3.3
Release: 57%{?dist} Release: 58%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # 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 Patch054: nfs-utils-2.3.3-rpcctl-posixpath.patch
Patch055: nfs-utils-2.3.3-systemd-rpcstatd.patch Patch055: nfs-utils-2.3.3-systemd-rpcstatd.patch
#
# rhel 8.8
#
Patch056: nfs-utils-2.3.3-mountd-v4clnts.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Patch102: nfs-utils-2.3.3-idmap-errmsg.patch Patch102: nfs-utils-2.3.3-idmap-errmsg.patch
@ -380,6 +385,9 @@ fi
%{_libdir}/libnfsidmap.so %{_libdir}/libnfsidmap.so
%changelog %changelog
* Mon Sep 26 2022 Steve Dickson <steved@redhat.com> 2.3.3-58
- mountd: Check 'nfsd/clients' directory presence (bz 2123073)
* Tue Aug 2 2022 Steve Dickson <steved@redhat.com> 2.3.3-57 * Tue Aug 2 2022 Steve Dickson <steved@redhat.com> 2.3.3-57
- rpc-statd.service: Stop rpcbind and rpc.stat in an exit race (bz 2100395) - rpc-statd.service: Stop rpcbind and rpc.stat in an exit race (bz 2100395)