[51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap
Commit Message
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
config/rootfiles/packages/nfs | 27 +++++++++++----------------
lfs/nfs | 26 ++++++--------------------
2 files changed, 17 insertions(+), 36 deletions(-)
@@ -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
@@ -24,7 +24,7 @@
include Config
-VER = 2.3.3
+VER = 2.5.1
THISAPP = nfs-utils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,24 +32,19 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs
-PAK_VER = 13
+PAK_VER = 14
-DEPS = rpcbind
-
-LIBNFSIDMAP = 0.25
+DEPS = libnfsidmap rpcbind
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- libnfsidmap-$(LIBNFSIDMAP).tar.gz
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99
-libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
+$(DL_FILE)_MD5 = d14294d5efcd9aada28f4dab871a44a6
install : $(TARGET)
@@ -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=/usr
- cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP)/libnfsidmap* && make install
-
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--disable-gss \
- --disable-tirpc \
- --disable-nfsv41 \
--without-tcp-wrappers \
--disable-ipv6
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Install initscript