From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Oct 2018 18:52:23 +0000 (+0100)
Subject: nfs: Update to 2.3.3
X-Git-Tag: v2.21-core125~42^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c3f74288c765d2a97a31cf6a4855ef66528c83b4

nfs: Update to 2.3.3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 08fcca9fce..0487626506 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -1,28 +1,17 @@
+etc/rc.d/init.d/nfs-server
 sbin/mount.nfs
 sbin/mount.nfs4
 sbin/nfsdcltrack
 sbin/osd_login
 sbin/umount.nfs
 sbin/umount.nfs4
-#usr/include/nfsidmap.h
-#usr/lib/libnfsidmap
-#usr/lib/libnfsidmap.a
-#usr/lib/libnfsidmap.la
-usr/lib/libnfsidmap.so
-usr/lib/libnfsidmap.so.0
-usr/lib/libnfsidmap.so.0.3.0
-#usr/lib/libnfsidmap/nsswitch.a
-#usr/lib/libnfsidmap/nsswitch.la
-usr/lib/libnfsidmap/nsswitch.so
-#usr/lib/libnfsidmap/static.a
-#usr/lib/libnfsidmap/static.la
-usr/lib/libnfsidmap/static.so
-#usr/lib/libnfsidmap/umich_ldap.a
-#usr/lib/libnfsidmap/umich_ldap.la
-usr/lib/libnfsidmap/umich_ldap.so
-#usr/lib/pkgconfig/libnfsidmap.pc
+#usr/include/nfsidmap_plugin.h
+usr/lib/libnfsidmap.so.1
+usr/lib/libnfsidmap.so.1.0.0
 usr/sbin/exportfs
 usr/sbin/mountstats
+usr/sbin/nfsconf
+usr/sbin/nfsidmap
 usr/sbin/nfsiostat
 usr/sbin/nfsstat
 usr/sbin/rpc.idmapd
@@ -33,19 +22,21 @@ usr/sbin/rpcdebug
 usr/sbin/showmount
 usr/sbin/sm-notify
 usr/sbin/start-statd
-#usr/share/man/man3/nfs4_uid_to_name.3
 #usr/share/man/man5/exports.5
-#usr/share/man/man5/idmapd.conf.5
 #usr/share/man/man5/nfs.5
+#usr/share/man/man5/nfs.conf.5
 #usr/share/man/man5/nfsmount.conf.5
+#usr/share/man/man7/nfs.systemd.7
 #usr/share/man/man7/nfsd.7
 #usr/share/man/man8/exportfs.8
 #usr/share/man/man8/idmapd.8
 #usr/share/man/man8/mount.nfs.8
 #usr/share/man/man8/mountd.8
 #usr/share/man/man8/mountstats.8
+#usr/share/man/man8/nfsconf.8
 #usr/share/man/man8/nfsd.8
 #usr/share/man/man8/nfsdcltrack.8
+#usr/share/man/man8/nfsidmap.8
 #usr/share/man/man8/nfsiostat.8
 #usr/share/man/man8/nfsstat.8
 #usr/share/man/man8/rpc.idmapd.8
@@ -64,6 +55,3 @@ var/lib/nfs/rmtab
 var/lib/nfs/sm
 var/lib/nfs/sm.bak
 var/lib/nfs/state
-var/lib/nfs/xtab
-etc/rc.d/init.d/nfs-server
-var/ipfire/nfs/nfs-server
diff --git a/lfs/nfs b/lfs/nfs
index 2b4fe601b0..adfc1a232b 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.3.3
+VER        = 2.3.3
 
 THISAPP    = nfs-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "rpcbind"
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
 
-$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
+$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99
 libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
 
 install : $(TARGET)
@@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
 
 	$(UPDATE_AUTOMAKE)
@@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP)/libnfsidmap* && make install
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nfs-1.3.3-glibc-stdint.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc  \
diff --git a/src/patches/nfs-1.3.3-glibc-stdint.patch b/src/patches/nfs-1.3.3-glibc-stdint.patch
deleted file mode 100644
index 9a65cd1f8a..0000000000
--- a/src/patches/nfs-1.3.3-glibc-stdint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nfs-utils-1.3.3/support/nsm/rpc.c~	2018-02-11 17:01:31.137039166 +0000
-+++ nfs-utils-1.3.3/support/nsm/rpc.c	2018-02-11 17:01:45.683511380 +0000
-@@ -40,6 +40,7 @@
- 
- #include <time.h>
- #include <stdbool.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>