summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2015-12-21 17:59:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:18 +0000
commitf70d46f4bc56e2482b703fda2f41ad73631e792b (patch)
tree7fc4575364bcaaf6f038180196d87b6e880d6cb0
parent866c693cd354eec625a9fdbadc3ac2f1c15792ef (diff)
downloadpoky-f70d46f4bc56e2482b703fda2f41ad73631e792b.tar.gz
rpcbind: Fix build with libtirpc 1.0.1
libtirpc 1.0.1 uses the SVC_XP_AUTH macro to access xp_auth. Update rpcbind to follow the same way. (From OE-Core rev: 53176113f7c149279af5b30dd5b48d2fe5fdea07) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch43
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
new file mode 100644
index 0000000000..16b763ef0d
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
@@ -0,0 +1,43 @@
1From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
2From: Steve Dickson <steved@redhat.com>
3Date: Mon, 2 Nov 2015 17:05:18 -0500
4Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly
5
6In the latest libtirpc version to access the xp_auth
7one must use the SVC_XP_AUTH macro. To be backwards
8compatible a couple ifdefs were added to use the
9macro when it exists.
10
11Upstream-Status: Backport
12
13Signed-off-by: Steve Dickson <steved@redhat.com>
14Signed-off-by: Maxin B. John <maxin.john@intel.com>
15---
16 src/rpcb_svc_com.c | 7 +++++++
17 1 file changed, 7 insertions(+)
18
19diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
20index 4ae93f1..22d6c84 100644
21--- a/src/rpcb_svc_com.c
22+++ b/src/rpcb_svc_com.c
23@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
24 a.rmt_localvers = fi->versnum;
25
26 xprt_set_caller(xprt, fi);
27+#if defined(SVC_XP_AUTH)
28+ SVC_XP_AUTH(xprt) = svc_auth_none;
29+#else
30 xprt->xp_auth = &svc_auth_none;
31+#endif
32 svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
33+#if !defined(SVC_XP_AUTH)
34 SVCAUTH_DESTROY(xprt->xp_auth);
35 xprt->xp_auth = NULL;
36+#endif
37+
38 done:
39 if (buffer)
40 free(buffer);
41--
422.4.0
43
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index ecd3ba8a50..c19a1976a1 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
14 file://init.d \ 14 file://init.d \
15 file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \ 15 file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \
16 file://remove-sys-queue.patch \ 16 file://remove-sys-queue.patch \
17 file://0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch \
17 ${UCLIBCPATCHES} \ 18 ${UCLIBCPATCHES} \
18 ${MUSLPATCHES} \ 19 ${MUSLPATCHES} \
19 file://rpcbind.conf \ 20 file://rpcbind.conf \