Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

[ipfire-2.x.git] / lfs / nfs

diff --git a/lfs/nfs b/lfs/nfs
index e56df07c331b789265d698714a21398ce546965c..40c17b788644299281ec2d1f2f9fd688ead208b2 100644 (file)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -24,27 +24,32 @@
 
 include Config
 
-VER        = 1.1.1
+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    = 2
+PAK_VER    = 13
 
-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 = 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)