rpms/nfs-utils/devel nfs-utils-1.2.2-statdpath.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 nfs-utils.spec, 1.269, 1.270 sources, 1.29, 1.30 nfs-utils-1.2.1-default-family.patch, 1.1, NONE nfs-utils-1.2.1-statd-null-addrs.patch, 1.1, NONE nfs-utils-1.2.1-statdpath.patch, 1.2, NONE nfs-utils-1.2.2-rc9.patch, 1.1, NONE
Steve Dickson
steved at fedoraproject.org
Thu Feb 18 15:02:14 UTC 2010
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317
Modified Files:
.cvsignore nfs-utils.spec sources
Added Files:
nfs-utils-1.2.2-statdpath.patch
Removed Files:
nfs-utils-1.2.1-default-family.patch
nfs-utils-1.2.1-statd-null-addrs.patch
nfs-utils-1.2.1-statdpath.patch nfs-utils-1.2.2-rc9.patch
Log Message:
Updated to latest upstream version: 1.2.2
nfs-utils-1.2.2-statdpath.patch:
configure.ac | 11 +++++++++++
support/nsm/file.c | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
--- NEW FILE nfs-utils-1.2.2-statdpath.patch ---
diff -up nfs-utils-1.2.2/configure.ac.orig nfs-utils-1.2.2/configure.ac
--- nfs-utils-1.2.2/configure.ac.orig 2010-02-18 07:35:00.000000000 -0500
+++ nfs-utils-1.2.2/configure.ac 2010-02-18 09:15:24.710128679 -0500
@@ -22,6 +22,14 @@ AC_ARG_WITH(statedir,
statedir=$withval,
statedir=/var/lib/nfs)
AC_SUBST(statedir)
+AC_ARG_WITH(statdpath,
+ [AC_HELP_STRING([--with-statdpath=/foo],
+ [Causes statd put it's state file in /foo instead of statedir]
+ )],
+ statdpath=$withval,
+ statdpath=""
+ )
+ AC_SUBST(statdpath)
AC_ARG_WITH(statduser,
[AC_HELP_STRING([--with-statduser=rpcuser],
[statd to run under @<:@rpcuser or nobody@:>@]
@@ -364,6 +372,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!])
+if test "$statdpath" != ""; then
+ AC_DEFINE_UNQUOTED(NSM_STATD_PATH, "$statdpath", [Define this if you what statd file placed in somewhere other than NFS_STATEDIR])
+fi
if test "x$cross_compiling" = "xno"; then
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
diff -up nfs-utils-1.2.2/support/nsm/file.c.orig nfs-utils-1.2.2/support/nsm/file.c
--- nfs-utils-1.2.2/support/nsm/file.c.orig 2010-02-18 07:35:00.000000000 -0500
+++ nfs-utils-1.2.2/support/nsm/file.c 2010-02-18 09:15:24.711128045 -0500
@@ -93,12 +93,13 @@
#define NSM_KERNEL_STATE_FILE "/proc/sys/fs/nfs/nsm_local_state"
/*
- * Some distributions place statd's files in a subdirectory
+ * Allow different places for statd's files
*/
-#define NSM_PATH_EXTENSION
-/* #define NSM_PATH_EXTENSION "/statd" */
-
-#define NSM_DEFAULT_STATEDIR NFS_STATEDIR NSM_PATH_EXTENSION
+#ifdef NSM_STATD_PATH
+#define NSM_DEFAULT_STATEDIR NSM_STATD_PATH
+#else
+#define NSM_DEFAULT_STATEDIR NFS_STATEDIR
+#endif
static char nsm_base_dirname[PATH_MAX] = NSM_DEFAULT_STATEDIR;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore 4 Nov 2009 13:14:45 -0000 1.28
+++ .cvsignore 18 Feb 2010 15:02:13 -0000 1.29
@@ -2,3 +2,4 @@ nfs.doc.tar.gz
nfs-utils-1.1.6.tar.bz2
nfs-utils-1.2.0.tar.bz2
nfs-utils-1.2.1.tar.bz2
+nfs-utils-1.2.2.tar.bz2
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- nfs-utils.spec 28 Jan 2010 19:46:49 -0000 1.269
+++ nfs-utils.spec 18 Feb 2010 15:02:14 -0000 1.270
@@ -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.2.1
-Release: 17%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -18,13 +18,9 @@ Source13: rpcgssd.init
Source14: rpcsvcgssd.init
Source15: nfs.sysconfig
-Patch000: nfs-utils-1.2.2-rc9.patch
-Patch001: nfs-utils-1.2.1-statdpath.patch
-Patch002: nfs-utils-1.2.1-default-family.patch
-Patch003: nfs-utils-1.2.1-statd-null-addrs.patch
-
Patch100: nfs-utils-1.2.1-statdpath-man.patch
-Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
+Patch101: nfs-utils-1.2.2-statdpath.patch
+Patch102: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -73,13 +69,9 @@ This package also contains the mount.nfs
%prep
%setup -q
-%patch000 -p1
-%patch001 -p1
-%patch002 -p1
-%patch003 -p1
-
%patch100 -p1
%patch101 -p1
+%patch102 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -100,9 +92,9 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_F
CFLAGS="$CFLAGS" \
CPPFLAGS="$DEFINES" \
LDFLAGS="-pie" \
- --enable-mount \
--enable-mountconfig \
--enable-ipv6 \
+ --enable-nfsv41 \
--with-statdpath=/var/lib/nfs/statd
make all
@@ -253,6 +245,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Thu Feb 18 2010 Steve Dickson <steved at redhat.com> 1.2.2-1
+- Updated to latest upstream version: 1.2.2
+
* Thu Jan 28 2010 Steve Dickson <steved at redhat.com> 1.2.1-17
- Backed out the "Don't fail mounts when /etc/netconfig is
nonexistent" patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 4 Nov 2009 13:14:46 -0000 1.29
+++ sources 18 Feb 2010 15:02:14 -0000 1.30
@@ -1,2 +1,2 @@
ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz
-c3ccd16c147befd49fe4541a506dd177 nfs-utils-1.2.1.tar.bz2
+dad92f64db3266c7757f71bb53ee8f35 nfs-utils-1.2.2.tar.bz2
--- nfs-utils-1.2.1-default-family.patch DELETED ---
--- nfs-utils-1.2.1-statd-null-addrs.patch DELETED ---
--- nfs-utils-1.2.1-statdpath.patch DELETED ---
--- nfs-utils-1.2.2-rc9.patch DELETED ---
More information about the scm-commits
mailing list