Fixes for RPC support

index f109adf..ddede0e 100644
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
-	depends on BR2_INET_RPC
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
 	select BR2_PACKAGE_LIBNETFILTER_QUEUE
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  The conntrack-tools are a set of tools targeted at
 	  system administrators.

@@ -15,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC
+comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE

index ce64021..ece3090 100644
@@ -13,4 +13,10 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+CONNTRACK_TOOLS_CONF_ENV += \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
+CONNTRACK_TOOLS_DEPENDENCIES += libtirpc
+endif
+
 $(eval $(autotools-package))

index bdbe021..7caccc2 100644
@@ -1,7 +1,7 @@
-From f4c022c526ce061dfdd3c46f544a9495a3a3a97e Mon Sep 17 00:00:00 2001
+From cc4ec3294cb06724c83d4c4e1ea9fc2e38923c98 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Sat, 23 Jun 2012 21:57:39 +0200
-Subject: [PATCH 1/4] Disable parts of TIRPC requiring NIS support
+Subject: [PATCH] Disable parts of TIRPC requiring NIS support
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 ---

index 0798c34..b950cb3 100644
@@ -1,7 +1,7 @@
-From c91721dc289397dfe38fdae175f4ee37e824667c Mon Sep 17 00:00:00 2001
+From c2e96bdc453334f10faf8db0eb06e41ab3ca4fe9 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Sat, 23 Jun 2012 21:58:07 +0200
-Subject: [PATCH 2/4] uClibc without RPC support does not install rpcent.h
+Subject: [PATCH] uClibc without RPC support does not install rpcent.h
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 ---

index 64d3da8..a05d7ad 100644
@@ -1,7 +1,7 @@
-From a4852bd653ac917165de1d41b60168cd88dc6672 Mon Sep 17 00:00:00 2001
+From a40e00a16cf43245953ad6d43a4f260a47e6d198 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Sat, 23 Jun 2012 21:58:36 +0200
-Subject: [PATCH 3/4] Add missing INET6 conditional
+Subject: [PATCH] Add missing INET6 conditional
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 ---

index 455ad74..c93fea2 100644
@@ -1,7 +1,7 @@
-From 1f36736733eac5080f3a4f3abd1c3a04ac42f1dd Mon Sep 17 00:00:00 2001
+From 5ce585bed328fafc99800effb5e9d1b07dbac2b7 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Sun, 24 Jun 2012 21:40:21 +0200
-Subject: [PATCH 4/4] Make IPv6 support optional
+Subject: [PATCH] Make IPv6 support optional
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 ---

new file mode 100644
index 0000000..b1865ae
@@ -0,0 +1,43 @@
+From 88147b753b86df7e7505ef8150f1329f7c6951cc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Fri, 9 Nov 2012 19:37:24 +0100
+Subject: [PATCH] rpcent: mark getrpcbyname name argument as const char *
+
+This allows to match the glibc prototype and avoid compiling error
+when building libtirpc against a C library that has RPC support.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ src/getrpcent.c    |    2 +-
+ tirpc/rpc/rpcent.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/getrpcent.c b/src/getrpcent.c
+index 645f18f..1b54b6d 100644
+--- a/src/getrpcent.c
++++ b/src/getrpcent.c
+@@ -138,7 +138,7 @@ no_yp:
+ 
+ struct rpcent *
+ getrpcbyname(name)
+-	char *name;
++	const char *name;
+ {
+ 	struct rpcent *rpc = NULL;
+ 	char **rp;
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 8ce05ed..120801d 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -61,7 +61,7 @@ extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+ extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
+ 
+ /* Old interfaces that return a pointer to a static area;  MT-unsafe */
+-extern struct rpcent *getrpcbyname(char *);
++extern struct rpcent *getrpcbyname(const char *);
+ extern struct rpcent *getrpcbynumber(int);
+ extern struct rpcent *getrpcent(void);
+ #endif
+-- 
+1.7.9.5
+

new file mode 100644
index 0000000..1fdc310
@@ -0,0 +1,33 @@
+From 8e02780905a3e13405a5a1b9f5b2e77655d5c7fb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 00:05:23 +0100
+Subject: [PATCH] rpcent: remove prototypes of reentrant variants
+
+The reentrant variants of getrpcbynumber() and al. are not implemented
+by libtirpc, so there is no point in advertising them in this header
+file.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ tirpc/rpc/rpcent.h |    5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 120801d..45775ed 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -55,11 +55,6 @@ struct rpcent {
+ 	int	r_number;	/* rpc program number */
+ };
+ 
+-extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
+-					char *, int);
+-extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+-extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
+-
+ /* Old interfaces that return a pointer to a static area;  MT-unsafe */
+ extern struct rpcent *getrpcbyname(const char *);
+ extern struct rpcent *getrpcbynumber(int);
+-- 
+1.7.9.5
+

