X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnfs;h=e2e6ff9b1f59eeeb10bf4d2d6fbb83032bee5aad;hb=701c891b40dc7e115f7359b26babab86ba36602c;hp=e56df07c331b789265d698714a21398ce546965c;hpb=071e69ccf63c35b52258b0644b4b005c3398e3ba;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/nfs b/lfs/nfs
index e56df07c33..e2e6ff9b1f 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,27 +24,32 @@
 
 include Config
 
-VER        = 1.1.1
+VER        = 1.3.3
 
 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    = 2
+PAK_VER    = 10
 
-DEPS       = "portmap"
+DEPS       = "rpcbind"
+
+LIBNFSIDMAP = 0.25
 
 ###############################################################################
 # 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 = 9b87d890669eaaec8e97a2b0a35b2665
+libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
 
 install : $(TARGET)
 
@@ -76,10 +81,27 @@ $(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
+
+	$(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) && patch -Np1 < $(DIR_SRC)/src/patches/nfs-1.3.3-glibc-stdint.patch
+	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 install
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,nfs-server)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)