X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnfs;h=40c17b788644299281ec2d1f2f9fd688ead208b2;hp=ba2e0e5983ce543f0bcddd339b4815c0eba936f6;hb=41b7369f8078d5dc4998483fa005b2f8e3b89624;hpb=f0ca8c34a1148ab1b8c5f31567369e2ba558d6d5

diff --git a/lfs/nfs b/lfs/nfs
index ba2e0e5983..40c17b7886 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,25 +24,32 @@
 
 include Config
 
-VER        = 1.0.8
+VER        = 2.3.3
 
 THISAPP    = nfs-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = ipfire-beta1
+PAK_VER    = 13
+
+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 = 74fc2dd04b40c9d619ca41d3787ef8db
+$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99
+libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
 
 install : $(TARGET)
 
@@ -76,10 +81,36 @@ $(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 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 install
+
+	# Install initscript
+	$(call INSTALL_INITSCRIPT,nfs-server)
+
+	# Install configuration
+	mkdir -pv $(CONFIG_ROOT)/nfs
+	install -v -m 644 $(DIR_SRC)/config/cfgroot/nfs-server $(CONFIG_ROOT)/nfs/nfs-server
+
+	# Install backup include
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/nfs \
+		 /var/ipfire/backup/addons/includes/nfs
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)