auto-import changelog data from nfs-utils-0.3.1-5.src.rpm

Fri Mar 30 2001 Preston Brown <pbrown@redhat.com>
- don't use rquotad from here now; quota package contains a version that
    works with 2.4 (#33738)
Mon Mar 12 2001 Bob Matthews <bmatthews@redhat.com>
- Statd logs at LOG_DAEMON rather than LOG_LOCAL5
- s/nfs/\$0/ where appropriate in init scripts
Tue Mar 06 2001 Jeff Johnson <jbj@redhat.com>
- Move to nfs-utils-0.3.1
Wed Feb 14 2001 Bob Matthews <bmatthews@redhat.com>
- #include <time.h> patch
Mon Feb 12 2001 Bob Matthews <bmatthews@redhat.com>
- Really enable netgroups
Mon Feb 05 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- i18nize initscripts
Fri Jan 19 2001 Bob Matthews <bmatthews@redhat.com>
- Increased {s,r}blen in rpcmisc.c:makesock to accommodate eepro100
Tue Jan 16 2001 Bob Matthews <bmatthews@redhat.com>
- Hackish fix in build section to enable netgroups
Wed Jan 03 2001 Bob Matthews <bmatthews@redhat.com>
- Fix incorrect file specifications in statd manpage.
- Require gawk 'cause it's used in nfslock init script.
Wed Dec 13 2000 Bob Matthews <bmatthews@redhat.com>
- Require sed because it's used in nfs init script
Tue Dec 12 2000 Bob Matthews <bmatthews@redhat.com>
- Don't do a chroot(2) after dropping privs, in statd.
Mon Dec 11 2000 Bob Matthews <bmatthews@redhat.com>
- NFSv3 if kernel >= 2.2.18, detected in init script
Thu Nov 23 2000 Florian La Roche <Florian.LaRoche@redhat.de>
- update to 0.2.1
Tue Nov 14 2000 Bill Nottingham <notting@redhat.com>
- don't start lockd on 2.4 kernels; it's unnecessary

.cvsignore

@@ -1,2 +1,2 @@
-nfs-utils-0.2.tar.gz
+nfs-utils-0.3.1.tar.gz
 nfs.doc.tar.gz

nfs-utils.spec

@@ -1,13 +1,18 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 0.2
+Version: 0.3.1
-Release: 2
+Release: 5
 Source0: ftp://nfs.sourceforge.net/pub/nfs/nfs-utils-%{version}.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 Source10: nfs.init
 Source11: nfslock.init
-Patch: statd-drop-privs.patch
+Patch0: nfs-utils-0.3.1-drop-privs.patch
 Patch1: nfs-utils-0.2beta-nowrap.patch
+Patch2: no-chroot.patch
+Patch3: nfs-utils-0.3.1-statd-manpage.patch
+Patch4: eepro-support.patch
+Patch5: time-h.patch
+Patch6: syslog-level.patch
 Group: System Environment/Daemons
 Obsoletes: nfs-server
 Obsoletes: knfsd
@@ -21,7 +26,7 @@ Provides: knfsd-clients
 Provides: knfsd
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
-Requires: kernel >= 2.2.14, portmap >= 4.0
+Requires: kernel >= 2.2.14, portmap >= 4.0, sed, gawk
 Prereq: /sbin/chkconfig /usr/sbin/useradd
 
 %description
@@ -38,8 +43,18 @@ clients which are mounted on that host.
 %setup -q -a 1 
 %patch -p1 -b .drop-privs
 %patch1 -p0
+%patch2 -p1 -b .no-chroot
+%patch3 -p1 -b .statd-manpage
+%patch4 -p1 -b .eepro-support
+%patch5 -p1 -b .time-h
+%patch6 -p1 -b .syslog-level
 
 %build
+#
+# Hack to enable netgroups.  If anybody knows the right way to do
+# this, please help yourself.
+#
+ac_cv_func_innetgr=yes \
 CFLAGS="$RPM_OPT_FLAGS" ./configure --mandir=${RPM_BUILD_ROOT}%{_mandir}
 make all
 
@@ -57,6 +72,10 @@ mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd
 
+# we are using quotad from quota utils
+rm %{buildroot}/%{_mandir}/man8/rquotad*
+rm %{buildroot}/%{_sbindir}/rpc.rquotad
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -102,12 +121,56 @@ fi
 /usr/sbin/nhfsstone
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
-/usr/sbin/rpc.rquotad
 /usr/sbin/showmount
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Fri Mar 30 2001 Preston Brown <pbrown@redhat.com>
+- don't use rquotad from here now; quota package contains a version that 
+  works with 2.4 (#33738)
+
+* Tue Mar 12 2001 Bob Matthews <bmatthews@redhat.com>
+- Statd logs at LOG_DAEMON rather than LOG_LOCAL5
+- s/nfs/\$0/ where appropriate in init scripts
+
+* Tue Mar  6 2001 Jeff Johnson <jbj@redhat.com>
+- Move to nfs-utils-0.3.1
+
+* Wed Feb 14 2001 Bob Matthews <bmatthews@redhat.com>
+- #include <time.h> patch
+
+* Mon Feb 12 2001 Bob Matthews <bmatthews@redhat.com>
+- Really enable netgroups
+
+* Mon Feb  5 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- i18nize initscripts
+
+* Fri Jan 19 2001 Bob Matthews <bmatthews@redhat.com>
+- Increased {s,r}blen in rpcmisc.c:makesock to accommodate eepro100
+
+* Tue Jan 16 2001 Bob Matthews <bmatthews@redhat.com>
+- Hackish fix in build section to enable netgroups
+
+* Wed Jan  3 2001 Bob Matthews <bmatthews@redhat.com>
+- Fix incorrect file specifications in statd manpage.
+- Require gawk 'cause it's used in nfslock init script.
+
+* Thu Dec 13 2000 Bob Matthews <bmatthews@redhat.com>
+- Require sed because it's used in nfs init script
+
+* Tue Dec 12 2000 Bob Matthews <bmatthews@redhat.com>
+- Don't do a chroot(2) after dropping privs, in statd.
+
+* Mon Dec 11 2000 Bob Matthews <bmatthews@redhat.com>
+- NFSv3 if kernel >= 2.2.18, detected in init script
+
+* Thu Nov 23 2000 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to 0.2.1
+
+* Tue Nov 14 2000 Bill Nottingham <notting@redhat.com>
+- don't start lockd on 2.4 kernels; it's unnecessary
+
 * Tue Sep  5 2000 Florian La Roche <Florian.LaRoche@redhat.com>
 - more portable fix for mandir
 

nfs.init

@@ -27,37 +27,47 @@ fi
 [ -x /usr/sbin/exportfs ] || exit 0
 [ -s /etc/exports ] || exit 0
 
-# Number of servers to be started uo by default
+# Number of servers to be started by default
 RPCNFSDCOUNT=8
-# No NFS V3.
+
-RPCMOUNTDOPTS="--no-nfs-version 3"
+# NFSv3 only if kernel >= 2.2.18
+OS_RELEASE=`uname --release`
+OS_RELEASE_MINOR=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\).*/\2/'`
+OS_RELEASE_VERSION=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+if [ "$OS_RELEASE_MINOR" -gt 2 ]; then
+	RPCMOUNTDOPTS=
+elif [ "$OS_RELEASE_MINOR" -eq 2 -a "$OS_RELEASE_VERSION" -ge 18 ]; then
+	RPCMOUNTDOPTS=
+else
+	RPCMOUNTDOPTS="--no-nfs-version 3"
+fi
 
 # See how we were called.
 case "$1" in
   start)
 	# Start daemons.
