From ab75e67f4c99080ed246ee9ba551a643dbfd2ab8 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 20 May 2019 11:17:59 -0400
Subject: [PATCH] Updated to the latest upstream release: 2.3.4 (bz 1708690)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 .gitignore                                |  4 ++--
 nfs-utils-2.3.3-nfsconf-usegssproxy.patch | 12 ++++++------
 nfs-utils.spec                            | 12 ++++++------
 sources                                   |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc88a84..f91b4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 x86_64
 Makefile
-/nfs-utils-2.3.3.tar.xz
-nfs-utils-2.3.3/
+/nfs-utils-2.3.4.tar.xz
+nfs-utils-2.3.4/
diff --git a/nfs-utils-2.3.3-nfsconf-usegssproxy.patch b/nfs-utils-2.3.3-nfsconf-usegssproxy.patch
index 37955a5..d87ae7d 100644
--- a/nfs-utils-2.3.3-nfsconf-usegssproxy.patch
+++ b/nfs-utils-2.3.3-nfsconf-usegssproxy.patch
@@ -1,8 +1,8 @@
-diff -up nfs-utils-2.3.3/nfs.conf.orig nfs-utils-2.3.3/nfs.conf
---- nfs-utils-2.3.3/nfs.conf.orig	2018-10-31 12:09:28.905622992 -0400
-+++ nfs-utils-2.3.3/nfs.conf	2018-10-31 12:13:28.843301421 -0400
-@@ -11,7 +11,7 @@
- [gssd]
+diff -up nfs-utils-2.3.4/nfs.conf.orig nfs-utils-2.3.4/nfs.conf
+--- nfs-utils-2.3.4/nfs.conf.orig	2019-05-10 14:49:49.000000000 -0400
++++ nfs-utils-2.3.4/nfs.conf	2019-05-10 14:58:20.198714920 -0400
+@@ -13,7 +13,7 @@
+ # rpc-verbosity=0
  # use-memcache=0
  # use-machine-creds=1
 -# use-gss-proxy=0
@@ -10,7 +10,7 @@ diff -up nfs-utils-2.3.3/nfs.conf.orig nfs-utils-2.3.3/nfs.conf
  # avoid-dns=1
  # limit-to-legacy-enctypes=0
  # context-timeout=0
-@@ -69,6 +69,5 @@
+@@ -77,6 +77,5 @@
  # outgoing-port=
  # outgoing-addr=
  # lift-grace=y
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 210dd9c..c456d5b 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.3.3
-Release: 7.rc2%{?dist}
+Version: 2.3.4
+Release: 0%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -16,10 +16,6 @@ Source4: nfsconvert.py
 Source5: nfsconvert.sh
 Source6: nfs-convert.service
 
-Patch001: nfs-utils.2.3.4-rc2.patch
-Patch002: nfs-utils-2.3.3-nfsref-linking.patch
-Patch003: nfs-utils-2.3.3-printf-4k.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
@@ -307,6 +303,7 @@ fi
 /sbin/mount.nfs4
 /sbin/umount.nfs
 /sbin/umount.nfs4
+/sbin/nfsdcld
 
 %files -n libnfsidmap
 %doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
@@ -361,6 +358,9 @@ fi
 %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
 
 %changelog
+* Fri May 10 2019 Steve Dickson <steved@redhat.com> 2.3.4-0 
+- Updated to the latest upstream release: 2.3.4 (bz 1708690)
+
 * Wed Feb 20 2019 Steve Dickson <steved@redhat.com> 2.3.3-7.rc2
 - Added nfs-utils-coreos package (bz 1667889)
 
diff --git a/sources b/sources
index 73bb3aa..f8b3b13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-utils-2.3.3.tar.xz) = 5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716
+SHA512 (nfs-utils-2.3.4.tar.xz) = dbb211de2b7d27731b1066666d39ea11b986d80cc2d27b6bcafb77b5e4861ed32693704c7e7b2469202d993eba36c8e10f3b6ce308d9ca87eeceba5bff469e69