From 9c243df7dbeade7e1d947529c76add1181459ad6 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Tue, 29 May 2018 08:24:14 -0400
Subject: [PATCH] Updated to latest upstream release: 2.3.2 (bz 1582341)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 .gitignore                      |  1 +
 nfs-utils-2.3.1-no-rpcgen.patch | 28 ++++++++++++----------------
 nfs-utils.spec                  | 14 +++++++-------
 sources                         |  3 +--
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index de66c99..9aa1d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ Makefile
 nfs-utils-2.2.1/
 /nfs-utils-2.3.1.tar.xz
 nfs-utils-2.3.1/
+/nfs-utils-2.3.2.tar.xz
diff --git a/nfs-utils-2.3.1-no-rpcgen.patch b/nfs-utils-2.3.1-no-rpcgen.patch
index ead0586..1a3e69f 100644
--- a/nfs-utils-2.3.1-no-rpcgen.patch
+++ b/nfs-utils-2.3.1-no-rpcgen.patch
@@ -1,16 +1,12 @@
-diff -up nfs-utils-2.3.1/tools/Makefile.am.orig nfs-utils-2.3.1/tools/Makefile.am
---- nfs-utils-2.3.1/tools/Makefile.am.orig	2017-12-20 10:40:36.000000000 -0500
-+++ nfs-utils-2.3.1/tools/Makefile.am	2018-05-16 08:08:13.829718208 -0400
-@@ -1,11 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--OPTDIRS =
--
--if CONFIG_RPCGEN
--OPTDIRS += rpcgen
--endif
--
--SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS)
-+SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat
- 
- MAINTAINERCLEANFILES = Makefile.in
+diff -up nfs-utils-2.3.1/configure.ac.orig nfs-utils-2.3.1/configure.ac
+--- nfs-utils-2.3.1/configure.ac.orig	2018-05-22 13:56:01.906548548 -0400
++++ nfs-utils-2.3.1/configure.ac	2018-05-22 13:57:01.197437109 -0400
+@@ -157,7 +157,7 @@ AC_ARG_WITH(rpcgen,
+ 	    RPCGEN_PATH=$rpcgen_path
+ 	fi
+ 	AC_SUBST(RPCGEN_PATH)
+-	AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""])
++	AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = "NoBuild"])
+ AC_ARG_ENABLE(uuid,
+ 	[AC_HELP_STRING([--disable-uuid], 
+ 		[Exclude uuid support to avoid buggy libblkid. @<:@default=no@:>@])],
diff --git a/nfs-utils.spec b/nfs-utils.spec
index a081a3f..3274cb5 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.1
-Release: 9.rc1%{?dist}
+Version: 2.3.2
+Release: 0%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -15,10 +15,6 @@ Source3: nfs-utils_env.sh
 Source4: lockd.conf
 Source5: 24-nfs-server.conf
 
-Patch001: nfs-utils-2.3.2-rc1.patch
-Patch002: nfs-utils-2.3.1-mount-auto-v3.patch
-Patch003: nfs-utils-2.3.1-mount-setdefault-minor.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
@@ -53,7 +49,7 @@ BuildRequires: krb5-devel, libmount-devel
 BuildRequires: sqlite-devel
 BuildRequires: python3-devel
 BuildRequires: systemd
-#BuildRequires: rpcgen
+BuildRequires: rpcgen
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): util-linux
 Requires(pre): coreutils
@@ -287,6 +283,7 @@ fi
 %{_sbindir}/nfsiostat
 %{_sbindir}/nfsidmap
 %{_sbindir}/blkmapd
+%{_sbindir}/nfsconf
 %{_mandir}/*/*
 %{_pkgdir}/*/*
 %attr(755,root,root) %{_libexecdir}/nfs-utils/nfs-utils_env.sh
@@ -311,6 +308,9 @@ fi
 %{_libdir}/libnfsidmap.so
 
 %changelog
+* Thu May 24 2018 Steve Dickson <steved@redhat.com> 2.3.2-0
+- Updated to latest upstream release: 2.3.2 (bz 1582341)
+
 * Tue May 15 2018 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> 2.3.1-9.rc1
 - Only try to create nfsnobody if the uid/gid are not found (bz 1488897)
 - Turn off the building of rpcgen
diff --git a/sources b/sources
index 270012c..1449050 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (nfs-utils-2.2.1.tar.xz) = 50898a5d71ad9369d177dd1f004d3ddc150b201b1af65f6c91dbe2505fad3ebecc7033eb14dc2f3b71704bdece645f6f2d62107c8b421c5fa98831898e36c30f
-SHA512 (nfs-utils-2.3.1.tar.xz) = 812f48690b109a0456685a9a04997da9281f58d70d2aa34b614f64de6f1fc086db3d3cc4d16c2f5fe98026b39dadd03ba71780ad8ac37f94cd1375a50023369a
+SHA512 (nfs-utils-2.3.2.tar.xz) = e35e98fd110e3dab2c7269664f8a87acdc06458fabd6b32a01640534441b4b5acfdc42ed34783184d94605842a194bf4ca1e38922f812010dc11273f2cc5ab17