update package to v2.6.2
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
This commit is contained in:
zhanchengbin
parent
20000f10da
commit
ccb2ec5bf0
@ -1,45 +0,0 @@
|
||||
From 9abd3b4b57155dfdfd6895e6086ef550ee56fc49 Mon Sep 17 00:00:00 2001
|
||||
From: Wenchao Hao <haowenchao@huawei.com>
|
||||
Date: Tue, 22 Feb 2022 16:06:51 -0500
|
||||
Subject: [PATCH] idmapd: Fix error status when nfs-idmapd exits
|
||||
|
||||
nfs-idmapd.service would report following error when stopped:
|
||||
|
||||
Starting NFSv4 ID-name mapping service...
|
||||
rpc.idmapd[1198]: Setting log level to 0
|
||||
Started NFSv4 ID-name mapping service.
|
||||
rpc.idmapd[1198]: exiting on signal 15
|
||||
Stopping NFSv4 ID-name mapping service...
|
||||
nfs-idmapd.service: Main process exited, code=exited, status=1/FAILURE
|
||||
nfs-idmapd.service: Failed with result 'exit-code'.
|
||||
Stopped NFSv4 ID-name mapping service.
|
||||
|
||||
commit 93e8f092(idmapd: Add graceful exit and resource cleanup)
|
||||
redirected SIGTERM, so when executing "systemctl stop nfs-idmapd", the
|
||||
main() of idmapd would running to tail to return, while it returned 1
|
||||
which considered as error by systemd.
|
||||
|
||||
So here just return 0 in main().
|
||||
|
||||
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
---
|
||||
utils/idmapd/idmapd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
|
||||
index e2c160e..e79c124 100644
|
||||
--- a/utils/idmapd/idmapd.c
|
||||
+++ b/utils/idmapd/idmapd.c
|
||||
@@ -474,7 +474,7 @@ main(int argc, char **argv)
|
||||
event_free(svrdirev);
|
||||
event_base_free(evbase);
|
||||
|
||||
- return 1;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 7f8463fe702174bd613df9d308cc899af25ae02e Mon Sep 17 00:00:00 2001
|
||||
From: Steve Dickson <steved@redhat.com>
|
||||
Date: Thu, 11 Aug 2022 11:15:15 +0800
|
||||
Subject: [PATCH] Fix format-overflow warning
|
||||
|
||||
rpc-pipefs-generator.c:35:23: error: '%s' directive output between 0 and 2147483653 bytes may exceed minimum required size of 4095 [-Werror=format-overflow=]
|
||||
35 | sprintf(path, "%s/%s", dirname, pipefs_unit);
|
||||
| ^
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
---
|
||||
systemd/rpc-pipefs-generator.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/systemd/rpc-pipefs-generator.c b/systemd/rpc-pipefs-generator.c
|
||||
index 8e218aa..801975c 100644
|
||||
--- a/systemd/rpc-pipefs-generator.c
|
||||
+++ b/systemd/rpc-pipefs-generator.c
|
||||
@@ -28,11 +28,11 @@ static int generate_mount_unit(const char *pipefs_path, const char *pipefs_unit,
|
||||
{
|
||||
char *path;
|
||||
FILE *f;
|
||||
-
|
||||
- path = malloc(strlen(dirname) + 1 + strlen(pipefs_unit));
|
||||
+ size_t size = (strlen(dirname) + 1 + strlen(pipefs_unit));
|
||||
+ path = malloc(size);
|
||||
if (!path)
|
||||
return 1;
|
||||
- sprintf(path, "%s/%s", dirname, pipefs_unit);
|
||||
+ snprintf(path, size, "%s/%s", dirname, pipefs_unit);
|
||||
f = fopen(path, "w");
|
||||
if (!f)
|
||||
{
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
nfs-utils-2.6.2.tar.xz
Normal file
BIN
nfs-utils-2.6.2.tar.xz
Normal file
Binary file not shown.
@ -3,8 +3,8 @@
|
||||
%global _statdpath /var/lib/nfs/statd
|
||||
|
||||
Name: nfs-utils
|
||||
Version: 2.5.4
|
||||
Release: 8
|
||||
Version: 2.6.2
|
||||
Release: 1
|
||||
Epoch: 2
|
||||
Summary: The Linux NFS userland utility package
|
||||
License: MIT and GPLv2 and GPLv2+ and BSD
|
||||
@ -15,10 +15,8 @@ Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{v
|
||||
Patch0: 0000-systemd-idmapd-require-rpc-pipefs.patch
|
||||
Patch1: 0001-correct-the-statd-path-in-man.patch
|
||||
Patch2: 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch
|
||||
Patch3: 0003-idmapd-Fix-error-status-when-nfs-idmapd-exits.patch
|
||||
Patch4: 0004-fix-coredump-in-bl_add_disk.patch
|
||||
Patch5: 0005-Fix-format-overflow-warning.patch
|
||||
Patch6: 0006-nfs-blkmaped-Fix-the-error-status-when-nfs_blkmapd-s.patch
|
||||
Patch3: 0003-fix-coredump-in-bl_add_disk.patch
|
||||
Patch4: 0004-nfs-blkmaped-Fix-the-error-status-when-nfs_blkmapd-s.patch
|
||||
BuildRequires: libevent-devel,libcap-devel, libtirpc-devel libblkid-devel
|
||||
BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
|
||||
BuildRequires: automake, libtool, gcc, device-mapper-devel
|
||||
@ -212,6 +210,9 @@ fi
|
||||
%dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm
|
||||
%dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm.bak
|
||||
%ghost %attr(644,rpcuser,rpcuser) %{_statdpath}/state
|
||||
%attr(0600,root,root) %config(noreplace) /usr/lib/modprobe.d/50-nfs.conf
|
||||
%{_libexecdir}/nfsrahead
|
||||
%{_udevrulesdir}/99-nfs.rules
|
||||
%attr(4755,root,root) /sbin/mount.nfs
|
||||
/sbin/{rpc.statd,nfsdcltrack,osd_login,mount.nfs4,umount.*,nfsdcld}
|
||||
%{_sbindir}/*
|
||||
@ -229,6 +230,9 @@ fi
|
||||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 12 2022 zhanchengbin <zhanchengbin1@huawei.com> - 2:2.6.2-1
|
||||
- update package to v2.6.2
|
||||
|
||||
* Tue Sep 6 2022 zhanchengbin <zhanchengbin1@huawei.com> - 2:2.5.4-8
|
||||
- nfs-blkmapd: Fix the error status when nfs-blkmapd stops
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user