Commit 9f0c3146 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

nfs-utils: reformat patch set as git patches 



As we will need to add more patches to nfs-utils, we need a correct
ordering when applying patches. Therefore, reformat the patches to use
a git format and git naming.

The nfs-utils-dont-mix-flags.patch is no longer needed as it was
patching Makefile.in files that were being regenerated due to the
package having _AUTORECONF = YES. The Makefile.in are properly
regenerated thanks to the nfs-utils-0002-Patch-taken-from-Gentoo.patch
patch.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c54af0a2

package/nfs-utils/nfs-utils-conditionals.patch→package/nfs-utils/nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch

+4 −5
Original line number Diff line number Diff line 
From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001

From 2a44ed7558f981e15db58dcda799ff7cd3827a6e Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>

Date: Thu, 17 May 2012 16:26:44 -0700

Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional

 execution.

Subject: [PATCH] build: avoid AM_CONDITIONAL in conditional execution.

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit
@@ -20,7 +19,7 @@ Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> 
---

 aclocal/libsqlite3.m4 |    1 -

 configure.ac          |    3 +--

 2 files changed, 1 insertions(+), 3 deletions(-)

 2 files changed, 1 insertion(+), 3 deletions(-)



diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4

index 73d1e46..8c38993 100644
@@ -54,5 +53,5 @@ index 9ba53e2..b408f1b 100644 
 

 

-- 

1.7.8.6

1.7.9.5

package/nfs-utils/nfs-utils-cross-build.patch→package/nfs-utils/nfs-utils-0002-Patch-taken-from-Gentoo.patch

+19 −3
Original line number Diff line number Diff line 
Patch taken from Gentoo.

From 971389625c9602085d399d8ae7fc42b75efcfb7c Mon Sep 17 00:00:00 2001

From: Gustavo Zacarias <gustavo@zacarias.com.ar>

Date: Sat, 10 Nov 2012 18:56:12 +0100

Subject: [PATCH] Patch taken from Gentoo



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

 tools/locktest/Makefile.am |    7 +++----

 tools/rpcdebug/Makefile.am |    7 +++----

 tools/rpcgen/Makefile.am   |    8 +++-----

 3 files changed, 9 insertions(+), 13 deletions(-)



diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am

index 3156815..efe6fcd 100644

--- a/tools/locktest/Makefile.am

+++ b/tools/locktest/Makefile.am

@@ -1,12 +1,11 @@
@@ -20,6 +30,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)

 

 MAINTAINERCLEANFILES = Makefile.in

diff --git a/tools/rpcdebug/Makefile.am b/tools/rpcdebug/Makefile.am

index 39b70c9..0056597 100644

--- a/tools/rpcdebug/Makefile.am

+++ b/tools/rpcdebug/Makefile.am

@@ -1,15 +1,14 @@
@@ -41,6 +53,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 
-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)

 

 MAINTAINERCLEANFILES = Makefile.in

diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am

index 8a9ec89..5a5b4d3 100644

--- a/tools/rpcgen/Makefile.am

+++ b/tools/rpcgen/Makefile.am

@@ -1,7 +1,9 @@
@@ -54,7 +68,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 
 

 noinst_PROGRAMS = rpcgen

 rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \

@@ -9,10 +11,6 @@

@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \

 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \

 		 rpc_scan.h rpc_util.h
@@ -65,4 +79,6 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 
 

 MAINTAINERCLEANFILES = Makefile.in

 

 EXTRA_DIST = rpcgen.new.1
 
-- 

1.7.9.5

package/nfs-utils/nfs-utils-susv3-legacy.patch→package/nfs-utils/nfs-utils-0003-Switch-legacy-index-in-favour-of-strchr.patch

+29 −15
Original line number Diff line number Diff line 
Switch legacy index() in favour of strchr()

Updated for 1.2.6 from the previous patch by Frederik Pasch.

From 636e78e4c9bc8be174805bde2f3ae7f940dc3d0e Mon Sep 17 00:00:00 2001

From: Gustavo Zacarias <gustavo@zacarias.com.ar>

Date: Sat, 10 Nov 2012 18:58:15 +0100

Subject: [PATCH] Switch legacy index() in favour of strchr() Updated for

 1.2.6 from the previous patch by Frederik Pasch.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

 support/nfs/nfs_mntent.c |    6 +++---

 utils/mount/error.c      |    2 +-

 utils/mountd/fsloc.c     |    2 +-

 3 files changed, 5 insertions(+), 5 deletions(-)



diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support/nfs/nfs_mntent.c

--- nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c	2012-05-29 10:06:37.901255998 -0300

+++ nfs-utils-1.2.6/support/nfs/nfs_mntent.c	2012-05-29 10:06:45.726312410 -0300

diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c

index a2118a2..7496ed6 100644

--- a/support/nfs/nfs_mntent.c

+++ b/support/nfs/nfs_mntent.c

@@ -9,7 +9,7 @@

  */
@@ -15,7 +24,7 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support 
 #include <ctype.h>		/* for isdigit */

 #include <sys/stat.h>		/* for umask */

 #include <unistd.h>		/* for ftruncate */

@@ -172,7 +172,7 @@

@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {

 			return NULL;

 

 		mfp->mntent_lineno++;
@@ -24,7 +33,7 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support 
 		if (s == NULL) {

 			/* Missing final newline?  Otherwise extremely */

 			/* long line - assume file was corrupted */

@@ -180,7 +180,7 @@

@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) {

 				fprintf(stderr, _("[mntent]: warning: no final "

 					"newline at the end of %s\n"),

 					mfp->mntent_file);
@@ -33,10 +42,11 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support 
 			} else {

 				mfp->mntent_errs = 1;

 				goto err;

diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/error.c

--- nfs-utils-1.2.6.orig/utils/mount/error.c	2012-05-29 10:06:37.946256325 -0300

+++ nfs-utils-1.2.6/utils/mount/error.c	2012-05-29 10:06:45.727312416 -0300

@@ -62,7 +62,7 @@

diff --git a/utils/mount/error.c b/utils/mount/error.c

index 83ad1d2..428deef 100644

--- a/utils/mount/error.c

+++ b/utils/mount/error.c

@@ -62,7 +62,7 @@ static int rpc_strerror(int spos)

 	char *tmp;

 

 	if (estr) {
@@ -45,10 +55,11 @@ diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/ 
 			estr = ++ptr;

 

 		tmp = &errbuf[spos];

diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mountd/fsloc.c

--- nfs-utils-1.2.6.orig/utils/mountd/fsloc.c	2012-05-29 10:06:37.911256072 -0300

+++ nfs-utils-1.2.6/utils/mountd/fsloc.c	2012-05-29 10:07:11.140322564 -0300

@@ -127,7 +127,7 @@

diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c

index bc737d1..ddbe92f 100644

--- a/utils/mountd/fsloc.c

+++ b/utils/mountd/fsloc.c

@@ -127,7 +127,7 @@ static struct servers *method_list(char *data)

 	bool v6esc = false;

 

 	xlog(L_NOTICE, "method_list(%s)", data);
@@ -57,3 +68,6 @@ diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mount 
 		ptr++;

 	list = malloc(listsize * sizeof(char *));

 	copy = strdup(data);

-- 

1.7.9.5

package/nfs-utils/nfs-utils-uclibc-libio.h.patch→package/nfs-utils/nfs-utils-0004-fix-build-with-uClibc.patch

+11 −5
Original line number Diff line number Diff line 
[PATCH] fix build with uClibc

From ff82d4c89d6ca771dea06bbaa06ddf3fed760402 Mon Sep 17 00:00:00 2001

From: Peter Korsgaard <jacmet@sunsite.dk>

Date: Sat, 10 Nov 2012 18:58:48 +0100

Subject: [PATCH] fix build with uClibc



uClibc doesn't have/need libio.h, so don't include it from sockaddr.h
@@ -7,10 +10,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> 
 support/include/sockaddr.h |    5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)



Index: nfs-utils-1.2.3/support/include/sockaddr.h

===================================================================

--- nfs-utils-1.2.3.orig/support/include/sockaddr.h

+++ nfs-utils-1.2.3/support/include/sockaddr.h

diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h

index 9af2543..5eef2ec 100644

--- a/support/include/sockaddr.h

+++ b/support/include/sockaddr.h

@@ -20,7 +20,10 @@

 #ifndef NFS_UTILS_SOCKADDR_H

 #define NFS_UTILS_SOCKADDR_H
@@ -23,3 +26,6 @@ Index: nfs-utils-1.2.3/support/include/sockaddr.h 
 #include <stdbool.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

-- 

1.7.9.5

package/nfs-utils/nfs-utils-dont-mix-flags.patch

deleted100644 → 0
+0 −288

File deleted.

Preview size limit exceeded, changes collapsed.