Updated to the latest release: nfs-utils-2-8-2 (RHEL-67786)
Also some clean up: - Removed duplicate mount.nfs and nfsidmap man page declarations in the files section for nfsv4-client-utils. - Removed unused nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch file. Resolves: RHEL-65826 Resolves: RHEL-67041 Resolves: RHEL-67168 Resolves: RHEL-67786 Resolves: RHEL-68575 Signed-off-by: Scott Mayhew <smayhew@redhat.com>
This commit is contained in:
parent
72712644aa
commit
e536b89f78
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +1,4 @@
|
||||
x86_64
|
||||
Makefile
|
||||
nfs-utils-2.7.1
|
||||
/nfs-utils-2.7.1.tar.xz
|
||||
nfs-utils-2.8.2
|
||||
/nfs-utils-2.8.2.tar.xz
|
||||
|
@ -4,8 +4,8 @@ diff -up nfs-utils-2.5.2/systemd/nfs-server.service.orig nfs-utils-2.5.2/systemd
|
||||
@@ -23,6 +23,7 @@ Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStartPre=-/usr/sbin/exportfs -r
|
||||
ExecStart=/usr/sbin/rpc.nfsd
|
||||
ExecStart=/bin/sh -c '/usr/sbin/nfsdctl autostart || /usr/sbin/rpc.nfsd'
|
||||
+ExecStart=-/bin/sh -c 'if systemctl -q is-active gssproxy; then systemctl reload gssproxy ; fi'
|
||||
ExecStop=/usr/sbin/rpc.nfsd 0
|
||||
ExecStop=/bin/sh -c '/usr/sbin/nfsdctl threads 0 || /usr/sbin/rpc.nfsd 0'
|
||||
ExecStopPost=/usr/sbin/exportfs -au
|
||||
ExecStopPost=/usr/sbin/exportfs -f
|
||||
|
@ -1,57 +0,0 @@
|
||||
commit 71a09e1dbf6c988e17d18f36117a73127d199d20
|
||||
Author: Steve Dickson <steved@redhat.com>
|
||||
Date: Tue Jul 27 21:12:17 2021 -0400
|
||||
|
||||
nfsdcltrack: Use uint64_t instead of time_t
|
||||
|
||||
With recent commits (4f2a5b64,5a53426c) that fixed
|
||||
compile errors on x86_64 machines, caused similar
|
||||
errors on i686 machines.
|
||||
|
||||
The variable type that was being used was a time_t,
|
||||
which changes size between architects, which
|
||||
caused the compile error.
|
||||
|
||||
Changing the variable to uint64_t fixed the issue.
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
index 0b37c094..7c1c4bcc 100644
|
||||
--- a/utils/nfsdcltrack/nfsdcltrack.c
|
||||
+++ b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
|
||||
{
|
||||
int ret;
|
||||
char *tail;
|
||||
- time_t gracetime;
|
||||
+ uint64_t gracetime;
|
||||
|
||||
|
||||
ret = sqlite_prepare_dbh(storagedir);
|
||||
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
|
||||
index cea4a411..cf0c6a45 100644
|
||||
--- a/utils/nfsdcltrack/sqlite.c
|
||||
+++ b/utils/nfsdcltrack/sqlite.c
|
||||
@@ -540,7 +540,7 @@ out_err:
|
||||
* remove any client records that were not reclaimed since grace_start.
|
||||
*/
|
||||
int
|
||||
-sqlite_remove_unreclaimed(time_t grace_start)
|
||||
+sqlite_remove_unreclaimed(uint64_t grace_start)
|
||||
{
|
||||
int ret;
|
||||
char *err = NULL;
|
||||
diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
|
||||
index 06e7c044..ba8cdfa8 100644
|
||||
--- a/utils/nfsdcltrack/sqlite.h
|
||||
+++ b/utils/nfsdcltrack/sqlite.h
|
||||
@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
|
||||
int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
|
||||
int sqlite_check_client(const unsigned char *clname, const size_t namelen,
|
||||
const bool has_session);
|
||||
-int sqlite_remove_unreclaimed(const time_t grace_start);
|
||||
+int sqlite_remove_unreclaimed(const uint64_t grace_start);
|
||||
int sqlite_query_reclaiming(const time_t grace_start);
|
||||
|
||||
#endif /* _SQLITE_H */
|
@ -1,8 +1,8 @@
|
||||
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
|
||||
Name: nfs-utils
|
||||
URL: http://linux-nfs.org/
|
||||
Version: 2.7.1
|
||||
Release: 6%{?dist}
|
||||
Version: 2.8.2
|
||||
Release: 0%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# group all 32bit related archs
|
||||
@ -48,6 +48,7 @@ BuildRequires: sqlite-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: rpcgen
|
||||
BuildRequires: libnl3-devel, readline-devel
|
||||
Requires(pre): shadow-utils >= 4.0.3-25
|
||||
Requires(pre): util-linux
|
||||
Requires(pre): coreutils
|
||||
@ -295,7 +296,6 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
||||
%doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
|
||||
%doc linux-nfs/THANKS linux-nfs/TODO
|
||||
%{_sbindir}/rpc.statd
|
||||
%{_sbindir}/nfsdcltrack
|
||||
%{_sbindir}/exportfs
|
||||
%{_sbindir}/nfsstat
|
||||
%{_sbindir}/rpcdebug
|
||||
@ -316,6 +316,7 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
||||
%{_sbindir}/nfsdcld
|
||||
%{_sbindir}/nfsdclddb
|
||||
%{_sbindir}/nfsdclnts
|
||||
%{_sbindir}/nfsdctl
|
||||
%{_sbindir}/fsidd
|
||||
%{_libexecdir}/nfsrahead
|
||||
%{_udevrulesdir}/99-nfs.rules
|
||||
@ -410,9 +411,7 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
||||
%{_mandir}/*/nfsconf.8.gz
|
||||
%{_mandir}/*/nfsidmap.8.gz
|
||||
%{_mandir}/*/rpc.gssd.8.gz
|
||||
%{_mandir}/*/mount.nfs.8.gz
|
||||
%{_mandir}/*/umount.nfs.8.gz
|
||||
%{_mandir}/*/nfsidmap.8.gz
|
||||
%{_mandir}/*/nfsstat.8.gz
|
||||
%{_pkgdir}/*/rpc-pipefs-generator
|
||||
%{_pkgdir}/*/auth-rpcgss-module.service
|
||||
@ -428,6 +427,14 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
||||
%{_mandir}/*/nfsiostat.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Dec 10 2024 Scott Mayhew <smayhew@redhat.com> 2.8.2-0
|
||||
- Updated to the latest release: nfs-utils-2-8-2 (RHEL-67786)
|
||||
Resolves: RHEL-65826
|
||||
Resolves: RHEL-67041
|
||||
Resolves: RHEL-67168
|
||||
Resolves: RHEL-67786
|
||||
Resolves: RHEL-68575
|
||||
|
||||
* Thu Nov 14 2024 Scott Mayhew <smayhew@redhat.com> 2.7.1-6
|
||||
- Move remaining binaries from /sbin to /usr/sbin (RHEL-65827)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (nfs-utils-2.7.1.tar.xz) = ce2841e6db209c889677483893ae14080ebb0d9738e2bf18d043a47ccc6493f0b585dce3d049c25a0a6dde5beeb84cf79154969357040685f819281a698d6bda
|
||||
SHA512 (nfs-utils-2.8.2.tar.xz) = fff7122dde2f247afc2c4c066cbcf48447426ed9de9aaf2bbc8c445ac7f0e580e75011a479b3cb474bb7687dcd06f4f590c5e3bb2b40e7f3527d3445a6289bf4
|
||||
|
Loading…
Reference in New Issue
Block a user