From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 7 Oct 2007 06:12:36 +0000 (+0000)
Subject: nfs-utils: Removed duplicated chunks in uclibc patch
X-Git-Tag: Release-2010-05/1~8549^2~1^2~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=950f437e524e56366b8e811acb729fb20d7d23f7;p=openembedded.git

nfs-utils: Removed duplicated chunks in uclibc patch
---

diff --git a/packages/nfs-utils/files/uclibc_bzero_fix.patch b/packages/nfs-utils/files/uclibc_bzero_fix.patch
index 9a276d326e..2006192d28 100644
--- a/packages/nfs-utils/files/uclibc_bzero_fix.patch
+++ b/packages/nfs-utils/files/uclibc_bzero_fix.patch
@@ -15,54 +15,3 @@ Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
    addr.sin_family = AF_INET;
  
  #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
----
- support/nfs/svc_socket.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
-+++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
-@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
- 	}
-     }
- 
--  __bzero ((char *) &addr, sizeof (addr));
-+  memset ((char *) &addr,0, sizeof (addr));
-   addr.sin_family = AF_INET;
- 
- #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
----
- support/nfs/svc_socket.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
-+++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
-@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
- 	}
-     }
- 
--  __bzero ((char *) &addr, sizeof (addr));
-+  memset ((char *) &addr,0, sizeof (addr));
-   addr.sin_family = AF_INET;
- 
- #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
----
- support/nfs/svc_socket.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
-+++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
-@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
- 	}
-     }
- 
--  __bzero ((char *) &addr, sizeof (addr));
-+  memset ((char *) &addr,0, sizeof (addr));
-   addr.sin_family = AF_INET;
- 
- #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 15e3914472..1febf057bf 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \