Commit e5e31fe9 authored by Maxime Hadjinlian's avatar Maxime Hadjinlian Committed by Thomas Petazzoni
Browse files

nfs-utils: Bump version 



Refresh the patches (Thanks to Thomas Petazzoni's work)

Patches removed:
0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch
0004-fix-build-with-uClibc.patch
0004-fix-build-with-uClibc.patch
0005-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch
0007-sockaddr-h-needs-stddef-h-for-NULL.patch
0008-tirpc-with-pkgconfig.patch

Patches modified:
0002-Patch-taken-from-Gentoo.patch
0003-Switch-legacy-index-in-favour-of-strchr.patch
0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch

Patch addedd:
0004-statd-Fix-test-for-foreground-mode.patch

Also, change source of the package to git repository (and remove the hash,
sourceforce is clearly not a platform which can be trusted nowadays)

Rework the startup script to accomodate new rpc.statd
The startup scripts now uses rcp.statd -F for a startup in foreground,
also we avoid starting it twice, it makes rcp.statd crash the whole
script.

[Thomas: add patch to fix rpc.statd foreground/daemon mode backported
from upstream, and fix the S60nfs init script to not use the -F option
of rpc.statd.]

Signed-off-by: default avatarMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5284dcf7

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

+14 −38
Original line number Diff line number Diff line 
From 971389625c9602085d399d8ae7fc42b75efcfb7c Mon Sep 17 00:00:00 2001

From 5796ca01e33596d4102dd714349c908fecc331c0 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
@@ -6,9 +6,8 @@ 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(-)

 2 files changed, 6 insertions(+), 9 deletions(-)



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

index 3156815..efe6fcd 100644
@@ -29,29 +28,6 @@ index 3156815..efe6fcd 100644 
-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
@@ -80,5 +56,5 @@ index 8a9ec89..5a5b4d3 100644 
 MAINTAINERCLEANFILES = Makefile.in



--

1.7.9.5

2.1.0

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

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
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: [PATCH] build: avoid AM_CONDITIONAL in conditional execution.

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit



Automake does not support conditional AM_CONDITIONAL calls; what that

means is that you always have to execute AM_CONDITIONAL one way or the

other. Both the libsqlite3.m4 file and the nfsdcld conditionals are

executed only when NFSv4 is enabled, which breaks building with

--disable-nfsv4.



Remove the SQLite3 conditional altogether as it's never used, and move

the nfsdcld conditional outside of the conditional code.



Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>

---

 aclocal/libsqlite3.m4 |    1 -

 configure.ac          |    3 +--

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



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

index 73d1e46..8c38993 100644

--- a/aclocal/libsqlite3.m4

+++ b/aclocal/libsqlite3.m4

@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [

     LIBS="$saved_LIBS"])

 

   AC_MSG_RESULT($libsqlite3_cv_is_recent)

-  AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])

 ])dnl

diff --git a/configure.ac b/configure.ac

index 9ba53e2..b408f1b 100644

--- a/configure.ac

+++ b/configure.ac

@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then

 	fi

   fi

 

-  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])

-

   dnl librpcsecgss already has a dependency on libgssapi,

   dnl but we need to make sure we get the right version

   if test "$enable_gss" = yes; then

@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then

 fi

 

 dnl enable nfsidmap when its support by libnfsidmap

+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])

 AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])

 

 

-- 

1.7.9.5

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

+14 −15
Original line number Diff line number Diff line 
From 636e78e4c9bc8be174805bde2f3ae7f940dc3d0e Mon Sep 17 00:00:00 2001

From a1d45736286939b822fcc7b9c74843f6f90a747e 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.

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>

---
@@ -43,7 +43,7 @@ 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)
@@ -69,5 +69,4 @@ index bc737d1..ddbe92f 100644 
 	list = malloc(listsize * sizeof(char *));

 	copy = strdup(data);

--

1.7.9.5

2.1.0

package/nfs-utils/0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch→package/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch

+46 −0
Original line number Diff line number Diff line 
From 7ea7814a8b87a0faa50fb9f4a486bfd7a376f3fc Mon Sep 17 00:00:00 2001

From 87f88b28ac01b6449463f00b660fe7416d7f9a55 Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Date: Sat, 10 Nov 2012 18:53:03 +0100

Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc
@@ -9,20 +9,23 @@ for the existence of getrpcbynumber() and getrpcbynumber_r(). 


Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 configure.ac |   10 +++++++++-

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

 configure.ac | 14 +++++++++++++-

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



diff --git a/configure.ac b/configure.ac

index 41216c9..1bbecfa 100644

index 8e427e3..6e42c96 100644

--- a/configure.ac

+++ b/configure.ac

@@ -390,7 +390,15 @@ AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \

                getnameinfo getrpcbyname getifaddrs \

@@ -433,11 +433,23 @@ AC_FUNC_STAT

 AC_FUNC_VPRINTF

 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \

                gethostbyaddr gethostbyname gethostname getmntent \

-               getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \

+               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])

+

                ppoll realpath rmdir select socket strcasecmp strchr strdup \

                strerror strrchr strtol strtoul sigprocmask name_to_handle_at])



+save_CFLAGS=$CFLAGS

+save_LIBS=$LIBS

+CFLAGS="$CFLAGS $AM_CPPFLAGS"
@@ -30,9 +33,14 @@ index 41216c9..1bbecfa 100644 
+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])

+

+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])

+fi

+

 dnl *************************************************************

 dnl Check for data sizes

 dnl *************************************************************

--

1.7.9.5

2.1.0

package/nfs-utils/0004-fix-build-with-uClibc.patch

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
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



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 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