X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnfs;h=e2e6ff9b1f59eeeb10bf4d2d6fbb83032bee5aad;hp=417f155fd287167b65237badcd0a3fd13629acbc;hb=3aadbbca38882cf6e8af2370c26234de0940a099;hpb=d4ee6f08135135d7abac777a63fdadccda156052

diff --git a/lfs/nfs b/lfs/nfs
index 417f155fd2..e2e6ff9b1f 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.7
+VER        = 1.3.3
 
 THISAPP    = nfs-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 6
+PAK_VER    = 10
 
-DEPS       = "portmap"
+DEPS       = "rpcbind"
 
 LIBNFSIDMAP = 0.25
 
@@ -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 = 3b5ca797197765dc0c3a4122720c7716
+$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
 libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
 
 install : $(TARGET)
@@ -82,21 +82,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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
+		--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)