rpms/nfs-utils/devel nfs-utils-1.2.1-cel-ipv6.patch, 1.1.2.1, 1.1.2.2 nfs-utils.spec, 1.253.2.2, 1.253.2.3 nfs-utils-1.2.1-relax-insecure-option.patch, 1.1.2.1, NONE
Jeff Layton
jlayton at fedoraproject.org
Fri Dec 4 19:35:54 UTC 2009
- Previous message (by thread): rpms/vrq/F-12 .cvsignore, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.6, 1.7 vrq.spec, 1.5, 1.6
- Next message (by thread): rpms/vrq/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.5, 1.6 sources, 1.6, 1.7 vrq.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jlayton
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27141
Modified Files:
Tag: private-jlayton-ipv6-3
nfs-utils-1.2.1-cel-ipv6.patch nfs-utils.spec
Removed Files:
Tag: private-jlayton-ipv6-3
nfs-utils-1.2.1-relax-insecure-option.patch
Log Message:
Remove server-side bits since they're not quite baked yet
nfs-utils-1.2.1-cel-ipv6.patch:
b/.gitignore | 9
b/aclocal/ipv6.m4 | 4
b/aclocal/libcap.m4 | 15
b/configure.ac | 1
b/support/Makefile.am | 2
b/support/include/Makefile.am | 1
b/support/include/compaddr.h | 109 ++++
b/support/include/ha-callout.h | 4
b/support/include/nfsrpc.h | 12
b/support/include/nsm.h | 62 ++
b/support/include/rpcmisc.h | 7
b/support/include/tcpwrapper.h | 2
b/support/misc/from_local.c | 20
b/support/misc/tcpwrapper.c | 4
b/support/nfs/Makefile.am | 3
b/support/nfs/getport.c | 91 +++-
b/support/nfs/svc_create.c | 252 +++++++++++
b/support/nsm/Makefile.am | 45 ++
b/support/nsm/file.c | 772 +++++++++++++++++++++++++++++++++++
b/support/nsm/rpc.c | 507 +++++++++++++++++++++++
b/support/nsm/sm_inter.x | 131 ++++++
b/utils/mount/network.c | 30 -
b/utils/mount/network.h | 4
b/utils/mount/nfs.man | 86 ++-
b/utils/mount/nfsumount.c | 9
b/utils/mount/stropts.c | 53 +-
b/utils/mountd/mount_dispatch.c | 2
b/utils/statd/Makefile.am | 4
b/utils/statd/callback.c | 4
b/utils/statd/hostname.c | 122 +++++
b/utils/statd/misc.c | 12
b/utils/statd/monitor.c | 47 +-
b/utils/statd/notlist.c | 4
b/utils/statd/rmtcall.c | 36 -
b/utils/statd/simu.c | 10
b/utils/statd/simulate.c | 52 +-
b/utils/statd/sm-notify.c | 163 ++-----
b/utils/statd/sm-notify.man | 8
b/utils/statd/stat.c | 8
b/utils/statd/statd.c | 57 +-
b/utils/statd/statd.h | 9
b/utils/statd/statd.man | 510 ++++++++++++++++-------
b/utils/statd/svc_run.c | 7
configure.ac | 5
support/include/nsm.h | 25 +
support/include/tcpwrapper.h | 7
support/misc/from_local.c | 87 +++
support/misc/tcpwrapper.c | 170 ++++---
support/nsm/Makefile.am | 4
support/nsm/file.c | 50 ++
utils/mount/network.c | 100 +++-
utils/mount/network.h | 7
utils/mount/nfs.man | 6
utils/mount/stropts.c | 38 +
utils/mountd/mount_dispatch.c | 6
utils/statd/Makefile.am | 30 -
utils/statd/callback.c | 74 ++-
utils/statd/hostname.c | 95 ++++
utils/statd/log.c | 95 ----
utils/statd/log.h | 42 -
utils/statd/misc.c | 24 -
utils/statd/monitor.c | 201 +++------
utils/statd/rmtcall.c | 145 +-----
utils/statd/simu.c | 38 -
utils/statd/sm-notify.c | 873 ++++++++++++++++++----------------------
utils/statd/sm-notify.man | 435 +++++++++++++------
utils/statd/sm_inter.x | 133 ------
utils/statd/stat.c | 10
utils/statd/statd.c | 165 ++-----
utils/statd/statd.h | 37 -
utils/statd/statd.man | 21
utils/statd/version.h | 9
72 files changed, 4185 insertions(+), 2037 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.1 -r 1.1.2.2 nfs-utils-1.2.1-cel-ipv6.patchIndex: nfs-utils-1.2.1-cel-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/Attic/nfs-utils-1.2.1-cel-ipv6.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- nfs-utils-1.2.1-cel-ipv6.patch 3 Dec 2009 20:18:40 -0000 1.1.2.1
+++ nfs-utils-1.2.1-cel-ipv6.patch 4 Dec 2009 19:35:51 -0000 1.1.2.2
@@ -10385,7433 +10385,3 @@ index 84d4122..d64fd8e 100644
return 0;
}
--------------------------------------------------------------------------------
-libexport-a-remove-dead-code
--------------------------------------------------------------------------------
-libexport.a: Remove dead code
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Clean up: I can't find any call sites for client_find() or
-client_match().
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c | 22 ----------------------
- support/include/exportfs.h | 2 --
- 2 files changed, 0 insertions(+), 24 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index 5fcf355..2af07da 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -211,28 +211,6 @@ client_freeall(void)
- }
- }
-
--nfs_client *
--client_find(struct hostent *hp)
--{
-- nfs_client *clp;
-- int i;
--
-- for (i = 0; i < MCL_MAXTYPES; i++) {
-- for (clp = clientlist[i]; clp; clp = clp->m_next) {
-- if (!client_check(clp, hp))
-- continue;
--#ifdef notdef
-- if (clp->m_type == MCL_FQDN)
-- return clp;
-- return client_dup(clp, hp);
--#else
-- return clp;
--#endif
-- }
-- }
-- return NULL;
--}
--
- struct hostent *
- client_resolve(struct in_addr addr)
- {
-diff --git a/support/include/exportfs.h b/support/include/exportfs.h
-index 1ad41e2..ef96a02 100644
---- a/support/include/exportfs.h
-+++ b/support/include/exportfs.h
-@@ -80,12 +80,10 @@ extern exp_hash_table exportlist[MCL_MAXTYPES];
- extern nfs_client * clientlist[MCL_MAXTYPES];
-
- nfs_client * client_lookup(char *hname, int canonical);
--nfs_client * client_find(struct hostent *);
- void client_add(nfs_client *);
- nfs_client * client_dup(nfs_client *, struct hostent *);
- int client_gettype(char *hname);
- int client_check(nfs_client *, struct hostent *);
--int client_match(nfs_client *, char *hname);
- void client_release(nfs_client *);
- void client_freeall(void);
- char * client_compose(struct hostent *he);
--------------------------------------------------------------------------------
-libexport-a-eliminate-nfs_clie
--------------------------------------------------------------------------------
-libexport.a: Eliminate nfs_client.m_count field
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Since nfs_client records are not garbage collected, there doesn't seem
-to be any real need to maintain a reference count for each record.
-
-In addition to removing nominally dead code, this commit gets rid of a
-site where a mountd or exportfs process can exit suddenly due to a
-software bug.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c | 9 ---------
- support/export/export.c | 3 ---
- support/include/exportfs.h | 2 --
- 3 files changed, 0 insertions(+), 14 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index 2af07da..b08dda2 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -135,7 +135,6 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
- clp->m_hostname = xstrdup(hname);
-
- clp->m_exported = 0;
-- clp->m_count = 0;
-
- if (clp->m_type == MCL_SUBNETWORK) {
- char *cp = strchr(clp->m_hostname, '/');
-@@ -188,14 +187,6 @@ client_add(nfs_client *clp)
- }
-
- void
--client_release(nfs_client *clp)
--{
-- if (clp->m_count <= 0)
-- xlog(L_FATAL, "client_free: m_count <= 0!");
-- clp->m_count--;
--}
--
--void
- client_freeall(void)
- {
- nfs_client *clp, **head;
-diff --git a/support/export/export.c b/support/export/export.c
-index e5e6cb0..f5846d0 100644
---- a/support/export/export.c
-+++ b/support/export/export.c
-@@ -95,7 +95,6 @@ export_init(nfs_export *exp, nfs_client *clp, struct exportent *nep)
- exp->m_changed = 0;
- exp->m_warned = 0;
- exp->m_client = clp;
-- clp->m_count++;
- }
-
- /*
-@@ -115,7 +114,6 @@ export_dup(nfs_export *exp, struct hostent *hp)
- if (exp->m_export.e_hostname)
- new->m_export.e_hostname = xstrdup(exp->m_export.e_hostname);
- clp = client_dup(exp->m_client, hp);
-- clp->m_count++;
- new->m_client = clp;
- new->m_mayexport = exp->m_mayexport;
- new->m_exported = 0;
-@@ -266,7 +264,6 @@ export_freeall(void)
- for (i = 0; i < MCL_MAXTYPES; i++) {
- for (exp = exportlist[i].p_head; exp; exp = nxt) {
- nxt = exp->m_next;
-- client_release(exp->m_client);
- if (exp->m_export.e_squids)
- xfree(exp->m_export.e_squids);
- if (exp->m_export.e_sqgids)
-diff --git a/support/include/exportfs.h b/support/include/exportfs.h
-index ef96a02..6dec3d6 100644
---- a/support/include/exportfs.h
-+++ b/support/include/exportfs.h
-@@ -48,7 +48,6 @@ typedef struct mclient {
- int m_naddr;
- struct in_addr m_addrlist[NFSCLNT_ADDRMAX];
- int m_exported; /* exported to nfsd */
-- int m_count;
- } nfs_client;
-
- typedef struct mexport {
-@@ -84,7 +83,6 @@ void client_add(nfs_client *);
- nfs_client * client_dup(nfs_client *, struct hostent *);
- int client_gettype(char *hname);
- int client_check(nfs_client *, struct hostent *);
--void client_release(nfs_client *);
- void client_freeall(void);
- char * client_compose(struct hostent *he);
- struct hostent * client_resolve(struct in_addr addr);
--------------------------------------------------------------------------------
-libexport-a-clean-up-client_co
--------------------------------------------------------------------------------
-libexport.a: Clean up client_compose() and client_member()
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Clean up: Replace outdated comments, and fix some function
-declarations.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c | 32 +++++++++++++++++++++-----------
- 1 files changed, 21 insertions(+), 11 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index b08dda2..179471f 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -28,6 +28,8 @@
[...7042 lines suppressed...]
-+Specify a high availability callout program.
-+This program receives callouts for all MOUNT and UNMOUNT requests.
-+This allows
-+.B rpc.mountd
-+to be used in a High Availability NFS (HA-NFS) environment.
-+.IP
-+The callout program is run with 4 arguments.
-+The first is
- .B mount
- or
- .B unmount
-@@ -118,19 +146,30 @@ The second will be the name of the client performing the mount.
- The third will be the path that the client is mounting.
- The last is the number of concurrent mounts that we believe the client
- has of that path.
-+.IP
-+This callout is not needed with 2.6 and later kernels.
-+Instead, mount the nfsd filesystem on
-+.IR /proc/fs/nfsd .
- .TP
- .BI "\-s," "" " \-\-state\-directory\-path " directory
--specify a directory in which to place statd state information.
-+Specify a directory in which to place statd state information.
- If this option is not specified the default of
--.BR /var/lib/nfs
-+.I /var/lib/nfs
- is used.
- .TP
- .BI "\-r," "" " \-\-reverse\-lookup"
--mountd tracks IP addresses in the rmtab, and when a DUMP request is made (by
--someone running showmount -a, for instance), it returns IP addresses instead
--of hostnames by default. This option causes mountd to do a reverse
--lookup on each IP address and return that hostname instead. Enabling this can
--have a substantial negative effect on performance in some situations.
-+.B rpc.mountd
-+tracks IP addresses in the
-+.I rmtab
-+file. When a DUMP request is made (by
-+someone running
-+.BR "showmount -a" ,
-+for instance), it returns IP addresses instead
-+of hostnames by default. This option causes
-+.B rpc.mountd
-+to perform a reverse lookup on each IP address and return that hostname instead.
-+Enabling this can have a substantial negative effect on performance
-+in some situations.
- .TP
- .BR "\-t N" " or " "\-\-num\-threads=N"
- This option specifies the number of worker threads that rpc.mountd
-@@ -162,41 +201,70 @@ If you use the
- flag, then the list of group ids received from the client will be
- replaced by a list of group ids determined by an appropriate lookup on
- the server. Note that the 'primary' group id is not affected so a
--.I newgroup
-+.B newgroup
- command on the client will still be effective. This function requires
- a Linux Kernel with version at least 2.6.21.
--
- .SH TCP_WRAPPERS SUPPORT
--This
-+You can protect your
- .B rpc.mountd
--version is protected by the
-+listeners using the
-+.B tcp_wrapper
-+library or
-+.BR iptables (8).
-+.PP
-+Note that the
- .B tcp_wrapper
--library. You have to give the clients access to
--.B rpc.mountd
--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:
--
--mountd: .bar.com
--
--You have to use the daemon name
-+library supports only IPv4 networking.
-+.PP
-+Add the hostnames of NFS peers that are allowed to access
-+.B rpc.mountd
-+to
-+.IR /etc/hosts.allow .
-+Use the daemon name
- .B mountd
--for the daemon name (even if the binary has a different name).
--.B Note:
--hostnames used in either access file will be ignored when
-+even if the
-+.B rpc.mountd
-+binary has a different name.
-+.PP
-+Hostnames used in either access file will be ignored when
- they can not be resolved into IP addresses.
--
--For further information please have a look at the
-+For further information see the
- .BR tcpd (8)
- and
- .BR hosts_access (5)
--manual pages.
-+man pages.
-+.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.mountd ,
-+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.mountd
-+will operate.
-+.SH FILES
-+.TP 2.5i
-+.I /etc/exports
-+input file for
-+.BR exportfs ,
-+listing exports, export options, and access control lists
-+.TP 2.5i
-+.I /var/lib/nfs/rmtab
-+table of clients accessing server's exports
- .SH SEE ALSO
--.BR rpc.nfsd (8),
- .BR exportfs (8),
- .BR exports (5),
--.BR rpc.rquotad (8).
--.SH FILES
--.BR /etc/exports ,
--.BR /var/lib/nfs/xtab .
-+.BR showmount (8),
-+.BR rpc.nfsd (8),
-+.BR rpc.rquotad (8),
-+.BR nfs (5),
-+.BR tcpd (8),
-+.BR hosts_access (5),
-+.BR iptables (8),
-+.BR netconfig (5)
-+.sp
-+RFC 1094 - "NFS: Network File System Protocol Specification"
-+.br
-+RFC 1813 - "NFS Version 3 Protocol Specification"
- .SH AUTHOR
- Olaf Kirch, H. J. Lu, G. Allan Morris III, and a host of others.
--------------------------------------------------------------------------------
-nfsd-revert-commit-b2a3cd59
--------------------------------------------------------------------------------
-nfsd: Revert commit b2a3cd59
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Enable IPv6 support in rpc.nfsd again.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- utils/nfsd/nfsd.c | 9 ---------
- utils/nfsd/nfssvc.c | 9 ---------
- 2 files changed, 0 insertions(+), 18 deletions(-)
-
-
-diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
-index 1cda1e5..650c593 100644
---- a/utils/nfsd/nfsd.c
-+++ b/utils/nfsd/nfsd.c
-@@ -27,15 +27,6 @@
- #include "nfssvc.h"
- #include "xlog.h"
-
--/*
-- * IPv6 support for nfsd was finished before some of the other daemons (mountd
-- * and statd in particular). That could be a problem in the future if someone
-- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
-- * now, hardcode the IPv6 switch into the off position until the other daemons
-- * are functional.
-- */
--#undef IPV6_SUPPORTED
--
- static void usage(const char *);
-
- static struct option longopts[] =
-diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
-index b8028bb..119135e 100644
---- a/utils/nfsd/nfssvc.c
-+++ b/utils/nfsd/nfssvc.c
-@@ -22,15 +22,6 @@
- #include "nfslib.h"
- #include "xlog.h"
-
--/*
-- * IPv6 support for nfsd was finished before some of the other daemons (mountd
-- * and statd in particular). That could be a problem in the future if someone
-- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
-- * now, hardcode the IPv6 switch into the off position until the other daemons
-- * are functional.
-- */
--#undef IPV6_SUPPORTED
--
- #define NFSD_PORTS_FILE "/proc/fs/nfsd/portlist"
- #define NFSD_VERS_FILE "/proc/fs/nfsd/versions"
- #define NFSD_THREAD_FILE "/proc/fs/nfsd/threads"
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253.2.2
retrieving revision 1.253.2.3
diff -u -p -r1.253.2.2 -r1.253.2.3
--- nfs-utils.spec 3 Dec 2009 20:37:28 -0000 1.253.2.2
+++ nfs-utils.spec 4 Dec 2009 19:35:54 -0000 1.253.2.3
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.1
-Release: 3.ipv6.1%{?dist}
+Release: 3.ipv6.2%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -24,8 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
Patch200: nfs-utils-1.2.0-v4root-rel8.patch
Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
-Patch300: nfs-utils-1.2.1-relax-insecure-option.patch
-Patch301: nfs-utils-1.2.1-cel-ipv6.patch
+Patch300: nfs-utils-1.2.1-cel-ipv6.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -81,7 +80,6 @@ This package also contains the mount.nfs
%patch201 -p1
%patch300 -p1
-%patch301 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -254,12 +252,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
-* Thu Dec 3 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.1
+* Fri Dec 4 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.2
- remove patches to fix statd/sm-notify paths in old statd
-- add patch to relax "insecure" export option (so that later patches apply
- cleanly)
-- add patches from Chuck Lever's tree to support IPv6 in statd, mountd and
- exportfs
+- add patches from Chuck Lever's tree to support IPv6 in statd and mount.nfs
- enable IPv6 during configuration
* Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
--- nfs-utils-1.2.1-relax-insecure-option.patch DELETED ---
- Previous message (by thread): rpms/vrq/F-12 .cvsignore, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.6, 1.7 vrq.spec, 1.5, 1.6
- Next message (by thread): rpms/vrq/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.5, 1.6 sources, 1.6, 1.7 vrq.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list