rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Added upstream 1.2.1-rc4 patch

Browse Source 
- Fix bug when both crossmnt
- nfs(5): Add description of lookupcache mount option
- nfs(5): Remove trailing blanks
- Added nfs41 support to nfssat
- Added support for mount to us a configuration file.
This commit is contained in:
Steve Dickson 2009-08-17 13:21:50 +00:00
parent cd87151ef6
commit 7a30154920
3 changed files with 3649 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
nfs-utils-1.2.0-proots-rel5.patch
View File

@ -1,6 +1,6 @@
diff -up nfs-utils-1.2.0/support/export/xtab.c.save nfs-utils-1.2.0/support/export/xtab.c diff -up nfs-utils-1.2.0/support/export/xtab.c.orig nfs-utils-1.2.0/support/export/xtab.c
--- nfs-utils-1.2.0/support/export/xtab.c.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/support/export/xtab.c.orig 2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/support/export/xtab.c 2009-07-13 13:50:38.000000000 -0400 +++ nfs-utils-1.2.0/support/export/xtab.c 2009-08-17 07:33:13.000000000 -0400
@@ -19,7 +19,9 @@ @@ -19,7 +19,9 @@
#include "exportfs.h" #include "exportfs.h"
#include "xio.h" #include "xio.h"
@ -29,9 +29,9 @@ diff -up nfs-utils-1.2.0/support/export/xtab.c.save nfs-utils-1.2.0/support/expo
break; break;
case 2: case 2:
exp->m_exported = -1;/* may be exported */ exp->m_exported = -1;/* may be exported */
diff -up nfs-utils-1.2.0/support/include/exportfs.h.save nfs-utils-1.2.0/support/include/exportfs.h diff -up nfs-utils-1.2.0/support/include/exportfs.h.orig nfs-utils-1.2.0/support/include/exportfs.h
--- nfs-utils-1.2.0/support/include/exportfs.h.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/support/include/exportfs.h.orig 2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/support/include/exportfs.h 2009-07-13 13:49:51.000000000 -0400 +++ nfs-utils-1.2.0/support/include/exportfs.h 2009-08-17 07:33:13.000000000 -0400
@@ -12,6 +12,17 @@ @@ -12,6 +12,17 @@
#include <netdb.h> #include <netdb.h>
#include "nfslib.h" #include "nfslib.h"
@ -50,9 +50,9 @@ diff -up nfs-utils-1.2.0/support/include/exportfs.h.save nfs-utils-1.2.0/support
enum { enum {
MCL_FQDN = 0, MCL_FQDN = 0,
MCL_SUBNETWORK, MCL_SUBNETWORK,
diff -up nfs-utils-1.2.0/support/include/nfs/export.h.save nfs-utils-1.2.0/support/include/nfs/export.h diff -up nfs-utils-1.2.0/support/include/nfs/export.h.orig nfs-utils-1.2.0/support/include/nfs/export.h
--- nfs-utils-1.2.0/support/include/nfs/export.h.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/support/include/nfs/export.h.orig 2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfs/export.h 2009-07-13 13:49:51.000000000 -0400 +++ nfs-utils-1.2.0/support/include/nfs/export.h 2009-08-17 07:33:13.000000000 -0400
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#define NFSEXP_FSID 0x2000 #define NFSEXP_FSID 0x2000
#define NFSEXP_CROSSMOUNT 0x4000 #define NFSEXP_CROSSMOUNT 0x4000
@ -62,9 +62,9 @@ diff -up nfs-utils-1.2.0/support/include/nfs/export.h.save nfs-utils-1.2.0/suppo
+#define NFSEXP_ALLFLAGS 0x1FFFF +#define NFSEXP_ALLFLAGS 0x1FFFF
#endif /* _NSF_EXPORT_H */ #endif /* _NSF_EXPORT_H */
diff -up nfs-utils-1.2.0/support/include/nfslib.h.save nfs-utils-1.2.0/support/include/nfslib.h diff -up nfs-utils-1.2.0/support/include/nfslib.h.orig nfs-utils-1.2.0/support/include/nfslib.h
--- nfs-utils-1.2.0/support/include/nfslib.h.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/support/include/nfslib.h.orig 2009-08-17 07:31:52.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfslib.h 2009-07-13 13:49:51.000000000 -0400 +++ nfs-utils-1.2.0/support/include/nfslib.h 2009-08-17 07:33:13.000000000 -0400
@@ -88,6 +88,7 @@ struct exportent { @@ -88,6 +88,7 @@ struct exportent {
int e_fslocmethod; int e_fslocmethod;
char * e_fslocdata; char * e_fslocdata;
@ -74,8 +74,8 @@ diff -up nfs-utils-1.2.0/support/include/nfslib.h.save nfs-utils-1.2.0/support/i
}; };
diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h
--- /dev/null 2009-07-13 07:44:43.606003629 -0400 --- /dev/null 2009-08-13 17:25:29.612003011 -0400
+++ nfs-utils-1.2.0/support/include/v4root.h 2009-07-13 13:49:57.000000000 -0400 +++ nfs-utils-1.2.0/support/include/v4root.h 2009-08-17 07:33:13.000000000 -0400
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+/* +/*
+ * Copyright (C) 2009 Red Hat <nfs@redhat.com> + * Copyright (C) 2009 Red Hat <nfs@redhat.com>
@ -97,9 +97,9 @@ diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h
+extern void v4root_unset(void), v4root_set(void); +extern void v4root_unset(void), v4root_set(void);
+ +
+#endif /* V4ROOT_H */ +#endif /* V4ROOT_H */
diff -up nfs-utils-1.2.0/utils/mountd/auth.c.save nfs-utils-1.2.0/utils/mountd/auth.c diff -up nfs-utils-1.2.0/utils/mountd/auth.c.orig nfs-utils-1.2.0/utils/mountd/auth.c
--- nfs-utils-1.2.0/utils/mountd/auth.c.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/utils/mountd/auth.c.orig 2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/auth.c 2009-07-13 13:50:38.000000000 -0400 +++ nfs-utils-1.2.0/utils/mountd/auth.c 2009-08-17 07:33:13.000000000 -0400
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "exportfs.h" #include "exportfs.h"
#include "mountd.h" #include "mountd.h"
@ -122,9 +122,9 @@ diff -up nfs-utils-1.2.0/utils/mountd/auth.c.save nfs-utils-1.2.0/utils/mountd/a
++counter; ++counter;
return counter; return counter;
diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/cache.c diff -up nfs-utils-1.2.0/utils/mountd/cache.c.orig nfs-utils-1.2.0/utils/mountd/cache.c
--- nfs-utils-1.2.0/utils/mountd/cache.c.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/utils/mountd/cache.c.orig 2009-08-17 07:31:52.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/cache.c 2009-07-13 13:50:33.000000000 -0400 +++ nfs-utils-1.2.0/utils/mountd/cache.c 2009-08-17 07:33:13.000000000 -0400
@@ -32,23 +32,12 @@ @@ -32,23 +32,12 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "fsloc.h" #include "fsloc.h"
@ -196,16 +196,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/
if (found) if (found)
if (cache_export_ent(dom, found, found_path) < 0) if (cache_export_ent(dom, found, found_path) < 0)
found = 0; found = 0;
@@ -590,7 +603,7 @@ static int dump_to_cache(FILE *f, char * @@ -629,6 +642,7 @@ void nfsd_export(FILE *f)
qword_printint(f, time(0)+30*60);
if (exp) {
int different_fs = strcmp(path, exp->e_path) != 0;
-
+
if (different_fs)
qword_printint(f, exp->e_flags & ~NFSEXP_FSID);
else
@@ -631,6 +644,7 @@ void nfsd_export(FILE *f)
int found_type = 0; int found_type = 0;
struct in_addr addr; struct in_addr addr;
struct hostent *he = NULL; struct hostent *he = NULL;
@ -213,7 +204,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/
if (readline(fileno(f), &lbuf, &lbuflen) != 1) if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -665,10 +679,18 @@ void nfsd_export(FILE *f) @@ -663,10 +677,18 @@ void nfsd_export(FILE *f)
path[l] == '/' && path[l] == '/' &&
is_mountpoint(path))) is_mountpoint(path)))
/* ok */; /* ok */;
@ -234,7 +225,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/
if (use_ipaddr) { if (use_ipaddr) {
if (he == NULL) { if (he == NULL) {
if (!inet_aton(dom, &addr)) if (!inet_aton(dom, &addr))
@@ -707,17 +729,28 @@ void nfsd_export(FILE *f) @@ -705,17 +727,28 @@ void nfsd_export(FILE *f)
} }
if (found) { if (found) {
@ -265,7 +256,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/
if (dom) free(dom); if (dom) free(dom);
if (path) free(path); if (path) free(path);
if (he) free(he); if (he) free(he);
@@ -745,7 +778,9 @@ void cache_open(void) @@ -743,7 +776,9 @@ void cache_open(void)
if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid) if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
continue; continue;
sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name); sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
@ -276,9 +267,9 @@ diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/
} }
} }
diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.save nfs-utils-1.2.0/utils/mountd/Makefile.am diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.orig nfs-utils-1.2.0/utils/mountd/Makefile.am
--- nfs-utils-1.2.0/utils/mountd/Makefile.am.save 2009-07-13 13:49:23.000000000 -0400 --- nfs-utils-1.2.0/utils/mountd/Makefile.am.orig 2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/Makefile.am 2009-07-13 13:49:57.000000000 -0400 +++ nfs-utils-1.2.0/utils/mountd/Makefile.am 2009-08-17 07:33:13.000000000 -0400
@@ -8,7 +8,7 @@ KPREFIX = @kprefix@ @@ -8,7 +8,7 @@ KPREFIX = @kprefix@
sbin_PROGRAMS = mountd sbin_PROGRAMS = mountd
@ -289,8 +280,8 @@ diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.save nfs-utils-1.2.0/utils/mou
../../support/nfs/libnfs.a \ ../../support/nfs/libnfs.a \
../../support/misc/libmisc.a \ ../../support/misc/libmisc.a \
diff -up /dev/null nfs-utils-1.2.0/utils/mountd/v4root.c diff -up /dev/null nfs-utils-1.2.0/utils/mountd/v4root.c
--- /dev/null 2009-07-13 07:44:43.606003629 -0400 --- /dev/null 2009-08-13 17:25:29.612003011 -0400
+++ nfs-utils-1.2.0/utils/mountd/v4root.c 2009-07-13 13:50:44.000000000 -0400 +++ nfs-utils-1.2.0/utils/mountd/v4root.c 2009-08-17 07:33:13.000000000 -0400
@@ -0,0 +1,409 @@ @@ -0,0 +1,409 @@
+/* +/*
+ * Copyright (C) 2009 Red Hat <nfs@redhat.com> + * Copyright (C) 2009 Red Hat <nfs@redhat.com>

3601
nfs-utils-1.2.1-rc4.patch Normal file
View File

File diff suppressed because it is too large Load Diff

23
nfs-utils.spec
View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 1.2.0 Version: 1.2.0
Release: 9%{?dist} Release: 10%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -24,8 +24,10 @@ Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
Patch100: nfs-utils-1.2.1-rc1.patch Patch100: nfs-utils-1.2.1-rc1.patch
Patch101: nfs-utils-1.2.1-rc2.patch Patch101: nfs-utils-1.2.1-rc2.patch
Patch102: nfs-utils-1.2.0-proots-rel5.patch Patch102: nfs-utils-1.2.1-rc3.patch
Patch103: nfs-utils-1.2.1-rc3.patch Patch103: nfs-utils-1.2.1-rc4.patch
Patch200: nfs-utils-1.2.0-proots-rel5.patch
Group: System Environment/Daemons Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release} Provides: exportfs = %{epoch}:%{version}-%{release}
@ -82,6 +84,8 @@ This package also contains the mount.nfs and umount.nfs program.
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch200 -p1
# Remove .orig files # Remove .orig files
find . -name "*.orig" | xargs rm -f find . -name "*.orig" | xargs rm -f
@ -101,7 +105,8 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
CFLAGS="$CFLAGS" \ CFLAGS="$CFLAGS" \
CPPFLAGS="$DEFINES" \ CPPFLAGS="$DEFINES" \
LDFLAGS="-pie" \ LDFLAGS="-pie" \
--enable-mount --enable-mount \
--enable-mountconfig
make all make all
@ -118,6 +123,7 @@ install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd 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 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs
install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
@ -215,6 +221,7 @@ fi
%config /etc/rc.d/init.d/rpcgssd %config /etc/rc.d/init.d/rpcgssd
%config /etc/rc.d/init.d/rpcsvcgssd %config /etc/rc.d/init.d/rpcsvcgssd
%config(noreplace) /etc/sysconfig/nfs %config(noreplace) /etc/sysconfig/nfs
%config(noreplace) /etc/nfsmount.conf
%dir /var/lib/nfs/v4recovery %dir /var/lib/nfs/v4recovery
%dir /var/lib/nfs/rpc_pipefs %dir /var/lib/nfs/rpc_pipefs
%dir /var/lib/nfs %dir /var/lib/nfs
@ -249,6 +256,14 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4 %attr(4755,root,root) /sbin/umount.nfs4
%changelog %changelog
* Mon Aug 17 2009 Steve Dickson <steved@redhat.com> 1.2.0-10
- Added upstream 1.2.1-rc4 patch
- Fix bug when both crossmnt
- nfs(5): Add description of lookupcache mount option
- nfs(5): Remove trailing blanks
- Added nfs41 support to nfssat
- Added support for mount to us a configuration file.
* Fri Aug 14 2009 Steve Dickson <steved@redhat.com> 1.2.0-9 * Fri Aug 14 2009 Steve Dickson <steved@redhat.com> 1.2.0-9
- Added upstream 1.2.1-rc3 patch - Added upstream 1.2.1-rc3 patch
- Add IPv6 support to nfsd - Add IPv6 support to nfsd