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

libtirpc: bump to 0.2.4 



This commit bumps the version of libtirpc to the latest upstream
version 0.2.4, with the following changes on the patches:

 Updated to take into account minor upstream changes:

 - libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
 - libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
 - libtirpc-0004-Make-IPv6-support-optional.patch
 - libtirpc-0008-Add-rpcgen-program-from-nfs-utils-sources.patch
 - libtirpc-0009-Automatically-generate-XDR-header-files-from-.x-sour.patch
 - libtirpc-0010-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch

 Removed since they were merged upstream:

 - libtirpc-0003-Add-missing-INET6-conditional.patch
 - libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch
 - libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch
 - libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ea7061f4

package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch

+17 −17
Original line number Diff line number Diff line 
From cc4ec3294cb06724c83d4c4e1ea9fc2e38923c98 Mon Sep 17 00:00:00 2001

From 4285205401faeb12b4ed7ebbc4658af9eae73eb4 Mon Sep 17 00:00:00 2001

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

Date: Sat, 23 Jun 2012 21:57:39 +0200

Subject: [PATCH] Disable parts of TIRPC requiring NIS support
@@ -11,24 +11,24 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 3 files changed, 6 insertions(+), 2 deletions(-)



diff --git a/src/Makefile.am b/src/Makefile.am

index 7ee8cbc..6d36b93 100644

index 3029b78..b5db263 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -49,8 +49,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln

@@ -50,8 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln

         pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \

         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \

         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \

-        svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \

-        auth_time.c auth_des.c authdes_prot.c des_crypt.c

+        svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c

         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \

-        svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \

-        auth_time.c auth_des.c authdes_prot.c

+        svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c

 

 ## XDR

 libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c

diff --git a/src/rpc_soc.c b/src/rpc_soc.c

index c678429..27f2136 100644

index 4213ca0..2603548 100644

--- a/src/rpc_soc.c

+++ b/src/rpc_soc.c

@@ -515,6 +515,7 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)

@@ -520,6 +520,7 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)

 	    (resultproc_t) rpc_wrap_bcast, "udp");

 }
@@ -36,7 +36,7 @@ index c678429..27f2136 100644 
 /*

  * Create the client des authentication object. Obsoleted by

  * authdes_seccreate().

@@ -546,6 +547,7 @@ fallback:

@@ -551,6 +552,7 @@ fallback:

 	dummy = authdes_seccreate(servername, window, NULL, ckey);

 	return (dummy);

 }
@@ -45,10 +45,10 @@ index c678429..27f2136 100644 
 /*

  * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()

diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h

index 734e6b9..6e7e54e 100644

index 4ce11f0..b894e44 100644

--- a/tirpc/rpc/auth.h

+++ b/tirpc/rpc/auth.h

@@ -282,6 +282,8 @@ extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);

@@ -305,6 +305,8 @@ extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);

 extern AUTH *authunix_create_default(void);	/* takes no parameters */

 extern AUTH *authnone_create(void);		/* takes no parameters */

 __END_DECLS
@@ -57,7 +57,7 @@ index 734e6b9..6e7e54e 100644 
 /*

  * DES style authentication

  * AUTH *authsecdes_create(servername, window, timehost, ckey)

@@ -295,6 +297,7 @@ extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);

@@ -318,6 +320,7 @@ extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);

 extern AUTH *authdes_seccreate (const char *, const u_int, const  char *,

     const  des_block *);

 __END_DECLS
@@ -66,5 +66,5 @@ index 734e6b9..6e7e54e 100644 
 __BEGIN_DECLS

 extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);

-- 

1.7.9.5

2.0.0

package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch

+4 −4
Original line number Diff line number Diff line 
From c2e96bdc453334f10faf8db0eb06e41ab3ca4fe9 Mon Sep 17 00:00:00 2001

From a20f33ad121fb1e9d1fbc31a0044546450677e7a Mon Sep 17 00:00:00 2001

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

Date: Sat, 23 Jun 2012 21:58:07 +0200

Subject: [PATCH] uClibc without RPC support does not install rpcent.h
@@ -9,7 +9,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h

index 7fd93d9..8ce05ed 100644

index c865e51..45775ed 100644

--- a/tirpc/rpc/rpcent.h

+++ b/tirpc/rpc/rpcent.h

@@ -46,8 +46,9 @@
@@ -25,5 +25,5 @@ index 7fd93d9..8ce05ed 100644 
 	char	*r_name;	/* name of server for this rpc program */

 	char	**r_aliases;	/* alias list */