new file mode 100644
index 0000000..c31992c
@@ -0,0 +1,24 @@
+From 4cf0371c96abf83483835daf50d3fc3bf793bdc4 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 17:29:12 +0100
+Subject: [PATCH] doc/Makefile.am: fix out-of-tree installation
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ doc/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index cc4fa76..bac7c0f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+ install: install-am
+ 	$(mkinstalldirs) $(DESTDIR)/etc
+-	cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig
++	cp -p $(srcdir)/etc_netconfig $(DESTDIR)/etc/netconfig
+ 	chmod 0644 $(DESTDIR)/etc/netconfig
+-- 
+1.7.9.5
+

2,900 lines not on this page · raw message

999 lines not on this page · raw message

1,649 lines not on this page · raw message

index b950cb3..3ad25af 100644
@@ -5,19 +5,22 @@ Subject: [PATCH] uClibc without RPC support does not install rpcent.h
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 ---
- tirpc/rpc/rpcent.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ tirpc/rpc/rpcent.h |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
-index 7fd93d9..df1f5ed 100644
+index 7fd93d9..8ce05ed 100644
 --- a/tirpc/rpc/rpcent.h
 +++ b/tirpc/rpc/rpcent.h
-@@ -47,7 +47,7 @@
+@@ -46,8 +46,9 @@
+ 
  __BEGIN_DECLS
  
- /* These are defined in /usr/include/rpc/netdb.h */
+-/* These are defined in /usr/include/rpc/netdb.h */
 -#if 0
-+#if __UCLIBC__
++/* These are defined in /usr/include/rpc/netdb.h, unless we are using
++   the C library without RPC support. */
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__)
  struct rpcent {
  	char	*r_name;	/* name of server for this rpc program */
  	char	**r_aliases;	/* alias list */

similarity index 89%
rename from package/nfs-utils/nfs-utils-conditionals.patch
rename to package/nfs-utils/nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch
index a2342b3..ba9ad42 100644
@@ -1,8 +1,7 @@
-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?= <[email protected]>
 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? <[email protected]>
 ---
  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
 

similarity index 69%
rename from package/nfs-utils/nfs-utils-cross-build.patch
rename to package/nfs-utils/nfs-utils-0002-Patch-taken-from-Gentoo.patch
index 43928bf..e310c49 100644
@@ -1,7 +1,17 @@
-Patch taken from Gentoo.
+From 971389625c9602085d399d8ae7fc42b75efcfb7c 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(-)
 
+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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
  
  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 <[email protected]>
  
  MAINTAINERCLEANFILES = Makefile.in
  
- EXTRA_DIST = rpcgen.new.1
+-- 
+1.7.9.5
+

77 lines not on this page · raw message

similarity index 56%
rename from package/nfs-utils/nfs-utils-uclibc-libio.h.patch
rename to package/nfs-utils/nfs-utils-0004-fix-build-with-uClibc.patch
index 589b96f..23da28f 100644
@@ -1,4 +1,7 @@
-[PATCH] fix build with uClibc
+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
 

@@ -7,10 +10,10 @@ Signed-off-by: Peter Korsgaard <[email protected]>
  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
+

288 lines not on this page · raw message

new file mode 100644
index 0000000..7c9f3c3
@@ -0,0 +1,70 @@
+From a4c15a4f9f49fd2ae5eee7eef54c67f4842952b2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 18:42:28 +0100
+Subject: [PATCH] Allow usage of getrpcbynumber() when getrpcbynumber_r() is
+ not available
+
+getrpcbynumber_r() is not implemented by libtirpc at the moment, only
+the non-reentrant getrpcbynumber() is available. Since nfs-utils seems
+to only be using getrpcbynumber_r() is a non multithreaded context,
+using getrpcbynumber() should work just as well.
+
+We also take this opportunity to adjust the autoconf checks to verify
+whether any of getrpcbynumber() or getrpcbynumber_r() is available,
+and error out if none of them is available.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ configure.ac             |    8 ++++----
+ support/nfs/svc_socket.c |    6 ++++++
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b408f1b..41216c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,9 +246,6 @@ AC_CHECK_FUNC([connect], ,
+ AC_CHECK_FUNC([getaddrinfo], ,
+               [AC_MSG_ERROR([Function 'getaddrinfo' not found.])])
+ 
+-AC_CHECK_FUNC([getrpcbynumber], ,
+-              [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])])
+-
+ AC_CHECK_FUNC([getservbyname], ,
+               [AC_MSG_ERROR([Function 'getservbyname' not found.])])
+ 
+@@ -393,8 +390,11 @@ 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])
++               strerror strrchr strtol strtoul sigprocmask getrpcbynumber getrpcbynumber_r])
+ 
++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
+diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c
+index f56f310..61ccf5b 100644
+--- a/support/nfs/svc_socket.c
++++ b/support/nfs/svc_socket.c
+@@ -42,8 +42,14 @@ int getservport(u_long number, const char *proto)
+ 	struct servent servbuf, *servp = NULL;
+ 	int ret;
+ 
++#if HAVE_GETRPCBYNUMBER_R
+ 	ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
+ 				&rpcp);
++#else
++	rpcp = getrpcbynumber(number);
++	ret = 0;
++#endif
++
+ 	if (ret == 0 && rpcp != NULL) {
+ 		/* First try name.  */
+ 		ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+-- 
+1.7.9.5
+

new file mode 100644
index 0000000..1ca17b7
@@ -0,0 +1,38 @@
+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
+

new file mode 100644
index 0000000..3fed853
@@ -0,0 +1,42 @@
+allow usage of getrpcbynumber() instead of getrpcbynumber_r()
+
+libtirpc does not implement the reentrant function getrpcbynumber_r(),
+so allow quota to use the non-reentrant version getrpcbynumber(). This
+should not be a problem as quota tools are not multi-threaded.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -182,6 +182,12 @@
+ AC_C_CONST
+ AC_C_INLINE
+ 
++AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
++
++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
++
+ AC_ARG_ENABLE(altformat,
+ 	[  --enable-altformat=[yes/no]     Enable alternative format used by edquota [default=yes].],
+ 	,
+Index: b/svc_socket.c
+===================================================================
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -55,7 +55,12 @@
+ 	addr.sin_family = AF_INET;
+ 
+ 	if (!port) {
++#if HAVE_GETRPCBYNUMBER_R
+ 		ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
++#else
++		rpcp = getrpcbynumber(number);
++		ret = 0;
++#endif
+ 		if (ret == 0 && rpcp != NULL) {
+ 			/* First try name */
+ 			ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,

index 7019059..899dfdd 100644
@@ -8,6 +8,8 @@ QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
 
+QUOTA_AUTORECONF = YES
+
 QUOTA_CFLAGS = $(TARGET_CFLAGS)
 QUOTA_LDFLAGS = $(TARGET_LDFLAGS)
 

@@ -23,6 +25,8 @@ QUOTA_LDFLAGS += -ltirpc
 endif
 
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+QUOTA_CONF_ENV = \
+	CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 
 # Package uses autoconf but not automake.
 QUOTA_INSTALL_TARGET_OPT = \

similarity index 65%
rename from package/rpcbind/rpcbind-01-no-yp-support.patch
rename to package/rpcbind/rpcbind-0001-Remove-yellow-pages-support.patch
index e9e6c9d..eba17bf 100644
@@ -1,12 +1,19 @@
-Remove yellow pages support
+From 6b5db966ae01c0bdaa7b3b90d9332394af6ea0be Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 22:03:43 +0100
+Subject: [PATCH] Remove yellow pages support
 
 This support requires yellow pages support in libtirpc, which isn't
 available. As most Buildroot users are most likely never going to need
 such feature, get rid of it.
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
-Index: b/src/security.c
-===================================================================
+---
+ src/security.c |   18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/src/security.c b/src/security.c
+index 0edeac6..c6c977f 100644
 --- a/src/security.c
 +++ b/src/security.c
 @@ -23,9 +23,6 @@

@@ -19,7 +26,7 @@ Index: b/src/security.c
  
  #include "rpcbind.h"
  
-@@ -322,24 +319,9 @@
+@@ -322,24 +319,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused*
  		    args->rmt_proc != MOUNTPROC_UMNT)
  			break;
  		goto deny;

@@ -44,3 +51,6 @@ Index: b/src/security.c
  	default:
  		break;
  	}
+-- 
+1.7.9.5
+

new file mode 100644
index 0000000..f7cc4a6
@@ -0,0 +1,60 @@
+From cfc70fb4c54e044f724516e9352f974187adb448 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 22:04:12 +0100
+Subject: [PATCH] Do not try to use NSS support when not available in the C
+ library
+
+uClibc does not have NSS support, so it is unnecessary to tell the C
+library to use the "files" as the source for "services", since it is
+the only possible choice.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ src/rpcbind.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 525ffba..cde8685 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -67,7 +67,9 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <errno.h>
++#ifdef HAVE_NSS_H
+ #include <nss.h>
++#endif
+ #include "config.h"
+ #include "rpcbind.h"
+ 
+@@ -156,11 +158,13 @@ main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 
++#ifdef HAVE_NSS_H
+ 	/*
+ 	 * Make sure we use the local service file 
+ 	 * for service lookkups
+ 	 */
+ 	__nss_configure_lookup("services", "files");
++#endif
+ 
+ 	nc_handle = setnetconfig(); 	/* open netconfig file */
+ 	if (nc_handle == NULL) {
+@@ -222,11 +226,13 @@ main(int argc, char *argv[])
+ 		struct passwd *p;
+ 		char *id = runasdaemon ? RUN_AS : rpcbinduser;
+ 
++#ifdef HAVE_NSS_H
+ 		/*
+ 		 * Make sure we use the local password file
+ 		 * for these lookups.
+ 		 */
+ 		__nss_configure_lookup("passwd", "files");
++#endif
+ 
+ 		if((p = getpwnam(id)) == NULL) {
+ 			syslog(LOG_ERR, "cannot get uid of '%s': %m", id);
+-- 
+1.7.9.5
+

index d06aa77..d04853d 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBNETFILTER_QUEUE
 	bool "libnetfilter_queue"
 	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_LIBNFNETLINK
 	select BR2_PACKAGE_LIBMNL
 	help

@@ -10,5 +11,5 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE
 
 	  http://www.netfilter.org/projects/libnetfilter_queue/
 
-comment "libnetfilter_queue requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libnetfilter_queue requires a toolchain with LARGEFILE and IPv6 support"
+	depends on !BR2_LARGEFILE && !BR2_INET_IPV6

new file mode 100644
index 0000000..576434b
@@ -0,0 +1,42 @@
+From ab7769e4b57741c654f1a815b006d6548104ba95 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sat, 10 Nov 2012 22:24:56 +0100
+Subject: [PATCH] Make IPv6 configurable
+
+Add an autoconf check that verifies whether IPv6 is available or not,
+and define the INET6 macro if available, instead of hardcoding it in
+src/Makefile.am.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ configure.in    |    3 +++
+ src/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index de1c730..57f0bf0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -61,6 +61,9 @@ AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking],
+ 	esac],[libwarp=false])
+ AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
+ 
++AC_CHECK_HEADER(netinet/ip6.h,
++        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]))
++
+ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
+ AC_OUTPUT()
+                                                                    
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cc0a85b..3826eca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
++INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \
+                                                 -D_GNU_SOURCE -Wall -pipe
+ if DEBUG
+ INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
+-- 
+1.7.9.5
+

index de9a421..382e53b 100644
@@ -9,6 +9,7 @@ RPCBIND_SITE    = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPC
 RPCBIND_SOURCE  = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING
+RPCBIND_AUTORECONF = YES
 
 RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"