nfs-utils-server, maj 1.2.4-1

6 files changed, 19 insertions, 128 deletions

diff --git a/extra/nfs-utils-server/.footprint.i686 b/extra/nfs-utils-server/.footprint.i686
index 02aff602a..ce21ef5b5 100644
--- a/extra/nfs-utils-server/.footprint.i686
+++ b/extra/nfs-utils-server/.footprint.i686
@@ -26,10 +26,15 @@ drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/nfsd.7.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/exportfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmapd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mount.nfs.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mountd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mountstats.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nfsd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nfsidmap.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nfsiostat.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nfsstat.8.gz
+lrwxrwxrwx	root/root	usr/share/man/man8/rpc.idmapd.8.gz -> idmapd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.mountd.8.gz -> mountd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.sm-notify.8.gz -> sm-notify.8.gz
diff --git a/extra/nfs-utils-server/.footprint.x86_64 b/extra/nfs-utils-server/.footprint.x86_64
index 02aff602a..ce21ef5b5 100644
--- a/extra/nfs-utils-server/.footprint.x86_64
+++ b/extra/nfs-utils-server/.footprint.x86_64
@@ -26,10 +26,15 @@ drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/nfsd.7.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/exportfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmapd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mount.nfs.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/mountd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mountstats.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nfsd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nfsidmap.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nfsiostat.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nfsstat.8.gz
+lrwxrwxrwx	root/root	usr/share/man/man8/rpc.idmapd.8.gz -> idmapd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.mountd.8.gz -> mountd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/rpc.sm-notify.8.gz -> sm-notify.8.gz
diff --git a/extra/nfs-utils-server/.md5sum.i686 b/extra/nfs-utils-server/.md5sum.i686
index 6cadbbf40..c6517e543 100644
--- a/extra/nfs-utils-server/.md5sum.i686
+++ b/extra/nfs-utils-server/.md5sum.i686
@@ -1,3 +1,2 @@
 da9a8cfaba0905f0de06eada1edceffc  nfs-server
-7871ab61ae98ba382afb55c35b02eeb4  nfs-server.sh
-4ab250f35979794de3d185e3c864e4d0  nfs-utils-1.2.0.tar.gz
+02f52d567e6b3a8b93e70a65ea776a75  nfs-utils-1.2.4.tar.gz
diff --git a/extra/nfs-utils-server/.md5sum.x86_64 b/extra/nfs-utils-server/.md5sum.x86_64
index 6cadbbf40..c6517e543 100644
--- a/extra/nfs-utils-server/.md5sum.x86_64
+++ b/extra/nfs-utils-server/.md5sum.x86_64
@@ -1,3 +1,2 @@
 da9a8cfaba0905f0de06eada1edceffc  nfs-server
-7871ab61ae98ba382afb55c35b02eeb4  nfs-server.sh
-4ab250f35979794de3d185e3c864e4d0  nfs-utils-1.2.0.tar.gz
+02f52d567e6b3a8b93e70a65ea776a75  nfs-utils-1.2.4.tar.gz
diff --git a/extra/nfs-utils-server/Pkgfile b/extra/nfs-utils-server/Pkgfile
index f70153372..1485a7423 100755
--- a/extra/nfs-utils-server/Pkgfile
+++ b/extra/nfs-utils-server/Pkgfile
@@ -6,10 +6,10 @@
 # Run on: nfs-utils
 
 name=nfs-utils-server
