nfs-utils: Bump version

similarity index 62%
rename from package/nfs-utils/0002-Patch-taken-from-Gentoo.patch
rename to package/nfs-utils/0001-Patch-taken-from-Gentoo.patch
index e310c49..47bf9db 100644
@@ -1,14 +1,13 @@
-From 971389625c9602085d399d8ae7fc42b75efcfb7c Mon Sep 17 00:00:00 2001
+From 5796ca01e33596d4102dd714349c908fecc331c0 Mon Sep 17 00:00:00 2001
 From: Gustavo Zacarias <[email protected]>
 Date: Sat, 10 Nov 2012 18:56:12 +0100
 Subject: [PATCH] Patch taken from Gentoo
 
 Signed-off-by: Gustavo Zacarias <[email protected]>
 ---
- tools/locktest/Makefile.am |    7 +++----
- tools/rpcdebug/Makefile.am |    7 +++----
- tools/rpcgen/Makefile.am   |    8 +++-----
- 3 files changed, 9 insertions(+), 13 deletions(-)
+ tools/locktest/Makefile.am | 7 +++----
+ tools/rpcgen/Makefile.am   | 8 +++-----
+ 2 files changed, 6 insertions(+), 9 deletions(-)
 
 diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
 index 3156815..efe6fcd 100644

@@ -16,42 +15,19 @@ index 3156815..efe6fcd 100644
 +++ b/tools/locktest/Makefile.am
 @@ -1,12 +1,11 @@
  ## Process this file with automake to produce Makefile.in
- 
+
  CC=$(CC_FOR_BUILD)
 -LIBTOOL = @LIBTOOL@ --tag=CC
 +CFLAGS=$(CFLAGS_FOR_BUILD)
 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
+
  noinst_PROGRAMS = testlk
  testlk_SOURCES = testlk.c
 -testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
 -testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
 -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 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- man8_MANS = rpcdebug.man
- EXTRA_DIST = $(man8_MANS)
- 
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
+
  MAINTAINERCLEANFILES = Makefile.in
 diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
 index 8a9ec89..5a5b4d3 100644

@@ -59,26 +35,26 @@ index 8a9ec89..5a5b4d3 100644
 +++ b/tools/rpcgen/Makefile.am
 @@ -1,7 +1,9 @@
  ## Process this file with automake to produce Makefile.in
- 
+
  CC=$(CC_FOR_BUILD)
 -LIBTOOL = @LIBTOOL@ --tag=CC
 +CFLAGS=$(CFLAGS_FOR_BUILD)
 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
+
  noinst_PROGRAMS = rpcgen
  rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
 @@ -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
- 
+
 -rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
 -rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
 -rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 -rpcgen_LDADD=$(LIBTIRPC)
- 
+
  MAINTAINERCLEANFILES = Makefile.in
- 
--- 
-1.7.9.5
+
+--
+2.1.0
 

57 lines not on this page · raw message

similarity index 87%
rename from package/nfs-utils/0003-Switch-legacy-index-in-favour-of-strchr.patch
rename to package/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch
index 82a6c43..655d534 100644
@@ -1,14 +1,14 @@
-From 636e78e4c9bc8be174805bde2f3ae7f940dc3d0e Mon Sep 17 00:00:00 2001
+From a1d45736286939b822fcc7b9c74843f6f90a747e Mon Sep 17 00:00:00 2001
 From: Gustavo Zacarias <[email protected]>
 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.
+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 <[email protected]>
 ---
- support/nfs/nfs_mntent.c |    6 +++---
- utils/mount/error.c      |    2 +-
- utils/mountd/fsloc.c     |    2 +-
+ support/nfs/nfs_mntent.c | 6 +++---
+ utils/mount/error.c      | 2 +-
+ utils/mountd/fsloc.c     | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c

@@ -17,7 +17,7 @@ index a2118a2..7496ed6 100644
 +++ b/support/nfs/nfs_mntent.c
 @@ -9,7 +9,7 @@
   */
- 
+
  #include <stdio.h>
 -#include <string.h>		/* for index */
 +#include <string.h>		/* for strchr */