-	action "Starting NFS services: " /usr/sbin/exportfs -r
+	action $"Starting NFS services: " /usr/sbin/exportfs -r
-	echo -n "Starting NFS quotas: "
+	echo -n $"Starting NFS quotas: "
 	daemon rpc.rquotad
 	echo
-	echo -n "Starting NFS mountd: "
+	echo -n $"Starting NFS mountd: "
 	daemon rpc.mountd $RPCMOUNTDOPTS
 	echo
-	echo -n "Starting NFS daemon: "
+	echo -n $"Starting NFS daemon: "
 	daemon rpc.nfsd $RPCNFSDCOUNT
 	echo
 	touch /var/lock/subsys/nfs
 	;;
   stop)
 	# Stop daemons.
-	echo -n "Shutting down NFS mountd: "
+	echo -n $"Shutting down NFS mountd: "
 	killproc rpc.mountd
 	echo
-	echo -n "Shutting down NFS daemon: "
+	echo -n $"Shutting down NFS daemon: "
 	killproc nfsd
 	echo
-	action "Shutting down NFS services: " /usr/sbin/exportfs -au
+	action $"Shutting down NFS services: " /usr/sbin/exportfs -au
-	echo -n "Shutting down NFS quotas: "
+	echo -n $"Shutting down NFS quotas: "
 	killproc rpc.rquotad
 	echo
 	rm -f /var/lock/subsys/nfs
