From 39e278aaf66d4db85fb771a6f92035b0578a0b78 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Thu, 21 Nov 2019 11:43:39 -0500 Subject: [PATCH] Updated to the latest upstream release: 2.4.2 (bz 1772987) Signed-off-by: Steve Dickson --- .gitignore | 4 ++-- nfs-utils-1.2.5-idmap-errmsg.patch | 12 ++++++------ nfs-utils.spec | 13 +++++++------ sources | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 574f6a1..2a87313 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ x86_64 Makefile -/nfs-utils-2.4.1.tar.xz -nfs-utils-2.4.1/ +/nfs-utils-2.4.2.tar.xz +nfs-utils-2.4.2/ diff --git a/nfs-utils-1.2.5-idmap-errmsg.patch b/nfs-utils-1.2.5-idmap-errmsg.patch index edaacb7..47143df 100644 --- a/nfs-utils-1.2.5-idmap-errmsg.patch +++ b/nfs-utils-1.2.5-idmap-errmsg.patch @@ -1,12 +1,12 @@ -diff -up nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c ---- nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c 2017-04-26 12:47:56.715133443 -0400 -@@ -432,7 +432,7 @@ int main(int argc, char **argv) +diff -up nfs-utils-2.4.2/utils/nfsidmap/nfsidmap.c.orig nfs-utils-2.4.2/utils/nfsidmap/nfsidmap.c +--- nfs-utils-2.4.2/utils/nfsidmap/nfsidmap.c.orig 2019-11-11 14:15:50.000000000 -0500 ++++ nfs-utils-2.4.2/utils/nfsidmap/nfsidmap.c 2019-11-11 14:29:47.355661037 -0500 +@@ -434,7 +434,7 @@ int main(int argc, char **argv) xlog_stderr(verbose); if ((argc - optind) != 2) { - xlog_warn("Bad arg count. Check /etc/request-key.conf"); -+ xlog_err("Bad arg count. Check /etc/request-key.d/request-key.conf"); - xlog_warn(usage, progname); ++ xlog_warn("Bad arg count. Check /etc/request-key.d/request-key.conf"); + xlog_warn(USAGE, progname); return EXIT_FAILURE; } diff --git a/nfs-utils.spec b/nfs-utils.spec index 7f557eb..e452740 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -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.4.1 -Release: 2.rc1%{?dist} +Version: 2.4.2 +Release: 0%{?dist} Epoch: 1 # group all 32bit related archs @@ -16,8 +16,6 @@ Source4: nfsconvert.py Source5: nfsconvert.sh Source6: nfs-convert.service -Patch001: nfs-utils.2.4.2-rc1.patch - Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-1.2.5-idmap-errmsg.patch @@ -298,6 +296,7 @@ fi %{_sbindir}/nfsconf %{_sbindir}/nfsref %{_sbindir}/nfsconvert +%{_sbindir}/clddb-tool %{_mandir}/*/* %{_pkgdir}/*/* @@ -356,7 +355,6 @@ fi %{_mandir}/*/showmount.8.gz %{_mandir}/*/statd.8.gz %{_mandir}/*/umount.nfs.8.gz -%{_mandir}/*/nfs.systemd.7.gz %{_pkgdir}/*/rpc-pipefs-generator %{_pkgdir}/*/auth-rpcgss-module.service %{_pkgdir}/*/nfs-client.target @@ -366,7 +364,10 @@ fi %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount %changelog -* Tue Nov 05 2019 Christian Glombek 2.4.1-2.rc1 +* Wed Nov 13 2019 Steve Dickson 2.4.2-0 +- Updated to the latest upstream release: 2.4.2 (bz 1772987) + +* Tue Nov 05 2019 Christian Glombek 2.4.1-1.rc1 - Added missing Requires and statd dirs to nfs-utils-coreos package (bz 1768897) * Thu Aug 29 2019 Steve Dickson 2.4.1-1.rc1 diff --git a/sources b/sources index bc8b602..fa0d847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-utils-2.4.1.tar.xz) = 9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e +SHA512 (nfs-utils-2.4.2.tar.xz) = c23b40202787b2bbf00640c55f92189d4d56bae3863b6d4729ed2a7469d56197fbe2f8d5eafb9dec5946cc5d5e0afb0485e94495e0a531b25a1bd0382067a1b0