-version=1.2.0
-release=2
+version=1.2.4
+release=1
 source=(http://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-$version.tar.gz\
-        nfs-server nfs-server.sh)
+        nfs-server )
 build() {
 source  /etc/blfs-bootscripts
 wget \
@@ -18,26 +18,22 @@ tar xvf $scripts-$scriptsversion.tar.bz2
 	# build package
 cd nfs-utils-$version
 
-sed -i "1i\#include <sys/stat.h>\n" utils/exportfs/exportfs.c
-sed -i "1i\#include <sys/stat.h>\n" utils/mount/mount.c
-sed -i "1i\#include <sys/stat.h>\n" utils/mount/network.c
-
-sed -i 's/getkversion//' tools/Makefile.in
 
 ./configure --prefix=/usr\
 	--sysconfdir=/etc\
 	--mandir=/usr/share/man\
 	--infodir=/usr/share/info\
 	--enable-nfsv3 \
-        --disable-nfsv4 \
-        --disable-gss
+        --enable-nfsv4 \
+        --disable-gss \
+	--with-statedir=/var/lib/nfs
 
 unset LDFLAGS
 make
 make DESTDIR=$PKG install
 cd ../$scripts-$scriptsversion
 make DESTDIR=$PKG install-nfs-server
-install -m 754 ../nfs-server.sh $PKG/etc/rc.d/init.d/nfs-server
+
 mkdir -p $PKG/etc/sysconfig
 install -m 644 ../nfs-server $PKG/etc/sysconfig/
 rm -r $PKG/{sbin,usr/{sbin,share/man/man5}}
diff --git a/extra/nfs-utils-server/nfs-server.sh b/extra/nfs-utils-server/nfs-server.sh
deleted file mode 100644
index dc48b387b..000000000
--- a/extra/nfs-utils-server/nfs-server.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/nfs-server
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2006-09-10 19:41:47 -0500 (Sun, 10 Sep 2006) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-. /etc/sysconfig/nfs-server
-newuser=nobody
-newgroup=nogroup
-newid=99
-getent group $newgroup || /usr/bin/groupadd -g $newid $newgroup
-getent passwd $newuser || /usr/bin/useradd -c "Unprivileged Nobody" \
--g $newgroup -u $newid -d /dev/null -s /bin/false $newuser
-case "$1" in
-	start)
-		boot_mesg "Starting NFS mountd..."
-		loadproc /usr/sbin/rpc.mountd
-
-		boot_mesg "Starting NFS nfsd..."
-		loadproc /usr/sbin/rpc.nfsd -p $PORT $PROCESSES
-
-		boot_mesg "Starting NFS statd..."
-		loadproc /usr/sbin/rpc.statd
-
-		if [ "$QUOTAS" = "yes" ]; then
-			boot_mesg "Starting NFS rquotad..."
-			loadproc /usr/sbin/rpc.rquotad
-		fi
-
-		# NFSD support only in 2.6 kernel
-		/bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
-		if [ $? = 0 ]; then
-			boot_mesg "Mounting nfsd virtual filesystem..."
-			/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
-			evaluate_retval
-		fi
-
-		# Make ceratin that the list is refreshed on
-		# a restart.
-		boot_mesg "Exporting NFS Filesystems..."
-		/usr/sbin/exportfs -ra 2>&1 > /dev/null
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Stopping NFS statd..."
-		killproc /usr/sbin/rpc.statd
-
-		boot_mesg "Stopping NFS nfsd..."
-		# nfsd needs HUP....
-		killproc nfsd HUP
-
-		boot_mesg "Stopping NFS mountd..."
-		killproc /usr/sbin/rpc.mountd
-
-		if [ "$QUOTAS" = "yes" ]; then
-			boot_mesg "Stopping NFS rquotad..."
-			killproc /usr/sbin/rpc.rquotad
-		fi
-
-		boot_mesg "Refreshing NFS Exported Filesystems..."
-		/usr/sbin/exportfs -au 2>&1 > /dev/null
-		evaluate_retval
-
-		# NFSD support only in 2.6 kernel
-                /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
-                if [ $? = 0 ]; then
-			boot_mesg "Unmounting NFS Virtual Filesystem..."
-			/bin/umount /proc/fs/nfsd 2>&1 > /dev/null
-			evaluate_retval
-		fi
-
-		# Remove a pid file that isn't done automatically
-		boot_mesg "Removing the rpc.statd pid file if it exists"
-		if [ -f /var/run/rpc.statd.pid ]; then
-		    rm -f /var/run/rpc.statd.pid
-		fi
-		;;
-
-	reload)
-		boot_mesg "Reloading NFS Server..."
-		/usr/sbin/exportfs -ra
-		evaluate_retval
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/rpc.mountd
-		## Special case for nfsd with no full path
-		statusproc nfsd
-		statusproc /usr/sbin/rpc.statd
-		if [ "$QUOTA" = "yes" ]; then
-			statusproc rpc.rquotad
-		fi
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|reload|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/nfs-server