rpms/nfs-utils/devel nfs-utils-1.2.1-exp-subtree-warn-off.patch, NONE, 1.1 nfs-utils-1.2.1-statdpath-man.patch, NONE, 1.1 nfs-utils-1.2.2-rc7.patch, NONE, 1.1 nfs-utils-1.2.1-statdpath.patch, 1.1, 1.2 nfs-utils.spec, 1.262, 1.263 nfs-utils-1.1.0-exp-subtree-warn-off.patch, 1.2, NONE nfs-utils-1.1.0-smnotify-path.patch, 1.5, NONE nfs-utils-1.2.2-rc6.patch, 1.1, NONE
Steve Dickson
steved at fedoraproject.org
Sat Jan 16 12:32:43 UTC 2010
- Previous message: rpms/hercstudio/EL-5 hercstudio-vector.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hercstudio-qt42.patch, 1.1, 1.2 hercstudio.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel9.patch,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25688
Modified Files:
nfs-utils-1.2.1-statdpath.patch nfs-utils.spec
Added Files:
nfs-utils-1.2.1-exp-subtree-warn-off.patch
nfs-utils-1.2.1-statdpath-man.patch nfs-utils-1.2.2-rc7.patch
Removed Files:
nfs-utils-1.1.0-exp-subtree-warn-off.patch
nfs-utils-1.1.0-smnotify-path.patch nfs-utils-1.2.2-rc6.patch
Log Message:
- Updated to latest upstream RC release: nfs-utils-1-2-2-rc7
which includes Ipv6 support for statd (disabled by default).
nfs-utils-1.2.1-exp-subtree-warn-off.patch:
exports.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE nfs-utils-1.2.1-exp-subtree-warn-off.patch ---
diff -up nfs-utils-1.2.1/support/nfs/exports.c.orig nfs-utils-1.2.1/support/nfs/exports.c
--- nfs-utils-1.2.1/support/nfs/exports.c.orig 2010-01-15 10:48:49.631894982 -0500
+++ nfs-utils-1.2.1/support/nfs/exports.c 2010-01-15 11:05:02.009874055 -0500
@@ -483,7 +483,7 @@ static void fix_pseudoflavor_flags(struc
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;
unsigned int active = 0;
nfs-utils-1.2.1-statdpath-man.patch:
sm-notify.man | 8 ++++----
statd.man | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE nfs-utils-1.2.1-statdpath-man.patch ---
diff -up nfs-utils-1.2.1/utils/statd/sm-notify.man.save nfs-utils-1.2.1/utils/statd/sm-notify.man
--- nfs-utils-1.2.1/utils/statd/sm-notify.man.save 2010-01-15 11:10:25.096874609 -0500
+++ nfs-utils-1.2.1/utils/statd/sm-notify.man 2010-01-15 11:14:12.636873981 -0500
@@ -186,7 +186,7 @@ where NSM state information resides.
If this option is not specified,
.B sm-notify
uses
-.I /var/lib/nfs
+.I /var/lib/nfs/statd
by default.
.IP
After starting,
@@ -287,13 +287,13 @@ Currently, the
command supports sending notification only via datagram transport protocols.
.SH FILES
.TP 2.5i
-.I /var/lib/nfs/sm
+.I /var/lib/nfs/statd/sm
directory containing monitor list
.TP 2.5i
-.I /var/lib/nfs/sm.bak
+.I /var/lib/nfs/statd/sm.bak
directory containing notify list
.TP 2.5i
-.I /var/lib/nfs/state
+.I /var/lib/nfs/statd/state
NSM state number for this host
.TP 2.5i
.I /proc/sys/fs/nfs/nsm_local_state
diff -up nfs-utils-1.2.1/utils/statd/statd.man.save nfs-utils-1.2.1/utils/statd/statd.man
--- nfs-utils-1.2.1/utils/statd/statd.man.save 2010-01-15 11:10:25.098906325 -0500
+++ nfs-utils-1.2.1/utils/statd/statd.man 2010-01-15 11:11:03.874769717 -0500
@@ -232,7 +232,7 @@ where NSM state information resides.
If this option is not specified,
.B rpc.statd
uses
-.I /var/lib/nfs
+.I /var/lib/nfs/statd
by default.
.IP
After starting,
@@ -368,13 +368,13 @@ As long as at least one network transpor
will operate.
.SH FILES
.TP 2.5i
-.I /var/lib/nfs/sm
+.I /var/lib/nfs/statd/sm
directory containing monitor list
.TP 2.5i
-.I /var/lib/nfs/sm.bak
+.I /var/lib/nfs/statd/sm.bak
directory containing notify list
.TP 2.5i
-.I /var/lib/nfs/state
+.I /var/lib/nfs/statd/state
NSM state number for this host
.TP 2.5i
.I /var/run/run.statd.pid
nfs-utils-1.2.2-rc7.patch:
b/.gitignore | 13
b/Makefile.am | 2
b/aclocal/libcap.m4 | 15
b/configure.ac | 8
b/support/Makefile.am | 2
b/support/export/client.c | 2
b/support/export/export.c | 40 -
b/support/export/xtab.c | 6
b/support/include/Makefile.am | 2
b/support/include/exportfs.h | 9
b/support/include/ha-callout.h | 4
b/support/include/nfs/export.h | 13
b/support/include/nfsrpc.h | 24
b/support/include/nsm.h | 93 ++
b/support/include/rpcmisc.h | 7
b/support/include/sockaddr.h | 237 +++++++
b/support/include/v4root.h | 15
b/support/nfs/Makefile.am | 3
b/support/nfs/exports.c | 162 ++---
b/support/nfs/getport.c | 113 ++-
b/support/nfs/rpc_socket.c | 55 -
b/support/nfs/svc_create.c | 246 +++++++
b/support/nsm/Makefile.am | 45 +
b/support/nsm/file.c | 1067 +++++++++++++++++++++++++++++++++
b/support/nsm/rpc.c | 534 ++++++++++++++++
b/support/nsm/sm_inter.x | 131 ++++
b/tests/Makefile.am | 13
b/tests/nsm_client/Makefile.am | 45 +
b/tests/nsm_client/README | 12
b/tests/nsm_client/nlm_sm_inter.x | 43 +
b/tests/nsm_client/nsm_client.c | 465 ++++++++++++++
b/tests/statdb_dump.c | 99 +++
b/tests/t0001-statd-basic-mon-unmon.sh | 58 +
b/tests/test-lib.sh | 60 +
b/utils/gssd/gssd.c | 6
b/utils/gssd/gssd.h | 12
b/utils/gssd/gssd_main_loop.c | 102 ++-
b/utils/gssd/gssd_proc.c | 424 ++++++++++---
b/utils/gssd/krb5_util.c | 57 +
b/utils/gssd/krb5_util.h | 3
b/utils/gssd/svcgssd_proc.c | 94 ++
b/utils/mount/mount.c | 3
b/utils/mount/network.c | 141 ++--
b/utils/mount/network.h | 5
b/utils/mount/nfs.man | 104 ++-
b/utils/mount/nfs4mount.c | 25
b/utils/mount/nfsmount.c | 7
b/utils/mount/nfsumount.c | 15
b/utils/mount/stropts.c | 126 ++-
b/utils/mountd/Makefile.am | 2
b/utils/mountd/auth.c | 115 ++-
b/utils/mountd/cache.c | 129 ++-
b/utils/mountd/mountd.c | 156 ++--
b/utils/mountd/rmtab.c | 30
b/utils/mountd/v4root.c | 196 ++++++
b/utils/nfsd/nfssvc.c | 2
b/utils/showmount/showmount.c | 37 -
b/utils/statd/Makefile.am | 22
b/utils/statd/callback.c | 78 ++
b/utils/statd/hostname.c | 284 ++++++++
b/utils/statd/misc.c | 30
b/utils/statd/monitor.c | 235 ++-----
b/utils/statd/notlist.c | 5
b/utils/statd/notlist.h | 6
b/utils/statd/rmtcall.c | 215 +-----
b/utils/statd/simu.c | 37 -
b/utils/statd/simulate.c | 52 -
b/utils/statd/sm-notify.c | 885 +++++++++++----------------
b/utils/statd/sm-notify.man | 411 ++++++++----
b/utils/statd/stat.c | 19
b/utils/statd/statd.c | 195 +-----
b/utils/statd/statd.h | 39 -
b/utils/statd/statd.man | 508 +++++++++++----
b/utils/statd/svc_run.c | 7
utils/statd/log.c | 95 --
utils/statd/log.h | 42 -
utils/statd/sm_inter.x | 131 ----
utils/statd/version.h | 7
78 files changed, 6446 insertions(+), 2291 deletions(-)
--- NEW FILE nfs-utils-1.2.2-rc7.patch ---
diff --git a/.gitignore b/.gitignore
index 632609e..4bff9e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,10 +55,15 @@ support/export/mount.h
support/export/mount_clnt.c
support/export/mount_xdr.c
support/include/mount.h
-utils/statd/sm_inter.h
-utils/statd/sm_inter_clnt.c
-utils/statd/sm_inter_svc.c
-utils/statd/sm_inter_xdr.c
+support/nsm/sm_inter.h
+support/nsm/sm_inter_clnt.c
+support/nsm/sm_inter_svc.c
+support/nsm/sm_inter_xdr.c
+support/include/sm_inter.h
+tests/nsm_client/nlm_sm_inter.h
+tests/nsm_client/nlm_sm_inter_clnt.c
+tests/nsm_client/nlm_sm_inter_svc.c
+tests/nsm_client/nlm_sm_inter_xdr.c
# cscope database files
cscope.*
# generic editor backup et al
diff --git a/Makefile.am b/Makefile.am
index b3a6e91..ae7cd16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = tools support utils linux-nfs
+SUBDIRS = tools support utils linux-nfs tests
MAINTAINERCLEANFILES = Makefile.in
diff --git a/aclocal/libcap.m4 b/aclocal/libcap.m4
new file mode 100644
index 0000000..eabe507
--- /dev/null
+++ b/aclocal/libcap.m4
@@ -0,0 +1,15 @@
+dnl Checks for libcap.so
+dnl
+AC_DEFUN([AC_LIBCAP], [
+
+ dnl look for prctl
+ AC_CHECK_FUNC([prctl], , )
+
+ dnl look for the library; do not add to LIBS if found
+ AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,)
+ AC_SUBST(LIBCAP)
+
+ AC_CHECK_HEADERS([sys/capability.h], ,
+ [AC_MSG_ERROR([libcap headers not found.])])
+
+])dnl
diff --git a/configure.ac b/configure.ac
index 3ad415c..c77c5ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,9 @@ fi
dnl Check for TI-RPC library and headers
AC_LIBTIRPC
+dnl Check for -lcap
+AC_LIBCAP
+
# Check whether user wants TCP wrappers support
AC_TCP_WRAPPERS
@@ -402,6 +405,7 @@ AC_CONFIG_FILES([
support/include/Makefile
support/misc/Makefile
support/nfs/Makefile
+ support/nsm/Makefile
tools/Makefile
tools/locktest/Makefile
tools/nlmtest/Makefile
@@ -416,6 +420,8 @@ AC_CONFIG_FILES([
utils/nfsd/Makefile
utils/nfsstat/Makefile
utils/showmount/Makefile
- utils/statd/Makefile])
+ utils/statd/Makefile
+ tests/Makefile
+ tests/nsm_client/Makefile])
AC_OUTPUT
diff --git a/support/Makefile.am b/support/Makefile.am
index aa4d692..cb37733 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = export include misc nfs
+SUBDIRS = export include misc nfs nsm
MAINTAINERCLEANFILES = Makefile.in
diff --git a/support/export/client.c b/support/export/client.c
index 5fcf355..6236561 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -297,7 +297,7 @@ name_cmp(char *a, char *b)
/* compare strings a and b, but only upto ',' in a */
while (*a && *b && *a != ',' && *a == *b)
a++, b++;
- if (!*b && (!*a || !a == ',') )
+ if (!*b && (!*a || *a == ','))
return 0;
if (!*b) return 1;
if (!*a || *a == ',') return -1;
diff --git a/support/export/export.c b/support/export/export.c
index e5e6cb0..2943466 100644
--- a/support/export/export.c
+++ b/support/export/export.c
@@ -28,6 +28,22 @@ static int export_check(nfs_export *, struct hostent *, char *);
static nfs_export *
export_allowed_internal(struct hostent *hp, char *path);
+static void warn_duplicated_exports(nfs_export *exp, struct exportent *eep)
+{
+ if (exp->m_export.e_flags != eep->e_flags) {
+ xlog(L_ERROR, "incompatible duplicated export entries:");
+ xlog(L_ERROR, "\t%s:%s (0x%x) [IGNORED]", eep->e_hostname,
+ eep->e_path, eep->e_flags);
+ xlog(L_ERROR, "\t%s:%s (0x%x)", exp->m_export.e_hostname,
+ exp->m_export.e_path, exp->m_export.e_flags);
+ } else {
+ xlog(L_ERROR, "duplicated export entries:");
+ xlog(L_ERROR, "\t%s:%s", eep->e_hostname, eep->e_path);
+ xlog(L_ERROR, "\t%s:%s", exp->m_export.e_hostname,
+ exp->m_export.e_path);
+ }
+}
+
int
export_read(char *fname)
{
@@ -36,27 +52,13 @@ export_read(char *fname)
setexportent(fname, "r");
while ((eep = getexportent(0,1)) != NULL) {
- exp = export_lookup(eep->e_hostname, eep->e_path, 0);
- if (!exp)
- export_create(eep,0);
- else {
- if (exp->m_export.e_flags != eep->e_flags) {
- xlog(L_ERROR, "incompatible duplicated export entries:");
- xlog(L_ERROR, "\t%s:%s (0x%x) [IGNORED]", eep->e_hostname,
- eep->e_path, eep->e_flags);
- xlog(L_ERROR, "\t%s:%s (0x%x)", exp->m_export.e_hostname,
- exp->m_export.e_path, exp->m_export.e_flags);
- }
- else {
- xlog(L_ERROR, "duplicated export entries:");
- xlog(L_ERROR, "\t%s:%s", eep->e_hostname, eep->e_path);
- xlog(L_ERROR, "\t%s:%s", exp->m_export.e_hostname,
- exp->m_export.e_path);
- }
- }
+ exp = export_lookup(eep->e_hostname, eep->e_path, 0);
+ if (!exp)
+ export_create(eep, 0);
+ else
+ warn_duplicated_exports(exp, eep);
}
endexportent();
-
return 0;
}
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 3b1dcce..2a43193 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -19,7 +19,9 @@
#include "exportfs.h"
#include "xio.h"
#include "xlog.h"
+#include "v4root.h"
+int v4root_needed;
static void cond_rename(char *newfile, char *oldfile);
static int
@@ -36,6 +38,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
if ((lockid = xflock(lockfn, "r")) < 0)
return 0;
setexportent(xtab, "r");
+ if (is_export == 1)
+ v4root_needed = 1;
while ((xp = getexportent(is_export==0, 0)) != NULL) {
if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
!(exp = export_create(xp, is_export!=1))) {
@@ -48,6 +52,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
[...11182 lines suppressed...]
.B tcp_wrapper
-library. You have to give the clients access to
-.B rpc.statd
-if they should be allowed to use it. To allow connects from clients of
-the .bar.com domain you could use the following line in /etc/hosts.allow:
-
-statd: .bar.com
-
-You have to use the daemon name
+library, add the hostnames of peers that should be allowed access to
+.IR /etc/hosts.allow .
+Use the daemon name
.B statd
-for the daemon name (even if the binary has a different name).
-
-For further information please have a look at the
+even if the
+.B rpc.statd
+binary has a different filename.
+.P
+For further information see the
.BR tcpd (8)
and
.BR hosts_access (5)
-manual pages.
-
-.SH SIGNALS
-.BR SIGUSR1
-causes
-.B rpc.statd
-to re-read the notify list from disk
-and send notifications to clients. This can be used in High Availability NFS
-(HA-NFS) environments to notify clients to reacquire file locks upon takeover
-of an NFS export from another server.
-
+man pages.
+.SH ADDITIONAL NOTES
+Lock recovery after a reboot is critical to maintaining data integrity
+and preventing unnecessary application hangs.
+.PP
+To help
+.B rpc.statd
+match SM_NOTIFY requests to NLM requests, a number of best practices
+should be observed, including:
+.IP
+The UTS nodename of your systems should match the DNS names that NFS
+peers use to contact them
+.IP
+The UTS nodenames of your systems should always be fully qualified domain names
+.IP
+The forward and reverse DNS mapping of the UTS nodenames should be
+consistent
+.IP
+The hostname the client uses to mount the server should match the server's
+.I mon_name
+in SM_NOTIFY requests it sends
+.IP
+The use of network addresses as a
+.I mon_name
+or a
+.I my_name
+string should be avoided when
+interoperating with non-Linux NFS implementations.
+.PP
+Unmounting an NFS file system does not necessarily stop
+either the NFS client or server from monitoring each other.
+Both may continue monitoring each other for a time in case subsequent
+NFS traffic between the two results in fresh mounts and additional
+file locking.
+.PP
+On Linux, if the
+.B lockd
+kernel module is unloaded during normal operation,
+all remote NFS peers are unmonitored.
+This can happen on an NFS client, for example,
+if an automounter removes all NFS mount
+points due to inactivity.
+.SS High-availability callouts
+.B rpc.statd
+can exec a special callout program during processing of
+successful SM_MON, SM_UNMON, and SM_UNMON_ALL requests.
+Such a program may be used in High Availability NFS (HA-NFS)
+environments to track lock state that may need to be migrated after
+a system reboot.
+.PP
+The name of the callout program is specified with the
+.B -H
+option.
+The program is run with 3 arguments:
+The first is either
+.B add-client
+or
+.B del-client
+depending on the reason for the callout.
+The second is the
+.I mon_name
+of the monitored peer.
+The third is the
+.I caller_name
+of the requesting lock manager.
+.SS IPv6 and TI-RPC support
+TI-RPC is a pre-requisite for supporting NFS on IPv6.
+If TI-RPC support is built into
+.BR rpc.statd ,
+it attempts to start listeners on network transports marked
+'visible' in
+.IR /etc/netconfig .
+As long as at least one network transport listener starts successfully,
+.B rpc.statd
+will operate.
.SH FILES
-.BR /var/lib/nfs/state
+.TP 2.5i
+.I /var/lib/nfs/sm
+directory containing monitor list
+.TP 2.5i
+.I /var/lib/nfs/sm.bak
+directory containing notify list
+.TP 2.5i
+.I /var/lib/nfs/state
+NSM state number for this host
+.TP 2.5i
+.I /var/run/run.statd.pid
+pid file
+.TP 2.5i
+.I /etc/netconfig
+network transport capability database
+.SH SEE ALSO
+.BR sm-notify (8),
+.BR nfs (5),
+.BR rpc.nfsd (8),
+.BR rpcbind (8),
+.BR tcpd (8),
+.BR hosts_access (5),
+.BR iptables (8),
+.BR netconfig (5)
+.sp
+RFC 1094 - "NFS: Network File System Protocol Specification"
.br
-.BR /var/lib/nfs/sm/*
+RFC 1813 - "NFS Version 3 Protocol Specification"
.br
-.BR /var/lib/nfs/sm.bak/*
-.SH SEE ALSO
-.BR rpc.nfsd(8),
-.BR portmap(8)
+OpenGroup Protocols for Interworking: XNFS, Version 3W - Chapter 11
.SH AUTHORS
-.br
Jeff Uphoff <juphoff at users.sourceforge.net>
.br
Olaf Kirch <okir at monad.swb.de>
@@ -195,3 +407,5 @@ H.J. Lu <hjl at gnu.org>
Lon Hohberger <hohberger at missioncriticallinux.com>
.br
Paul Clements <paul.clements at steeleye.com>
+.br
+Chuck Lever <chuck.lever at oracle.com>
diff --git a/utils/statd/svc_run.c b/utils/statd/svc_run.c
index 14ee663..d98ecee 100644
--- a/utils/statd/svc_run.c
+++ b/utils/statd/svc_run.c
@@ -101,12 +101,12 @@ my_svc_run(void)
tv.tv_sec = NL_WHEN(notify) - now;
tv.tv_usec = 0;
- dprintf(N_DEBUG, "Waiting for reply... (timeo %d)",
+ xlog(D_GENERAL, "Waiting for reply... (timeo %d)",
tv.tv_sec);
selret = select(FD_SETSIZE, &readfds,
(void *) 0, (void *) 0, &tv);
} else {
- dprintf(N_DEBUG, "Waiting for client connections.");
+ xlog(D_GENERAL, "Waiting for client connections");
selret = select(FD_SETSIZE, &readfds,
(void *) 0, (void *) 0, (struct timeval *) 0);
}
@@ -116,8 +116,7 @@ my_svc_run(void)
if (errno == EINTR || errno == ECONNREFUSED
|| errno == ENETUNREACH || errno == EHOSTUNREACH)
continue;
- note(N_ERROR, "my_svc_run() - select: %s",
- strerror (errno));
+ xlog(L_ERROR, "my_svc_run() - select: %m");
return;
case 0:
diff --git a/utils/statd/version.h b/utils/statd/version.h
deleted file mode 100644
index 12f16bd..0000000
--- a/utils/statd/version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (C) 1997-1999 Jeffrey A. Uphoff
- *
- * NSM for Linux.
- */
-
-#define STATD_RELEASE "1.1.1"
nfs-utils-1.2.1-statdpath.patch:
configure.ac | 11 +++++++++++
support/nsm/file.c | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
Index: nfs-utils-1.2.1-statdpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.1-statdpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.1-statdpath.patch 14 Jan 2010 09:27:24 -0000 1.1
+++ nfs-utils-1.2.1-statdpath.patch 16 Jan 2010 12:32:42 -0000 1.2
@@ -1,6 +1,6 @@
diff -up nfs-utils-1.2.1/configure.ac.orig nfs-utils-1.2.1/configure.ac
---- nfs-utils-1.2.1/configure.ac.orig 2010-01-13 17:23:17.089961251 -0500
-+++ nfs-utils-1.2.1/configure.ac 2010-01-13 17:24:00.144003829 -0500
+--- nfs-utils-1.2.1/configure.ac.orig 2010-01-15 11:10:25.080854089 -0500
++++ nfs-utils-1.2.1/configure.ac 2010-01-15 11:11:03.872749424 -0500
@@ -22,6 +22,14 @@ AC_ARG_WITH(statedir,
statedir=$withval,
statedir=/var/lib/nfs)
@@ -16,7 +16,7 @@ diff -up nfs-utils-1.2.1/configure.ac.or
AC_ARG_WITH(statduser,
[AC_HELP_STRING([--with-statduser=rpcuser],
[statd to run under @<:@rpcuser or nobody@:>@]
-@@ -347,6 +355,9 @@ dnl ************************************
+@@ -350,6 +358,9 @@ dnl ************************************
dnl Export some path names to config.h
dnl *************************************************************
AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir", [This defines the location of the NFS state files. Warning: this must match definitions in config.mk!])
@@ -27,9 +27,9 @@ diff -up nfs-utils-1.2.1/configure.ac.or
if test "x$cross_compiling" = "xno"; then
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
diff -up nfs-utils-1.2.1/support/nsm/file.c.orig nfs-utils-1.2.1/support/nsm/file.c
---- nfs-utils-1.2.1/support/nsm/file.c.orig 2010-01-13 17:23:17.099961228 -0500
-+++ nfs-utils-1.2.1/support/nsm/file.c 2010-01-13 17:26:44.476815932 -0500
-@@ -91,12 +91,13 @@
+--- nfs-utils-1.2.1/support/nsm/file.c.orig 2010-01-15 11:10:25.086884939 -0500
++++ nfs-utils-1.2.1/support/nsm/file.c 2010-01-15 11:11:03.873769833 -0500
+@@ -93,12 +93,13 @@
#define NSM_KERNEL_STATE_FILE "/proc/sys/fs/nfs/nsm_local_state"
/*
@@ -48,30 +48,3 @@ diff -up nfs-utils-1.2.1/support/nsm/fil
static char nsm_base_dirname[PATH_MAX] = NSM_DEFAULT_STATEDIR;
-diff -up nfs-utils-1.2.1/utils/statd/statd.man.orig nfs-utils-1.2.1/utils/statd/statd.man
---- nfs-utils-1.2.1/utils/statd/statd.man.orig 2009-11-04 06:13:56.000000000 -0500
-+++ nfs-utils-1.2.1/utils/statd/statd.man 2010-01-13 17:23:41.110003469 -0500
-@@ -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 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
-+.BR /var/lib/nfs/statd/sm/state
- .br
--.BR /var/lib/nfs/sm/*
-+.BR /var/lib/nfs/statd/sm/*
- .br
--.BR /var/lib/nfs/sm.bak/*
-+.BR /var/lib/nfs/statd/sm.bak/*
- .SH SEE ALSO
- .BR rpc.nfsd(8),
- .BR portmap(8)
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- nfs-utils.spec 14 Jan 2010 09:27:25 -0000 1.262
+++ nfs-utils.spec 16 Jan 2010 12:32:42 -0000 1.263
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -18,13 +18,12 @@ Source13: rpcgssd.init
Source14: rpcsvcgssd.init
Source15: nfs.sysconfig
-Patch01: nfs-utils-1.1.0-smnotify-path.patch
-Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
+Patch000: nfs-utils-1.2.2-rc7.patch
+Patch001: nfs-utils-1.2.1-compile.patch
+Patch002: nfs-utils-1.2.1-statdpath.patch
-Patch100: nfs-utils-1.2.2-rc6.patch
-Patch101: nfs-utils-1.2.1-compile.patch
-
-Patch200: nfs-utils-1.2.1-statdpath.patch
+Patch100: nfs-utils-1.2.1-statdpath-man.patch
+Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -48,7 +47,7 @@ License: MIT and GPLv2 and GPLv2+ and BS
Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
Requires: modutils >= 2.4.26-9
-BuildRequires: libgssglue-devel libevent-devel
+BuildRequires: libgssglue-devel libevent-devel libcap-devel
BuildRequires: nfs-utils-lib-devel >= 1.1.0-3 libtirpc-devel libblkid-devel
BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
BuildRequires: automake, libtool, glibc-headers
@@ -56,7 +55,7 @@ BuildRequires: e2fsprogs-devel, krb5-dev
Requires(pre): shadow-utils >= 4.0.3-25
Requires(pre): /sbin/chkconfig /sbin/nologin
Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent
-Requires: libtirpc libblkid
+Requires: libtirpc libblkid libcap
%description
The nfs-utils package provides a daemon for the kernel NFS server and
@@ -72,14 +71,14 @@ This package also contains the mount.nfs
%prep
%setup -q
-%patch01 -p1
-%patch02 -p1
+
+%patch000 -p1
+%patch001 -p1
+%patch002 -p1
%patch100 -p1
%patch101 -p1
-%patch200 -p1
-
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -251,6 +250,10 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Sat Jan 16 2010 Steve Dickson <steved at redhat.com> 1.2.1-11
+- Updated to latest upstream RC release: nfs-utils-1-2-2-rc7
+ which includes Ipv6 support for statd (disabled by default).
+
* Thu Jan 14 2010 Steve Dickson <steved at redhat.com> 1.2.1-10
- Updated to the latest pseudo root release (rel10) which
containts the upstream pseudo root release
--- nfs-utils-1.1.0-exp-subtree-warn-off.patch DELETED ---
--- nfs-utils-1.1.0-smnotify-path.patch DELETED ---
--- nfs-utils-1.2.2-rc6.patch DELETED ---
- Previous message: rpms/hercstudio/EL-5 hercstudio-vector.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hercstudio-qt42.patch, 1.1, 1.2 hercstudio.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel9.patch,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list