-- 

1.7.9.5

2.0.0

package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
From a40e00a16cf43245953ad6d43a4f260a47e6d198 Mon Sep 17 00:00:00 2001

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

Date: Sat, 23 Jun 2012 21:58:36 +0200

Subject: [PATCH] Add missing INET6 conditional



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

---

 src/rpc_generic.c |    2 ++

 src/svc_dg.c      |    4 ++++

 2 files changed, 6 insertions(+)



diff --git a/src/rpc_generic.c b/src/rpc_generic.c

index 509fb36..2eb91ad 100644

--- a/src/rpc_generic.c

+++ b/src/rpc_generic.c

@@ -535,7 +535,9 @@ __rpc_nconf2fd_flags(const struct netconfig *nconf, int flags)

 	    si.si_af == AF_INET6) {

 		int val = 1;

 

+#ifdef INET6

 		setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val, sizeof(val));

+#endif

 	}

 	return fd;

 }

diff --git a/src/svc_dg.c b/src/svc_dg.c

index 66a56ee..e8faf33 100644

--- a/src/svc_dg.c

+++ b/src/svc_dg.c

@@ -627,9 +627,11 @@ svc_dg_enable_pktinfo(int fd, const struct __rpc_sockinfo *si)

 		(void) setsockopt(fd, SOL_IP, IP_PKTINFO, &val, sizeof(val));

 		break;

 

+#ifdef INET6

 	case AF_INET6:

 		(void) setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &val, sizeof(val));

 		break;

+#endif

 	}

 }

 

@@ -667,6 +669,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)

 		}

 		break;

 

+#ifdef INET6

 	case AF_INET6:

 		if (cmsg->cmsg_level != SOL_IPV6

 		 || cmsg->cmsg_type != IPV6_PKTINFO

@@ -679,6 +682,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)

 			pkti->ipi6_ifindex = 0;

 		}

 		break;

+#endif

 

 	default:

 		return 0;

-- 

1.7.9.5

package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch

+9 −26
Original line number Diff line number Diff line 
From 5ce585bed328fafc99800effb5e9d1b07dbac2b7 Mon Sep 17 00:00:00 2001

From fbe5fccf0e3bdaae3defc66a288176797fd12a17 Mon Sep 17 00:00:00 2001

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

Date: Sun, 24 Jun 2012 21:40:21 +0200

Subject: [PATCH] Make IPv6 support optional



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

---

 configure.ac    |    5 +++++

 src/Makefile.am | 2 +-

 2 files changed, 6 insertions(+), 1 deletion(-)



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

index 97c6f2c..487ec83 100644

--- a/configure.ac

+++ b/configure.ac

@@ -22,6 +22,11 @@ AC_PROG_LIBTOOL

 AC_HEADER_DIRENT

 AC_PREFIX_DEFAULT(/usr)

 AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])

+

+AC_CHECK_HEADER(netinet/ip6.h,

+	AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]),

+	[AC_MSG_WARN([no IPv6])])

+

 AC_CHECK_LIB([pthread], [pthread_create])

 

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/src/Makefile.am b/src/Makefile.am

index 6d36b93..6dc259e 100644

index b5db263..f086255 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -6,7 +6,7 @@

 ## anything like that.

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

 

 noinst_HEADERS = rpc_com.h

 

-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \

+INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \

-AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \

+AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP \

 		-D_GNU_SOURCE -Wall -pipe  

 

 lib_LTLIBRARIES = libtirpc.la

-- 

1.7.9.5

2.0.0

package/libtirpc/libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
From 88147b753b86df7e7505ef8150f1329f7c6951cc Mon Sep 17 00:00:00 2001

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

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 <thomas.petazzoni@free-electrons.com>

---

 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