From 54256808a732f32bb77841137e7d9fa21e30205c Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sat, 4 Aug 2018 06:39:33 -0500
Subject: [PATCH] The following changes were made:

  * Moved /etc/default/nfs-server to CONFIG
  * Added rpcbind as dependency
---
 CONFIG/etc/default/nfs-server        |  2 ++
 Makefile                             |  8 +++-----
 SRC/patches/01_fix-nfsidmap-dl.patch | 12 ++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 CONFIG/etc/default/nfs-server
 create mode 100644 SRC/patches/01_fix-nfsidmap-dl.patch

diff --git a/CONFIG/etc/default/nfs-server b/CONFIG/etc/default/nfs-server
new file mode 100644
index 0000000..6d6de75
--- /dev/null
+++ b/CONFIG/etc/default/nfs-server
@@ -0,0 +1,2 @@
+RPCNFSDARGS="-N4"
+RPCMOUNTDARGS="--manage-gids"
diff --git a/Makefile b/Makefile
index c0f27b6..f0d6f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@
 # !!! May want to create separate nfs-client/nfs-server packages !!! #
 
 ARCH = x86_64
-DEPENDS = bash,dash,e2fsprogs,glibc,krb5,libcap,libevent,libnfsidmap,libtirpc,lvm2,openssl,tcp-wrappers,util-linux
+DEPENDS = bash,dash,e2fsprogs,glibc,krb5,libcap,libevent,libnfsidmap,libtirpc,lvm2,openssl,rpcbind,tcp-wrappers,util-linux
 URL = https://sourceforge.net/projects/nfs/
 REPO = server
 BRIEF = Utilities for managing NFS
 DESC = Utilities for managing NFS
-SNAPVER = 2
+SNAPVER = 3
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -68,10 +68,7 @@ $(ROOT): $(SRCDIR)/binfile
 	fi
 
 	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
-	install -d -m 0755 $(ROOT)/etc/default && \
 	install -d -m 0755 $(ROOT)/etc/init.d && \
-	install -m 0644 $(SNAPDIR)/nfs-server.default \
-		$(ROOT)/etc/default/nfs-server && \
 	install -m 0755 $(SNAPDIR)/nfs-server.init \
 		$(ROOT)/etc/init.d/nfs-server && \
 	install -m 0755 $(SNAPDIR)/statd.init \
@@ -87,5 +84,6 @@ clean:
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
+		$(CONFIG) \
 		$(SRCDIR)
 
diff --git a/SRC/patches/01_fix-nfsidmap-dl.patch b/SRC/patches/01_fix-nfsidmap-dl.patch
new file mode 100644
index 0000000..9a45829
--- /dev/null
+++ b/SRC/patches/01_fix-nfsidmap-dl.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure	2017-01-13 13:19:49.000000000 -0600
++++ b/configure	2018-05-27 19:18:49.912768788 -0500
+@@ -19037,7 +19037,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnfsidmap  $LIBS"
++LIBS="-lnfsidmap -ldl $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+