rpms/nfs-utils/devel nfs-utils-1.1.0-exp-subtree-warn-off.patch, NONE, 1.1 nfs-utils-1.1.0-mount-fsc.patch, NONE, 1.1 nfs-utils-1.1.0-mount-v4-errors.patch, NONE, 1.1 nfs-utils-1.1.0-showmount-rpcerror.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 nfs-utils-1.0.5-statdpath.patch, 1.2, 1.3 nfs-utils.spec, 1.148, 1.149 nfs.init, 1.26, 1.27 nfslock.init, 1.17, 1.18 rpcgssd.init, 1.8, 1.9 rpcidmapd.init, 1.7, 1.8 rpcsvcgssd.init, 1.6, 1.7 sources, 1.20, 1.21 nfs-utils-1.0.10-mount-fake.patch, 1.1, NONE nfs-utils-1.0.10-mount-nfsvers.patch, 1.1, NONE nfs-utils-1.0.10-mount-nordirplus.patch, 1.1, NONE nfs-utils-1.0.10-udp-no-connect.patch, 1.1, NONE nfs-utils-1.0.10-v4-umounts.patch, 1.1, NONE nfs-utils-1.0.12-export-nosubtree.patch, 1.1, NONE nfs-utils-1.0.12-mount-v4-errors.patch, 1.2, NONE nfs-utils-1.0.12-mountd-etab.patch, 1.1, NONE nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch, 1.1, NONE nfs-utils-1.0.6-idmap.conf.patch, 1.1, NONE nfs-utils-1.0.8-privports.patch, 1.1, NONE nfs-utils-1.0.9-compile.patch, 1.2, NONE nfs-utils-1.0.9-lazy-umount.patch, 1.1, NONE nfs-utils-1.0.9-mount-fsc.patch, 1.2, NONE nfs-utils-1.0.9-mount-man-nfs.patch, 1.2, NONE nfs-utils-1.0.9-mount-options-v3.patch, 1.1, NONE nfs-utils-1.0.9-mount-quotes.patch, 1.1, NONE nfs-utils-1.0.9-mount-remount.patch, 1.1, NONE nfs-utils-1.0.9-mount-sloppy.patch, 1.1, NONE nfs-utils-1.0.9-nfsmount-authnone.patch, 1.1, NONE nfs-utils-1.0.9-return-mount-error.patch, 1.1, NONE
Steve Dickson (steved)
fedora-extras-commits at redhat.com
Mon Jul 30 10:10:40 UTC 2007
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7959
Modified Files:
.cvsignore nfs-utils-1.0.5-statdpath.patch nfs-utils.spec
nfs.init nfslock.init rpcgssd.init rpcidmapd.init
rpcsvcgssd.init sources
Added Files:
nfs-utils-1.1.0-exp-subtree-warn-off.patch
nfs-utils-1.1.0-mount-fsc.patch
nfs-utils-1.1.0-mount-v4-errors.patch
nfs-utils-1.1.0-showmount-rpcerror.patch
Removed Files:
nfs-utils-1.0.10-mount-fake.patch
nfs-utils-1.0.10-mount-nfsvers.patch
nfs-utils-1.0.10-mount-nordirplus.patch
nfs-utils-1.0.10-udp-no-connect.patch
nfs-utils-1.0.10-v4-umounts.patch
nfs-utils-1.0.12-export-nosubtree.patch
nfs-utils-1.0.12-mount-v4-errors.patch
nfs-utils-1.0.12-mountd-etab.patch
nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch
nfs-utils-1.0.6-idmap.conf.patch
nfs-utils-1.0.8-privports.patch nfs-utils-1.0.9-compile.patch
nfs-utils-1.0.9-lazy-umount.patch
nfs-utils-1.0.9-mount-fsc.patch
nfs-utils-1.0.9-mount-man-nfs.patch
nfs-utils-1.0.9-mount-options-v3.patch
nfs-utils-1.0.9-mount-quotes.patch
nfs-utils-1.0.9-mount-remount.patch
nfs-utils-1.0.9-mount-sloppy.patch
nfs-utils-1.0.9-nfsmount-authnone.patch
nfs-utils-1.0.9-return-mount-error.patch
Log Message:
- Upgraded to the latest upstream version (nfs-utils-1.1.0)
nfs-utils-1.1.0-exp-subtree-warn-off.patch:
--- NEW FILE nfs-utils-1.1.0-exp-subtree-warn-off.patch ---
--- nfs-utils-1.1.0/support/nfs/exports.c.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/support/nfs/exports.c 2007-07-16 09:13:40.000000000 -0400
@@ -355,7 +355,7 @@ static int valid_uuid(char *uuid)
static int
parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
{
- int had_subtree_opt = 0;
+ int had_subtree_opt = 1;
char *flname = efname?efname:"command line";
int flline = efp?efp->x_line:0;
nfs-utils-1.1.0-mount-fsc.patch:
--- NEW FILE nfs-utils-1.1.0-mount-fsc.patch ---
--- nfs-utils-1.1.0/utils/mount/nfsmount.c.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/nfsmount.c 2007-07-25 11:25:33.000000000 -0400
@@ -733,6 +733,10 @@ parse_options(char *old_opts, struct nfs
data->flags &= ~NFS_MOUNT_SOFT;
if (val)
data->flags |= NFS_MOUNT_SOFT;
+ } else if (!strcmp(opt, "fsc")) {
+ data->flags &= ~NFS_MOUNT_FSCACHE;
+ if (val)
+ data->flags |= NFS_MOUNT_FSCACHE;
} else if (!strcmp(opt, "hard")) {
data->flags &= ~NFS_MOUNT_SOFT;
if (!val)
--- nfs-utils-1.1.0/utils/mount/nfs.man.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/nfs.man 2007-07-25 11:27:55.000000000 -0400
@@ -288,6 +288,10 @@ Mount the NFS filesystem using the UDP p
Disables NFSv3 READDIRPLUS RPCs. Use this option when
mounting servers that don't support or have broken
READDIRPLUS implementations.
+.TP 1.5i
+.I fsc
+Enable the use of persistent caching to the local disk using
+the FS-Cache facility for the given mount point.
.P
All of the non-value options have corresponding nooption forms.
For example, nointr means don't allow file operations to be
@@ -444,6 +448,10 @@ This extracts a
server performance penalty but it allows two different NFS clients
to get reasonable good results when both clients are actively
writing to common filesystem on the server.
+.TP 1.5i
+.I fsc
+Enable the use of persistent caching to the local disk using
+the FS-Cache facility for the given mount point.
.P
All of the non-value options have corresponding nooption forms.
For example, nointr means don't allow file operations to be
--- nfs-utils-1.1.0/utils/mount/nfs4mount.c.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/nfs4mount.c 2007-07-25 11:25:33.000000000 -0400
@@ -201,7 +201,7 @@ int nfs4mount(const char *spec, const ch
char *s;
int val;
int bg, soft, intr;
- int nocto, noac;
+ int nocto, noac, fscache;
int retry;
int retval;
time_t timeout, t;
@@ -252,6 +252,7 @@ int nfs4mount(const char *spec, const ch
intr = NFS4_MOUNT_INTR;
nocto = 0;
noac = 0;
+ fscache = 0;
retry = 10000; /* 10000 minutes ~ 1 week */
/*
@@ -332,6 +333,8 @@ int nfs4mount(const char *spec, const ch
soft = !val;
else if (!strcmp(opt, "intr"))
intr = val;
+ else if (!strcmp(opt, "fsc"))
+ fscache = val;
else if (!strcmp(opt, "cto"))
nocto = !val;
else if (!strcmp(opt, "ac"))
@@ -347,7 +350,8 @@ int nfs4mount(const char *spec, const ch
data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
| (intr ? NFS4_MOUNT_INTR : 0)
| (nocto ? NFS4_MOUNT_NOCTO : 0)
- | (noac ? NFS4_MOUNT_NOAC : 0);
+ | (noac ? NFS4_MOUNT_NOAC : 0)
+ | (fscache ? NFS4_MOUNT_FSCACHE : 0);
/*
* Give a warning if the rpc.idmapd daemon is not running
--- nfs-utils-1.1.0/utils/mount/nfs4_mount.h.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/nfs4_mount.h 2007-07-25 11:27:07.000000000 -0400
@@ -65,7 +65,8 @@ struct nfs4_mount_data {
#define NFS4_MOUNT_NOCTO 0x0010 /* 1 */
#define NFS4_MOUNT_NOAC 0x0020 /* 1 */
#define NFS4_MOUNT_STRICTLOCK 0x1000 /* 1 */
-#define NFS4_MOUNT_FLAGMASK 0xFFFF
+#define NFS4_MOUNT_FSCACHE 0x10000 /* 1 */
+#define NFS4_MOUNT_FLAGMASK 0x1FFFF
/* pseudoflavors: */
--- nfs-utils-1.1.0/utils/mount/nfs_mount.h.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/nfs_mount.h 2007-07-25 11:26:39.000000000 -0400
@@ -64,6 +64,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_NOACL 0x0800 /* 4 */
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
+#define NFS_MOUNT_FSCACHE 0x10000 /* 5 */
/* security pseudoflavors */
nfs-utils-1.1.0-mount-v4-errors.patch:
--- NEW FILE nfs-utils-1.1.0-mount-v4-errors.patch ---
--- nfs-utils-1.1.0/utils/mount/mount.c.orig 2007-07-18 16:26:01.000000000 -0400
+++ nfs-utils-1.1.0/utils/mount/mount.c 2007-07-18 16:37:34.000000000 -0400
@@ -286,17 +286,24 @@ static void parse_opts (const char *opti
}
}
-static void mount_error(char *node)
+static void mount_error(char *mount_point, char *node)
{
switch(errno) {
case ENOTDIR:
- fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
+ fprintf(stderr, "%s: mount point %s is not a directory\n",
+ progname, mount_point);
break;
case EBUSY:
- fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
+ fprintf(stderr, "%s: %s is already mounted or busy\n", progname,
+ mount_point);
break;
case ENOENT:
- fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
+ if (node)
+ fprintf(stderr, "%s: %s failed, reason given by server: %s\n",
+ progname, node, strerror(errno));
+ else
+ fprintf(stderr, "%s: mount point %s does not exist\n", progname,
+ mount_point);
break;
default:
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
@@ -352,6 +359,26 @@ static int start_statd()
#endif
return 0;
}
+static int chk_mountpoint(char *mount_point)
+{
+ struct stat sb;
+
+ if (stat(mount_point, &sb) < 0){
+ mount_error(mount_point, NULL);
+ return 1;
+ }
+ if (S_ISDIR(sb.st_mode) == 0){
+ errno = ENOTDIR;
+ mount_error(mount_point, NULL);
+ return 1;
+ }
+ if (access(mount_point, X_OK) < 0) {
+ mount_error(mount_point, NULL);
+ return 1;
+ }
+
+ return 0;
+}
int main(int argc, char *argv[])
{
@@ -509,6 +536,9 @@ int main(int argc, char *argv[])
}
}
+ if (chk_mountpoint(mount_point))
+ exit(1);
+
if (nfs_mount_vers == 4)
mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
else {
@@ -539,7 +569,7 @@ int main(int argc, char *argv[])
mount_opts);
if (mnt_err) {
- mount_error(mount_point);
+ mount_error(mount_point, spec);
exit(EX_FAIL);
}
}
nfs-utils-1.1.0-showmount-rpcerror.patch:
--- NEW FILE nfs-utils-1.1.0-showmount-rpcerror.patch ---
--- nfs-utils-1.1.0/utils/showmount/showmount.c.orig 2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/showmount/showmount.c 2007-07-16 13:02:42.000000000 -0400
@@ -242,6 +242,8 @@ static unsigned short getport(struct soc
rpc_createerr.cf_stat = status;
clnt_destroy(client);
return 0;
+ } else if (port == 0) {
+ rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
}
clnt_destroy(client);
@@ -368,7 +370,7 @@ char **argv;
server_addr.sin_port = getport(&server_addr,
MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
if (!server_addr.sin_port) {
- clnt_pcreateerror("portmap getport");
+ clnt_pcreateerror("showmount");
exit(1);
}
msock = RPC_ANYSOCK;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 6 Mar 2007 20:17:30 -0000 1.19
+++ .cvsignore 30 Jul 2007 10:10:07 -0000 1.20
@@ -9,3 +9,4 @@
nfs-utils-1.0.10.tar.bz2
nfs-utils-1.0.11.tar.bz2
nfs-utils-1.0.12.tar.bz2
+nfs-utils-1.1.0.tar.bz2
nfs-utils-1.0.5-statdpath.patch:
Index: nfs-utils-1.0.5-statdpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.0.5-statdpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs-utils-1.0.5-statdpath.patch 9 Sep 2004 09:27:25 -0000 1.2
+++ nfs-utils-1.0.5-statdpath.patch 30 Jul 2007 10:10:07 -0000 1.3
@@ -1,6 +1,6 @@
---- ./utils/statd/statd.h.orig 2002-09-01 22:31:23.000000000 -0400
-+++ ./utils/statd/statd.h 2003-07-21 10:45:54.000000000 -0400
-@@ -13,10 +13,11 @@
+--- nfs-utils-1.1.0/utils/statd/statd.h.orig 2007-05-10 23:40:57.000000000 -0400
++++ nfs-utils-1.1.0/utils/statd/statd.h 2007-07-14 05:55:57.000000000 -0400
+@@ -16,10 +16,11 @@
/*
* Paths and filenames.
*/
@@ -14,19 +14,19 @@
#endif
#define DEFAULT_SM_DIR DEFAULT_DIR_BASE "sm"
---- ./utils/statd/statd.man.orig 2002-09-16 15:23:03.000000000 -0400
-+++ ./utils/statd/statd.man 2003-06-02 15:01:41.000000000 -0400
-@@ -23,7 +23,7 @@ reboots.
+--- nfs-utils-1.1.0/utils/statd/statd.man.orig 2007-05-10 23:40:57.000000000 -0400
++++ nfs-utils-1.1.0/utils/statd/statd.man 2007-07-14 05:57:20.000000000 -0400
+@@ -24,7 +24,7 @@ reboots.
For each NFS client or server machine to be monitored,
.B rpc.statd
creates a file in
-.BR /var/lib/nfs/sm .
+.BR /var/lib/nfs/statd/sm .
- When starting, it iterates through these files and notifies the
- peer
- .B rpc.statd
-@@ -136,11 +136,11 @@ and
- manual pages.
+ When starting, it normally runs
+ .B sm-notify
+ to iterate through these files and notify the
+@@ -176,11 +176,11 @@ and send notifications to clients. This
+ of an NFS export from another server.
.SH FILES
-.BR /var/lib/nfs/state
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- nfs-utils.spec 24 May 2007 12:52:19 -0000 1.148
+++ nfs-utils.spec 30 Jul 2007 10:10:07 -0000 1.149
@@ -1,8 +1,8 @@
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
-Version: 1.0.12
-Release: 7%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -24,35 +24,19 @@
Patch00: nfs-utils-1.0.5-statdpath.patch
Patch01: nfs-utils-1.0.6-mountd.patch
-Patch02: nfs-utils-1.0.6-idmap.conf.patch
-Patch03: nfs-utils-1.0.6-gssd_mixed_case.patch
-Patch04: nfs-utils-1.0.8-privports.patch
-Patch05: nfs-utils-1.0.12-export-nosubtree.patch
-Patch06: nfs-utils-1.0.9-mount-options-v3.patch
-Patch07: nfs-utils-1.0.9-lazy-umount.patch
-Patch08: nfs-utils-1.0.9-mount-sloppy.patch
-Patch09: nfs-utils-1.0.9-mount-man-nfs.patch
-Patch10: nfs-utils-1.0.9-return-mount-error.patch
-Patch11: nfs-utils-1.0.9-nfsmount-authnone.patch
-Patch12: nfs-utils-1.0.9-mount-remount.patch
-Patch13: nfs-utils-1.0.10-mount-nfsvers.patch
-Patch14: nfs-utils-1.0.10-udp-no-connect.patch
-Patch15: nfs-utils-1.0.10-v4-umounts.patch
-Patch16: nfs-utils-1.0.9-mount-quotes.patch
-Patch17: nfs-utils-1.0.10-mount-fake.patch
-Patch18: nfs-utils-1.0.12-mount-v4-errors.patch
-Patch19: nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch
-Patch20: nfs-utils-1.0.12-mountd-memleak.patch
-Patch21: nfs-utils-1.0.12-nfsd-macargs.patch
-Patch22: nfs-utils-1.0.12-mtab-mis-unlock.patch
-Patch23: nfs-utils-1.0.12-mountd-etab.patch
-Patch24: nfs-utils-1.0.10-mount-nordirplus.patch
+Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch
+Patch03: nfs-utils-1.0.12-mountd-memleak.patch
+Patch04: nfs-utils-1.0.12-nfsd-macargs.patch
+Patch05: nfs-utils-1.0.12-mtab-mis-unlock.patch
+Patch06: nfs-utils-1.1.0-exp-subtree-warn-off.patch
+Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
+Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
%if %{enablefscache}
-Patch90: nfs-utils-1.0.9-mount-fsc.patch
+Patch90: nfs-utils-1.1.0-mount-fsc.patch
%endif
-Patch100: nfs-utils-1.0.9-compile.patch
+#Patch100: nfs-utils-1.0.9-compile.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -63,25 +47,27 @@
Provides: rpc.mountd = %{epoch}:%{version}-%{release}
Provides: rpc.nfsd = %{epoch}:%{version}-%{release}
Provides: rpc.statd = %{epoch}:%{version}-%{release}
-Provides: rpc.lockd = %{epoch}:%{version}-%{release}
Provides: rpc.gssd = %{epoch}:%{version}-%{release}
Provides: rpc.svcgssd = %{epoch}:%{version}-%{release}
Provides: mount.nfs = %{epoch}:%{version}-%{release}
Provides: mount.nfs4 = %{epoch}:%{version}-%{release}
Provides: umount.nfs = %{epoch}:%{version}-%{release}
Provides: umount.nfs4 = %{epoch}:%{version}-%{release}
+Provides: sm-notify = %{epoch}:%{version}-%{release}
+Provides: start-statd = %{epoch}:%{version}-%{release}
License: GPL
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
Requires: modutils >= 2.4.26-9
-BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel
+BuildRequires: libgssapi-devel >= 0.11 libevent-devel >= 1.3b
+BuildRequires: nfs-utils-lib-devel >= 1.1.0
BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool, keyutils-libs-devel
-BuildRequires: tcp_wrappers-devel, e2fsprogs-devel, krb5-devel
+BuildRequires: automake, libtool
+BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel
Requires(pre): shadow-utils >= 4.0.3-25
Requires(pre): /sbin/chkconfig /sbin/nologin
-Requires(pre): nfs-utils-lib libevent libgssapi
+Requires: nfs-utils-lib >= 1.1.0 libgssapi >= 0.11 libevent >= 1.3b
%description
The nfs-utils package provides a daemon for the kernel NFS server and
@@ -106,29 +92,13 @@
%patch06 -p1
%patch07 -p1
%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
%if %{enablefscache}
%patch90 -p1
%endif
# Do the magic to get things to compile
-%patch100 -p1
+#%patch100 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -167,23 +137,14 @@
install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs
-install -m 644 utils/idmapd/idmapd.conf \
- $RPM_BUILD_ROOT/etc/idmapd.conf
-
mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
-mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT/usr/sbin/{mount.*,umount.*} $RPM_BUILD_ROOT/sbin
+mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
-# we are using quotad from quota utils
-rm %{buildroot}/%{_mandir}/man8/rquotad*
-rm %{buildroot}/%{_mandir}/man8/rpc.rquotad*
-rm %{buildroot}/%{_sbindir}/rpc.rquotad
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -268,17 +229,16 @@
%config /etc/rc.d/init.d/rpcgssd
%config /etc/rc.d/init.d/rpcsvcgssd
%config(noreplace) /etc/sysconfig/nfs
-%config(noreplace) /etc/idmapd.conf
%dir /var/lib/nfs/v4recovery
%dir /var/lib/nfs/rpc_pipefs
%dir /var/lib/nfs
%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
+%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm
%config(noreplace) /var/lib/nfs/xtab
%config(noreplace) /var/lib/nfs/etab
%config(noreplace) /var/lib/nfs/rmtab
%config(noreplace) /var/lib/nfs/state
%doc linux-nfs/*
-/sbin/rpc.lockd
/sbin/rpc.statd
/usr/sbin/exportfs
/usr/sbin/nfsstat
@@ -291,6 +251,8 @@
/usr/sbin/rpc.svcgssd
/usr/sbin/gss_clnt_send_err
/usr/sbin/gss_destroy_creds
+/usr/sbin/sm-notify
+/usr/sbin/start-statd
%{_mandir}/*/*
%config /etc/rc.d/init.d/nfslock
@@ -300,6 +262,9 @@
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Sat Jul 28 2007 Steve Dickson <steved at redhat.com> 1.1.0-1
+- Upgraded to the latest upstream version (nfs-utils-1.1.0)
+
* Thu May 24 2007 Steve Dickson <steved at redhat.com> 1.0.10-7
- Fixed typo in mount.nfs4 that causes a segfault during
error processing (bz 241190)
Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nfs.init 16 May 2007 17:34:55 -0000 1.26
+++ nfs.init 30 Jul 2007 10:10:07 -0000 1.27
@@ -15,17 +15,17 @@
# Source networking configuration.
if [ ! -f /etc/sysconfig/network ]; then
- exit 0
+ exit 6
fi
. /etc/sysconfig/network
# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 6
-[ -x /usr/sbin/rpc.nfsd ] || exit 0
-[ -x /usr/sbin/rpc.mountd ] || exit 0
-[ -x /usr/sbin/exportfs ] || exit 0
+[ -x /usr/sbin/rpc.nfsd ] || exit 5
+[ -x /usr/sbin/rpc.mountd ] || exit 5
+[ -x /usr/sbin/exportfs ] || exit 5
# Don't fail if /etc/exports doesn't exist; create a bare-bones version and continue.
[ -r /etc/exports ] || \
@@ -106,7 +106,6 @@
;;
stop)
# Stop daemons.
- [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd stop
echo -n $"Shutting down NFS mountd: "
killproc rpc.mountd
echo
@@ -116,6 +115,7 @@
if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
echo -n $"Shutting down NFS quotas: "
killproc rpc.rquotad
+ RETVAL=$?
echo
fi
# Reset the lockd ports if they were set
@@ -133,6 +133,7 @@
else
action $"Shutting down NFS services: " /bin/false
fi
+ [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd stop
rm -f /var/lock/subsys/nfs
;;
status)
@@ -172,15 +173,10 @@
$0 start
}
;;
- condstop)
- [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condstop
- [ -f /var/lock/subsys/nfs ] && {
- $0 stop
- }
- ;;
*)
- echo $"Usage: nfs {start|stop|status|restart|reload|condrestart|condstop}"
- exit 1
+ echo $"Usage: nfs {start|stop|status|restart|reload|condrestart}"
+ RETVAL=3
+ ;;
esac
-exit $?
+exit $RETVAL
Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nfslock.init 16 May 2007 17:34:55 -0000 1.17
+++ nfslock.init 30 Jul 2007 10:10:07 -0000 1.18
@@ -14,7 +14,7 @@
# Source networking configuration.
if [ ! -f /etc/sysconfig/network ]; then
- exit 0
+ exit 6
fi
# Check for and source configuration file
@@ -23,7 +23,7 @@
. /etc/sysconfig/network
# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 6
# Start lockd from userland only if kernel <= 2.2.18
OS_RELEASE=`uname --release`
@@ -38,10 +38,10 @@
fi
if [ "$USERLAND_LOCKD" ] ; then
- [ -x /sbin/rpc.lockd ] || exit 0
+ [ -x /sbin/rpc.lockd ] || exit 5
fi
-[ -x /sbin/rpc.statd ] || exit 0
+[ -x /sbin/rpc.statd ] || exit 5
RETVAL=0
if [ -n "${STATD_HOSTNAME}" ]; then
@@ -139,14 +139,10 @@
start
}
;;
- condstop)
- [ -f /var/lock/subsys/nfslock ] && {
- stop
- }
- ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|probe|condrestart|condstop}"
- exit 1
+ echo $"Usage: $0 {start|stop|status|restart|probe|condrestart}"
+ RETVAL=3
+ ;;
esac
exit $RETVAL
Index: rpcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcgssd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpcgssd.init 15 May 2007 15:03:52 -0000 1.8
+++ rpcgssd.init 30 Jul 2007 10:10:07 -0000 1.9
@@ -4,7 +4,7 @@
#
# Authors: Chuck Lever <cel at netapp.com>
#
-# chkconfig: 345 19 69
+# chkconfig: 345 19 85
# description: Starts user-level daemon that manages RPCSEC GSS contexts \
# for the NFSv4 client.
@@ -13,18 +13,18 @@
# Source networking configuration.
if [ ! -f /etc/sysconfig/network ]; then
- exit 0
+ exit 6
fi
. /etc/sysconfig/network
# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 6
-[ ! -x /usr/sbin/rpc.gssd ] && exit 0
+[ ! -x /usr/sbin/rpc.gssd ] && exit 5
# Check for and source configuration file otherwise set defaults
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-[ "${SECURE_NFS}" != "yes" ] && exit 0
+[ "${SECURE_NFS}" != "yes" ] && exit 6
# List of kernel modules to load
[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
@@ -45,26 +45,36 @@
echo -n $"Starting RPC gssd: "
- # Load sunrpc which mounts the rpc_pipes fs.
- [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
- if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
- /sbin/modprobe sunrpc || exit 1
- fi
- # Load rpcsec modules
- for i in ${SECURE_NFS_MODS}
- do
- if ! /sbin/lsmod | grep $i > /dev/null ; then
- /sbin/modprobe $i || exit 1
- fi
- done
+ # Make sure the rpc_pipefs filesystem is available
+ [ "${RPCMTAB}" != "noload" ] && {
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && {
+ [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
+ if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
+ /sbin/modprobe sunrpc
+ fi
+ }
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && { \
+ echo "Error: RPC MTAB does not exist."
+ exit 6
+ }
+ }
+ }
+ [ "${SECURE_NFS_MODS}" != "noload" ] && {
+ [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
+ for i in ${SECURE_NFS_MODS}; do
+ if ! /sbin/lsmod | grep $i > /dev/null ; then
+ /sbin/modprobe $i || {
+ echo "Error: Unable to load '$i' security module."
+ exit 6;
+ }
+ fi
+ done
+ }
}
- # Make sure the mount worked.
- [ -z "${RPCMTAB}" ] && RPCMTAB=`grep -v '^#' /proc/mounts | \
- awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
- [ -z "${RPCMTAB}" ] && {
- echo "Error: RPC MTAB does not exist."
- exit 1
- }
# Start daemon.
daemon $prog ${RPCGSSDARGS}
@@ -74,7 +84,7 @@
;;
stop)
# Stop daemon.
- echo -n $"Shutting down RPC gssd: "
+ echo -n $"Stopping RPC gssd: "
killproc $prog
RETVAL=$?
echo
@@ -95,15 +105,10 @@
RETVAL=$?
fi
;;
- condstop)
- if [ -f $LOCKFILE ]; then
- $0 stop
- RETVAL=$?
- fi
- ;;
*)
- echo $"Usage: $0 {start|stop|restart|condstart|condrestart|condstop|status}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}"
+ RETVAL=3
+ ;;
esac
exit $RETVAL
Index: rpcidmapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcidmapd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpcidmapd.init 15 May 2007 15:03:52 -0000 1.7
+++ rpcidmapd.init 30 Jul 2007 10:10:07 -0000 1.8
@@ -4,7 +4,7 @@
#
# Authors: Chuck Lever <cel at netapp.com>
#
-# chkconfig: 345 18 68
+# chkconfig: 345 18 85
# description: Starts user-level daemon for NFSv4 that maps user \
# names to UID and GID numbers.
@@ -13,14 +13,14 @@
# Source networking configuration.
if [ ! -f /etc/sysconfig/network ]; then
- exit 0
+ exit 6
fi
. /etc/sysconfig/network
# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 6
-[ ! -x /usr/sbin/rpc.idmapd ] && exit 0
+[ ! -x /usr/sbin/rpc.idmapd ] && exit 5
# Check for and source configuration file otherwise set defaults
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
@@ -40,20 +40,26 @@
echo -n $"Starting RPC idmapd: "
- # Load sunrpc which mounts the rpc_pipes fs.
- [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
- if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
- /sbin/modprobe sunrpc || exit 1
- fi
+ # Make sure the rpc_pipefs filesystem is available
+ [ "${RPCMTAB}" != "noload" ] && {
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && {
+ [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
+ if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
+ /sbin/modprobe sunrpc
+ fi
+ }
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && { \
+ echo "Error: RPC MTAB does not exist."
+ exit 6
+ }
+ }
}
# Make sure the mount worked.
- [ -z "${RPCMTAB}" ] && RPCMTAB=`grep -v '^#' /proc/mounts | \
- awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
- [ -z "${RPCMTAB}" ] && {
- echo "Error: RPC MTAB does not exist."
- exit 1
- }
# Start daemon.
daemon $prog ${RPCIDMAPDARGS}
@@ -63,7 +69,7 @@
;;
stop)
# Stop daemon.
- echo -n $"Shutting down RPC idmapd: "
+ echo -n $"Stopping RPC idmapd: "
killproc $prog
RETVAL=$?
echo
@@ -84,15 +90,10 @@
RETVAL=$?
fi
;;
- condstop)
- if [ -f $LOCKFILE ]; then
- $0 stop
- RETVAL=$?
- fi
- ;;
*)
- echo $"Usage: $0 {start|stop|restart|condstart|condrestart|condstop|status}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}"
+ RETVAL=3
+ ;;
esac
exit $RETVAL
Index: rpcsvcgssd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/rpcsvcgssd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpcsvcgssd.init 15 May 2007 15:03:52 -0000 1.6
+++ rpcsvcgssd.init 30 Jul 2007 10:10:07 -0000 1.7
@@ -13,18 +13,18 @@
# Source networking configuration.
if [ ! -f /etc/sysconfig/network ]; then
- exit 0
+ exit 6
fi
. /etc/sysconfig/network
# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 6
-[ ! -x /usr/sbin/rpc.svcgssd ] && exit 0
+[ ! -x /usr/sbin/rpc.svcgssd ] && exit 5
# Check for and source configuration file otherwise set defaults
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-[ "${SECURE_NFS}" != "yes" ] && exit 0
+[ "${SECURE_NFS}" != "yes" ] && exit 6
# List of kernel modules to load
[ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
@@ -43,28 +43,39 @@
echo -n $"Starting RPC svcgssd: "
- # Load sunrpc which mounts the rpc_pipes fs.
- [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
- if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
- /sbin/modprobe sunrpc || exit 1
- fi
+ # Make sure the rpc_pipefs filesystem is available
+ [ "${RPCMTAB}" != "noload" ] && {
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && {
+ [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
+ if ! /sbin/lsmod | grep sunrpc > /dev/null ; then
+ /sbin/modprobe sunrpc
+ fi
+ }
+ RPCMTAB=`grep -v '^#' /proc/mounts | \
+ awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
+ [ -z "${RPCMTAB}" ] && { \
+ echo "Error: RPC MTAB does not exist."
+ exit 6
+ }
+ }
+ }
+ [ "${SECURE_NFS_MODS}" != "noload" ] && {
+ [ -x /sbin/lsmod -a -x /sbin/modprobe ] && {
# Load rpcsec modules
- for i in ${SECURE_NFS_MODS}
- do
- if ! /sbin/lsmod | grep $i > /dev/null ; then
- /sbin/modprobe $i || exit 1
- fi
- done
+ for i in ${SECURE_NFS_MODS}
+ do
+ if ! /sbin/lsmod | grep $i > /dev/null ; then
+ /sbin/modprobe $i || {
+ echo "Error: Unable to load '$i' security module."
+ exit 6;
+ }
+ fi
+ done
+ }
}
- # Make sure the mount worked.
- [ -z "${RPCMTAB}" ] && RPCMTAB=`grep -v '^#' /proc/mounts | \
- awk '{ if ($3 ~ /^rpc_pipefs$/ ) print $2}'`
- [ -z "${RPCMTAB}" ] && {
- echo "Error: RPC MTAB does not exist."
- exit 1
- }
-
# Start daemon.
daemon $prog ${RPCSVCGSSDARGS}
RETVAL=$?
@@ -94,15 +105,10 @@
RETVAL=$?
fi
;;
- condstop)
- if [ -f $LOCKFILE ]; then
- $0 stop
- RETVAL=$?
- fi
- ;;
*)
- echo $"Usage: $0 {start|stop|restart|condstart|condrestart|condstop|status}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|condstart|condrestart|status}"
+ RETVAL=3
+ ;;
esac
exit $RETVAL
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 6 Mar 2007 20:17:30 -0000 1.20
+++ sources 30 Jul 2007 10:10:07 -0000 1.21
@@ -1,2 +1,2 @@
ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz
-2c4425cad533d327afce16d30a344e19 nfs-utils-1.0.12.tar.bz2
+42d92ed97f7d4071a017ccac8055cf51 nfs-utils-1.1.0.tar.bz2
--- nfs-utils-1.0.10-mount-fake.patch DELETED ---
--- nfs-utils-1.0.10-mount-nfsvers.patch DELETED ---
--- nfs-utils-1.0.10-mount-nordirplus.patch DELETED ---
--- nfs-utils-1.0.10-udp-no-connect.patch DELETED ---
--- nfs-utils-1.0.10-v4-umounts.patch DELETED ---
--- nfs-utils-1.0.12-export-nosubtree.patch DELETED ---
--- nfs-utils-1.0.12-mount-v4-errors.patch DELETED ---
--- nfs-utils-1.0.12-mountd-etab.patch DELETED ---
--- nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch DELETED ---
--- nfs-utils-1.0.6-idmap.conf.patch DELETED ---
--- nfs-utils-1.0.8-privports.patch DELETED ---
--- nfs-utils-1.0.9-compile.patch DELETED ---
--- nfs-utils-1.0.9-lazy-umount.patch DELETED ---
--- nfs-utils-1.0.9-mount-fsc.patch DELETED ---
--- nfs-utils-1.0.9-mount-man-nfs.patch DELETED ---
--- nfs-utils-1.0.9-mount-options-v3.patch DELETED ---
--- nfs-utils-1.0.9-mount-quotes.patch DELETED ---
--- nfs-utils-1.0.9-mount-remount.patch DELETED ---
--- nfs-utils-1.0.9-mount-sloppy.patch DELETED ---
--- nfs-utils-1.0.9-nfsmount-authnone.patch DELETED ---
--- nfs-utils-1.0.9-return-mount-error.patch DELETED ---
More information about the fedora-extras-commits
mailing list