Cleaned up fuzzy patches

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-04-26 12:49:59 -04:00
parent d356fbe097
commit 7afed0da24
5 changed files with 20 additions and 19 deletions

View File

@ -1,7 +1,7 @@
diff -up nfs-utils-1.2.8/support/nfs/exports.c.orig nfs-utils-1.2.8/support/nfs/exports.c
--- nfs-utils-1.2.8/support/nfs/exports.c.orig 2013-09-24 15:35:26.022548905 -0400
+++ nfs-utils-1.2.8/support/nfs/exports.c 2013-09-24 15:35:51.274547991 -0400
@@ -508,7 +508,7 @@ void fix_pseudoflavor_flags(struct expor
diff -up nfs-utils-2.1.1/support/nfs/exports.c.orig nfs-utils-2.1.1/support/nfs/exports.c
--- nfs-utils-2.1.1/support/nfs/exports.c.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/support/nfs/exports.c 2017-04-26 12:46:24.186480312 -0400
@@ -507,7 +507,7 @@ void fix_pseudoflavor_flags(struct expor
static int
parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
{

View File

@ -1,6 +1,6 @@
diff -up nfs-utils-1.3.4/utils/statd/sm-notify.man.orig nfs-utils-1.3.4/utils/statd/sm-notify.man
--- nfs-utils-1.3.4/utils/statd/sm-notify.man.orig 2016-12-17 14:07:32.571455752 -0500
+++ nfs-utils-1.3.4/utils/statd/sm-notify.man 2016-12-17 14:10:58.429723983 -0500
diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/statd/sm-notify.man
--- nfs-utils-2.1.1/utils/statd/sm-notify.man.orig 2017-04-26 12:45:14.205742654 -0400
+++ nfs-utils-2.1.1/utils/statd/sm-notify.man 2017-04-26 12:45:44.042630801 -0400
@@ -184,7 +184,7 @@ where NSM state information resides.
If this option is not specified,
.B sm-notify
@ -10,7 +10,7 @@ diff -up nfs-utils-1.3.4/utils/statd/sm-notify.man.orig nfs-utils-1.3.4/utils/st
by default.
.IP
After starting,
@@ -312,13 +312,13 @@ Currently, the
@@ -330,13 +330,13 @@ Currently, the
command supports sending notification only via datagram transport protocols.
.SH FILES
.TP 2.5i
@ -27,9 +27,9 @@ diff -up nfs-utils-1.3.4/utils/statd/sm-notify.man.orig nfs-utils-1.3.4/utils/st
NSM state number for this host
.TP 2.5i
.I /proc/sys/fs/nfs/nsm_local_state
diff -up nfs-utils-1.3.4/utils/statd/statd.man.orig nfs-utils-1.3.4/utils/statd/statd.man
--- nfs-utils-1.3.4/utils/statd/statd.man.orig 2016-12-17 14:07:32.572455749 -0500
+++ nfs-utils-1.3.4/utils/statd/statd.man 2016-12-17 14:10:58.430723979 -0500
diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/statd.man
--- nfs-utils-2.1.1/utils/statd/statd.man.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/utils/statd/statd.man 2017-04-26 12:45:44.043630798 -0400
@@ -253,7 +253,7 @@ where NSM state information resides.
If this option is not specified,
.B rpc.statd

View File

@ -1,6 +1,6 @@
diff -up nfs-utils-1.3.4/utils/statd/sm-notify.c.orig nfs-utils-1.3.4/utils/statd/sm-notify.c
--- nfs-utils-1.3.4/utils/statd/sm-notify.c.orig 2016-12-17 14:13:50.148087245 -0500
+++ nfs-utils-1.3.4/utils/statd/sm-notify.c 2016-12-17 14:14:13.278001479 -0500
diff -up nfs-utils-2.1.1/utils/statd/sm-notify.c.orig nfs-utils-2.1.1/utils/statd/sm-notify.c
--- nfs-utils-2.1.1/utils/statd/sm-notify.c.orig 2017-04-26 12:46:56.511359133 -0400
+++ nfs-utils-2.1.1/utils/statd/sm-notify.c 2017-04-26 12:47:18.155277994 -0400
@@ -28,6 +28,9 @@
#include <netdb.h>
#include <errno.h>
@ -11,7 +11,7 @@ diff -up nfs-utils-1.3.4/utils/statd/sm-notify.c.orig nfs-utils-1.3.4/utils/stat
#include "conffile.h"
#include "sockaddr.h"
@@ -89,6 +92,7 @@ smn_lookup(const char *name)
@@ -91,6 +94,7 @@ smn_lookup(const char *name)
};
int error;

View File

@ -1,7 +1,7 @@
diff -up nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c.orig nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c
--- nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c.orig 2016-03-16 12:29:29.054788094 -0400
+++ nfs-utils-1.3.3/utils/nfsidmap/nfsidmap.c 2016-03-16 12:31:58.234450259 -0400
@@ -430,7 +430,7 @@ int main(int argc, char **argv)
diff -up nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c
--- nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c 2017-04-26 12:47:56.715133443 -0400
@@ -432,7 +432,7 @@ int main(int argc, char **argv)
xlog_stderr(verbose);
if ((argc - optind) != 2) {

View File

@ -296,6 +296,7 @@ fi
- Conditionally restart gssproxy now that config file is installed (bz 1440885)
- systemd: Afters are also needed for the Wants=network-online.target (bz 1419351)
- nfsdcltrack: silence some expected errors (bz 1445863)
- Cleaned up fuzzy patches
* Mon Apr 10 2017 Steve Dickson <steved@redhat.com> 2.1.1-4.rc2
- Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)