diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2015-12-21 17:59:56 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-27 11:27:00 +0000 |
| commit | 53176113f7c149279af5b30dd5b48d2fe5fdea07 (patch) | |
| tree | d9ffd8b2dcdf26ed4cd800db48466dfd0c889ddf | |
| parent | 79fed87ca1fb2f33080920a97cf036d53f267d12 (diff) | |
| download | openembedded-core-contrib-53176113f7c149279af5b30dd5b48d2fe5fdea07.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.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb | 1 |
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 @@ +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson <steved@redhat.com> +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Upstream-Status: Backport + +Signed-off-by: Steve Dickson <steved@redhat.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) + a.rmt_localvers = fi->versnum; + + xprt_set_caller(xprt, fi); ++#if defined(SVC_XP_AUTH) ++ SVC_XP_AUTH(xprt) = svc_auth_none; ++#else + xprt->xp_auth = &svc_auth_none; ++#endif + svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); ++#if !defined(SVC_XP_AUTH) + SVCAUTH_DESTROY(xprt->xp_auth); + xprt->xp_auth = NULL; ++#endif ++ + done: + if (buffer) + free(buffer); +-- +2.4.0 + 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 \ file://init.d \ file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \ file://remove-sys-queue.patch \ + file://0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch \ ${UCLIBCPATCHES} \ ${MUSLPATCHES} \ file://rpcbind.conf \ |