rpms/nfs-utils/devel nfs-utils-1-2-3-rc4.patch, 1.1, 1.2 nfs-utils.spec, 1.274, 1.275

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3872

Modified Files:
	nfs-utils-1-2-3-rc4.patch nfs-utils.spec 
Log Message:
Updated nfs-utils-1-2-3-rc4.patch


nfs-utils-1-2-3-rc4.patch:
 aclocal/libcap.m4               |   18 -
 configure.ac                    |    4 
 support/export/client.c         |  621 ++++++++++++++++++++++++----------------
 support/export/export.c         |  125 +++++---
 support/export/hostname.c       |  598 +++++++++++++++++++++-----------------
 support/export/nfsctl.c         |   17 -
 support/export/rmtab.c          |   61 ++-
 support/include/exportfs.h      |   88 ++++-
 support/include/misc.h          |    7 
 support/include/nfslib.h        |    2 
 support/include/nfsrpc.h        |    3 
 support/nfs/cacheio.c           |   19 +
 support/nfs/rmtab.c             |   42 ++
 support/nfs/rpc_socket.c        |   21 +
 support/nsm/file.c              |    4 
 tools/Makefile.am               |    2 
 tools/mountstats/Makefile.am    |   13 
 tools/mountstats/mountstats.man |   32 ++
 tools/nfs-iostat/Makefile.am    |   13 
 tools/nfs-iostat/nfs-iostat.py  |    6 
 tools/nfs-iostat/nfsiostat.man  |   71 ++++
 utils/exportfs/exportfs.c       |  128 ++++++--
 utils/gssd/context.h            |    6 
 utils/gssd/context_lucid.c      |  128 +++++++-
 utils/gssd/context_mit.c        |  136 ++++++--
 utils/gssd/gssd_proc.c          |   80 +++++
 utils/gssd/krb5_util.c          |  120 ++++---
 utils/mount/network.c           |   54 ++-
 utils/mount/nfsumount.c         |    4 
 utils/mount/stropts.c           |   17 -
 utils/mountd/auth.c             |   50 +--
 utils/mountd/cache.c            |  200 ++++++++----
 utils/mountd/mountd.c           |   25 -
 utils/mountd/rmtab.c            |   15 
 utils/showmount/showmount.c     |    8 
 utils/statd/sm-notify.c         |   62 +++
 utils/statd/sm-notify.man       |   28 -
 utils/statd/statd.man           |   14 
 38 files changed, 1931 insertions(+), 911 deletions(-)

Index: nfs-utils-1-2-3-rc4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1-2-3-rc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1-2-3-rc4.patch	22 Jun 2010 20:09:52 -0000	1.1
+++ nfs-utils-1-2-3-rc4.patch	22 Jun 2010 21:52:55 -0000	1.2
@@ -2281,6 +2281,23 @@ index 0000000..30f4054
 +	$(INSTALL) --mode 755 nfs-iostat.py $(DESTDIR)$(sbindir)/nfsiostat
 +
 +MAINTAINERCLEANFILES=Makefile.in
+diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
+index 2d0b143..1207674 100644
+--- a/tools/nfs-iostat/nfs-iostat.py
++++ b/tools/nfs-iostat/nfs-iostat.py
+@@ -366,6 +366,12 @@ class DeviceData:
+         sends = float(self.__rpc_data['rpcsends'])
+         if sample_time == 0:
+             sample_time = float(self.__nfs_data['age'])
++        #  sample_time could still be zero if the export was just mounted.
++        #  Set it to 1 to avoid divide by zero errors in this case since we'll
++        #  likely still have relevant mount statistics to show.
++        #
++        if sample_time == 0:
++            sample_time = 1;
+         if sends != 0:
+             backlog = (float(self.__rpc_data['backlogutil']) / sends) / sample_time
+         else:
 diff --git a/tools/nfs-iostat/nfsiostat.man b/tools/nfs-iostat/nfsiostat.man
 new file mode 100644
 index 0000000..99e04fb


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- nfs-utils.spec	22 Jun 2010 20:09:52 -0000	1.274
+++ nfs-utils.spec	22 Jun 2010 21:52:55 -0000	1.275
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -251,7 +251,7 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Tue Jun 22 2010 Steve Dickson <steved at redhat.com> 1.2.2-5
+* Tue Jun 22 2010 Steve Dickson <steved at redhat.com> 1.2.2-6
 - Update to upstream RC release: nfs-utils-1-2-3-rc4
 
 * Thu May  6 2010 Steve Dickson <steved at redhat.com> 1.2.2-4