@@ -68,8 +78,8 @@ case "$1" in
 	status rpc.rquotad
 	;;
   restart)
-	echo -n "Restarting NFS services: "
+	echo -n $"Restarting NFS services: "
-	echo -n "rpc.mountd "
+	echo -n $"rpc.mountd "
 	killproc rpc.mountd
 	daemon rpc.mountd $RPCMOUNTDOPTS
 	/usr/sbin/exportfs -r
@@ -94,7 +104,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo "Usage: nfs {start|stop|status|restart|reload}"
+	echo $"Usage: $0 {start|stop|status|restart|reload}"
 	exit 1
 esac
 

nfslock.init

@@ -22,60 +22,81 @@ fi
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
-[ -x /sbin/rpc.lockd ] || exit 0
+KERNVER=`uname -r | awk -F . '{ print $1.$2 }'`
+
+RETVAL=0
+
+if [ "$KERNVER" -lt 24 ]; then
+  [ -x /sbin/rpc.lockd ] || exit 0
+fi
 [ -x /sbin/rpc.statd ] || exit 0
 
+start() {
+	# Start daemons.
+	echo $"Starting NFS file locking services: "
+	if [ "$KERNVER" -lt 24 ]; then
+	  echo -n $"Starting NFS lockd: "
+	  daemon rpc.lockd
+	  echo
+	fi  
+	echo -n $"Starting NFS statd: "
+	daemon rpc.statd
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
+	return $RETVAL
+}
+
+stop() {
+	# Stop daemons.
+	echo $"Shutting down NFS file locking services: "
+	if [ "$KERNVER" -lt 24 ]; then 
+	   echo -n $"Shutting down NFS lockd: "
+	   killproc lockd
+	   echo
+	fi
+	echo -n $"Shutting down NFS statd: "
+	killproc rpc.statd
+	RETVAL=0
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nfslock
+	return $RETVAL
+}
+
 # See how we were called.
 case "$1" in
   start)
-	# Start daemons.
+        start
-	echo "Starting NFS file locking services: "
-	echo -n "Starting NFS lockd: "
-	daemon rpc.lockd
-	echo
-	echo -n "Starting NFS statd: "
-	daemon rpc.statd
-	echo
-	touch /var/lock/subsys/nfslock
 	;;
   stop)
-	# Stop daemons.
+  	stop
-	echo "Shutting down NFS file locking services: "
-	echo -n "Shutting down NFS lockd: "
-	killproc lockd
-	echo
-	echo -n "Shutting down NFS statd: "
-	killproc rpc.statd
-	echo
-	rm -f /var/lock/subsys/nfslock
 	;;
   status)
-	status lockd
+        if [ "$KERNVER" -lt 24 ]; then
+	  status lockd
+	fi 
 	status rpc.statd
 	;;
   restart)
-	echo -n "Restarting NFS file locking services: "
+        stop
-	echo -n "rpc.lockd "
+	start
-	killproc lockd
-	daemon rpc.lockd
-	echo -n "rpc.statd "
-	killproc rpc.statd
-	daemon rpc.statd
-	touch /var/lock/subsys/nfslock
-	echo "done."
 	;;
   probe)
 	if [ ! -f /var/lock/subsys/nfslock ] ; then
 	  echo start; exit 0
 	fi
 	/sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
-	/sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
+	if [ "$KERNVER" -lt 24 ]; then 
+	   /sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
+	else
+	   LOCKD=0
+	fi
 	if [ $STATD = 1 -o $LOCKD = 1 ] ; then
 	  echo restart; exit 0
 	fi
 	;;
   *)
-	echo "Usage: nfs {start|stop|status|restart}"
+	echo $"Usage: $0 {start|stop|status|restart}"
 	exit 1
 esac
 

sources

@@ -1,2 +1,2 @@
-497979ff6363f125483714f667d36c50  nfs-utils-0.2.tar.gz
+7acac2d055067d48bf5bc4b4d0fc630f  nfs-utils-0.3.1.tar.gz
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz