X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnfs;h=d7d2166f1d03115359385fe688b428696fe66412;hb=5a13fbd3632206e633e97b6a6f2b28f2826ddbda;hp=e76ae46988a53740528a5ebf8008781a5d344706;hpb=3d1f6a355692cb40f4c4a5fa4930fc449c07205e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/nfs b/lfs/nfs
index e76ae46988..d7d2166f1d 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,25 +24,32 @@
 
 include Config
 
-VER        = 1.1.1
+VER        = 1.2.2
 
 THISAPP    = nfs-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 1
+PAK_VER    = 4
+
+DEPS       = "portmap"
+
+LIBNFSIDMAP = 0.23
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+	libnfsidmap-$(LIBNFSIDMAP).tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
 
-$(DL_FILE)_MD5 = 407785488241f9db67b1874e3f36370e
+$(DL_FILE)_MD5 = dad92f64db3266c7757f71bb53ee8f35
+libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 28f3ece648c1dc5d25e8d623d55f8bd6
 
 install : $(TARGET)
 
@@ -74,10 +81,21 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc  \
-                                    --disable-nfsv4 --disable-gss
-	cd $(DIR_APP) && make
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
+	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 \
+		--without-tcp-wrappers
+
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)