@@ -26,7 +26,7 @@ index a2118a2..7496ed6 100644
  #include <unistd.h>		/* for ftruncate */
 @@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {
  			return NULL;
- 
+
  		mfp->mntent_lineno++;
 -		s = index (buf, '\n');
 +		s = strchr (buf, '\n');

@@ -43,17 +43,17 @@ index a2118a2..7496ed6 100644
  				mfp->mntent_errs = 1;
  				goto err;
 diff --git a/utils/mount/error.c b/utils/mount/error.c
-index 83ad1d2..428deef 100644
+index e06f598..7bd1d27 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) {
 -		if ((ptr = index(estr, ':')))
 +		if ((ptr = strchr(estr, ':')))
  			estr = ++ptr;
- 
+
  		tmp = &errbuf[spos];
 diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
 index bc737d1..ddbe92f 100644

@@ -61,13 +61,12 @@ index bc737d1..ddbe92f 100644
 +++ 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);
 -	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
 +	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
  		ptr++;
  	list = malloc(listsize * sizeof(char *));
  	copy = strdup(data);
--- 
-1.7.9.5
-
+--
+2.1.0

46 lines not on this page · raw message

deleted file mode 100644
index 23da28f..0000000
@@ -1,31 +0,0 @@
-From ff82d4c89d6ca771dea06bbaa06ddf3fed760402 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-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
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- support/include/sockaddr.h |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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
- 
--#include <libio.h>
-+/* uClibc doesn't have/need libio.h */
-+#ifndef __UCLIBC__
-+#include <libio.h> 
-+#endif
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--- 
-1.7.9.5
-

70 lines not on this page · raw message

deleted file mode 100644
index 1ca17b7..0000000
@@ -1,38 +0,0 @@
-From 7ea7814a8b87a0faa50fb9f4a486bfd7a376f3fc Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 10 Nov 2012 18:53:03 +0100
-Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc
-
-The getrpcbynumber() function may not be available in the C library,
-but only in the libtirpc library. Take this into account when checking
-for the existence of getrpcbynumber() and getrpcbynumber_r().
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- configure.ac |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 41216c9..1bbecfa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -390,7 +390,15 @@ AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
-                getnameinfo getrpcbyname getifaddrs \
-                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
-                realpath rmdir select socket strcasecmp strchr strdup \
--               strerror strrchr strtol strtoul sigprocmask getrpcbynumber getrpcbynumber_r])
-+               strerror strrchr strtol strtoul sigprocmask])
-+
-+save_CFLAGS=$CFLAGS
-+save_LIBS=$LIBS
-+CFLAGS="$CFLAGS $AM_CPPFLAGS"
-+LIBS="$LIBS $LIBTIRPC"
-+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
-+CFLAGS=$save_CFLAGS
-+LIBS=$save_LIBS
- 
- if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
-    AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
--- 
-1.7.9.5
-

deleted file mode 100644
index 8fcf1dd..0000000
@@ -1,19 +0,0 @@
-[PATCH] sockaddr.h: needs stddef.h for NULL
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- support/include/sockaddr.h |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: nfs-utils-1.2.6/support/include/sockaddr.h
-===================================================================
---- nfs-utils-1.2.6.orig/support/include/sockaddr.h
-+++ nfs-utils-1.2.6/support/include/sockaddr.h
-@@ -25,6 +25,7 @@
- #include <libio.h> 
- #endif
- #include <stdbool.h>
-+#include <stddef.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- 

102 lines not on this page · raw message

index 91410ee..37e68f8 100755
@@ -15,13 +15,12 @@ touch /run/nfs/rmtab
 start() {
 	# Start daemons.
 	echo -n "Starting NFS statd: "
-	rpc.statd
+	rpc.statd -F
 	touch /var/lock/subsys/nfslock
 	echo "done"
 
 	echo -n "Starting NFS services: "
 	/usr/sbin/exportfs -r
-	rpc.statd
 	echo "done"
 
 	echo -n "Starting NFS daemon: "

index e36c9d0..a4959ee 100644
@@ -1,2 +1,2 @@
-# Locally computed:
-sha256  70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83  nfs-utils-1.2.6.tar.bz2
+# From https://www.kernel.org/pub/linux/utils/nfs-utils/1.3.2/sha256sums.asc
+sha256 2966bb431c06e9ba35a54f48f89db03a5132bc2d8ed8084ac8ccb34e25a9b739  nfs-utils-1.3.2.tar.xz

index 115a133..095d095 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NFS_UTILS_VERSION = 1.2.6
-NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
-NFS_UTILS_SITE = http://downloads.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
+NFS_UTILS_VERSION = 1.3.2
+NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
+NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
 NFS_UTILS_LICENSE = GPLv2+
 NFS_UTILS_LICENSE_FILES = COPYING
 NFS_UTILS_AUTORECONF = YES