From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap
Date: Sun, 16 Aug 2020 10:29:42 +0000
Message-ID: <20200816102953.3881-51-michael.tremer@ipfire.org>
In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4269809676556495019=="
List-Id: <development.lists.ipfire.org>

--===============4269809676556495019==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/packages/nfs | 27 +++++++++++----------------
 lfs/nfs                       | 26 ++++++--------------------
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 16059abdc..dba272c8a 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -2,32 +2,25 @@ 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/include/nfsidmap_plugin.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.so.1
 usr/lib/libnfsidmap.so.1.0.0
 #usr/lib/libnfsidmap/nsswitch.a
-#usr/lib/libnfsidmap/nsswitch.la
-usr/lib/libnfsidmap/nsswitch.so
+#usr/lib/libnfsidmap/regex.a
+#usr/lib/libnfsidmap/regex.la
+usr/lib/libnfsidmap/regex.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/sbin/blkmapd
 usr/sbin/exportfs
 usr/sbin/mountstats
 usr/sbin/nfsconf
+usr/sbin/nfsdcld
+usr/sbin/nfsdclddb
+usr/sbin/nfsdclnts
 usr/sbin/nfsidmap
 usr/sbin/nfsiostat
 usr/sbin/nfsstat
@@ -39,14 +32,13 @@ 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/blkmapd.8
 #usr/share/man/man8/exportfs.8
 #usr/share/man/man8/idmapd.8
 #usr/share/man/man8/mount.nfs.8
@@ -54,6 +46,9 @@ usr/sbin/start-statd
 #usr/share/man/man8/mountstats.8
 #usr/share/man/man8/nfsconf.8
 #usr/share/man/man8/nfsd.8
+#usr/share/man/man8/nfsdcld.8
+#usr/share/man/man8/nfsdclddb.8
+#usr/share/man/man8/nfsdclnts.8
 #usr/share/man/man8/nfsdcltrack.8
 #usr/share/man/man8/nfsidmap.8
 #usr/share/man/man8/nfsiostat.8
diff --git a/lfs/nfs b/lfs/nfs
index 882792684..3e2f56b7e 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.3.3
+VER        =3D 2.5.1
=20
 THISAPP    =3D nfs-utils-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -32,24 +32,19 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D nfs
-PAK_VER    =3D 13
+PAK_VER    =3D 14
=20
-DEPS       =3D rpcbind
-
-LIBNFSIDMAP =3D 0.25
+DEPS       =3D libnfsidmap rpcbind
=20
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
=20
-objects =3D $(DL_FILE) \
-	libnfsidmap-$(LIBNFSIDMAP).tar.gz
+objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
-libnfsidmap-$(LIBNFSIDMAP).tar.gz =3D $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).=
tar.gz
=20
-$(DL_FILE)_MD5 =3D 11490e3f85a8676c647fe1bddbf32f99
-libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 =3D 2ac4893c92716add1a1447ae01df77ab
+$(DL_FILE)_MD5 =3D d14294d5efcd9aada28f4dab871a44a6
=20
 install : $(TARGET)
=20
@@ -82,23 +77,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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)
-	cd $(DIR_APP)/libnfsidmap* && ./configure --prefix=3D/usr
-	cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP)/libnfsidmap* && make install
-
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
 		--sysconfdir=3D/etc  \
 		--disable-gss \
-		--disable-tirpc \
-		--disable-nfsv41 \
 		--without-tcp-wrappers \
 		--disable-ipv6
=20
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
=20
 	# Install initscript
--=20
2.20.1


--===============4269809676556495019==--