nfs-utils: NFSv4 support

nfs-utils/.footprint

@@ -1,11 +1,14 @@
 drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/exports
+-rw-r--r--	root/root	etc/idmapd.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/nfs
 -rwxr-xr-x	root/root	etc/rc.d/nfsserver
 drwxr-xr-x	root/root	sbin/
 -r-s--x--x	root/root	sbin/mount.nfs
+lrwxrwxrwx	root/root	sbin/mount.nfs4 -> mount.nfs
 lrwxrwxrwx	root/root	sbin/umount.nfs -> mount.nfs
+lrwxrwxrwx	root/root	sbin/umount.nfs4 -> mount.nfs
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man5/
@@ -15,10 +18,12 @@ drwxr-xr-x	root/root	usr/man/man7/
 -rw-r--r--	root/root	usr/man/man7/nfsd.7.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/exportfs.8.gz
+-rw-r--r--	root/root	usr/man/man8/idmapd.8.gz
 -rw-r--r--	root/root	usr/man/man8/mount.nfs.8.gz
 -rw-r--r--	root/root	usr/man/man8/mountd.8.gz
 -rw-r--r--	root/root	usr/man/man8/nfsd.8.gz
 -rw-r--r--	root/root	usr/man/man8/nfsstat.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/rpc.idmapd.8.gz -> idmapd.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/rpc.mountd.8.gz -> mountd.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/rpc.sm-notify.8.gz -> sm-notify.8.gz
@@ -31,6 +36,7 @@ lrwxrwxrwx	root/root	usr/man/man8/rpc.statd.8.gz -> statd.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/exportfs
 -rwxr-xr-x	root/root	usr/sbin/nfsstat
+-rwxr-xr-x	root/root	usr/sbin/rpc.idmapd
 -rwxr-xr-x	root/root	usr/sbin/rpc.mountd
 -rwxr-xr-x	root/root	usr/sbin/rpc.nfsd
 -rwxr-xr-x	root/root	usr/sbin/rpc.statd
@@ -43,7 +49,9 @@ drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/nfs/
 -rw-r--r--	root/root	var/lib/nfs/etab (EMPTY)
 -rw-r--r--	root/root	var/lib/nfs/rmtab (EMPTY)
+drwxr-xr-x	root/root	var/lib/nfs/rpc_pipefs/
 drwx------	nobody/root	var/lib/nfs/sm.bak/
 drwx------	nobody/root	var/lib/nfs/sm/
 -rw-------	nobody/root	var/lib/nfs/state (EMPTY)
+drwxr-xr-x	root/root	var/lib/nfs/v4recovery/
 -rw-r--r--	root/root	var/lib/nfs/xtab (EMPTY)

nfs-utils/.md5sum

@@ -1,4 +1,5 @@
 c5ccf58f5f9f57aba75c8b72219eb6e6  exports
-3aaf176fc070285923e89b30df970b4a  nfs
+167ea3a16eb6f33b3642e920147bb265  idmapd.conf
+b5ce905faebc7f12e50f04d8a9574fe3  nfs
 dad92f64db3266c7757f71bb53ee8f35  nfs-utils-1.2.2.tar.bz2
-7bce7bc5cb40a18ae76c6c1328382119  nfsserver
+071bb2c4e2104599f0bba55a8ce35f37  nfsserver

nfs-utils/Pkgfile

@@ -1,31 +1,30 @@
-# Description: NFS utilities
+# Description: NFS utilities 
 # URL:         http://nfs.sourceforge.net/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  util-linux-ng libcap
+# Depends on:  util-linux-ng tcp_wrappers libcap rpcbind libnfsidmap libevent
 
 name=nfs-utils
 version=1.2.2
-release=1
-source=(http://dl.sourceforge.net/nfs/$name-$version.tar.bz2 \
-        exports nfs nfsserver)
+release=2
+source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.tar.bz2 \
+        exports idmapd.conf nfs nfsserver)
 
 build () {
     cd $name-$version
 
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
-                --enable-nfsv3 \
-                --disable-nfsv4 \
-                --disable-gss \
-                --disable-tirpc \
+                --sysconfdir=/etc \
                 --with-statedir=/var/lib/nfs \
-                --sysconfdir=/etc
+                --disable-gss \
+                --with-tcp-wrappers
     make
     make DESTDIR=$PKG install
 
-    rm $PKG/sbin/{mount,umount}.nfs4
-
     install -D -m 755 $SRC/nfs $PKG/etc/rc.d/nfs
     install -D -m 755 $SRC/nfsserver $PKG/etc/rc.d/nfsserver
     install -D -m 644 $SRC/exports $PKG/etc/exports
+    install -D -m 644 $SRC/idmapd.conf $PKG/etc/idmapd.conf
+
+    install -d $PKG/var/lib/nfs/{rpc_pipefs,v4recovery}
 }

nfs-utils/idmapd.conf

@@ -0,0 +1,13 @@
+#
+# /etc/idmapd.conf: configuration file for idmapd, see idmapd.conf(5)
+#
+
+[General]
+Verbosity = 0
+Pipefs-Directory = /var/lib/nfs/rpc_pipefs
+
+[Mapping]
+Nobody-User = nobody
+Nobody-Group = nobody
+
+# End of file

nfs-utils/nfs

@@ -3,15 +3,21 @@
 # /etc/rc.d/nfs: start/stop nfs client
 #
 
+PIPEFS=/var/lib/nfs/rpc_pipefs
+
 case $1 in
 start)
+	/bin/mount -t rpc_pipefs rpc_pipefs $PIPEFS
 	/usr/sbin/sm-notify
+	/usr/sbin/rpc.idmapd
 	/usr/sbin/rpc.statd
 	/bin/mount -a -t nfs
 	;;
 stop)
 	/bin/umount -a -t nfs
 	killall -q /usr/sbin/rpc.statd
+	killall -q /usr/sbin/rpc.idmapd
+	/bin/umount $PIPEFS
 	;;
 restart)
 	$0 stop

nfs-utils/nfsserver

@@ -3,13 +3,18 @@
 # /etc/rc.d/nfsserver: start/stop nfs server
 #
 
+NFSD=/proc/fs/nfsd
+PIPEFS=/var/lib/nfs/rpc_pipefs
+
 case $1 in
 start)
-	/bin/mount -t nfsd nfsd /proc/fs/nfsd 
-	/usr/sbin/exportfs -r
+	/bin/mount -t nfsd nfsd $NFSD
+	/bin/mount -t rpc_pipefs rpc_pipefs $PIPEFS
+	/usr/sbin/rpc.idmapd
+	/usr/sbin/exportfs -a
 	/usr/sbin/rpc.mountd
 	/usr/sbin/rpc.statd --no-notify
-	/usr/sbin/rpc.nfsd 8
+	/usr/sbin/rpc.nfsd --syslog 8
 	/usr/sbin/sm-notify
 	;;
 stop)
@@ -17,7 +22,9 @@ stop)
 	killall -q /usr/sbin/rpc.statd
 	killall -q /usr/sbin/rpc.mountd
 	/usr/sbin/exportfs -au
-	/bin/umount /proc/fs/nfsd
+	killall -q /usr/sbin/rpc.idmapd
+	/bin/umount $PIPEFS
+	/bin/umount $NFSD
 	;;
 restart)
 	$0 stop
@@ -29,4 +36,4 @@ restart)
 	;;
 esac
 
-# End of
+# End of file