1 |
commit: 87ec7f7f26cabc142eb8460a4d3287940fea9fa3 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 14:48:20 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 15:08:05 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ec7f7f |
7 |
|
8 |
net-nds/rpcbind: add upstream fix for building w/newer libtirpc |
9 |
|
10 |
net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch | 42 ++++++++++++++++++++++ |
11 |
net-nds/rpcbind/rpcbind-0.2.3.ebuild | 1 + |
12 |
2 files changed, 43 insertions(+) |
13 |
|
14 |
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch b/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch |
15 |
new file mode 100644 |
16 |
index 0000000..92ea22f |
17 |
--- /dev/null |
18 |
+++ b/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch |
19 |
@@ -0,0 +1,42 @@ |
20 |
+fix from upstream for building w/newer libtirpc |
21 |
+ |
22 |
+From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 |
23 |
+From: Steve Dickson <steved@××××××.com> |
24 |
+Date: Mon, 2 Nov 2015 17:05:18 -0500 |
25 |
+Subject: [PATCH rpcbind] handle_reply: Don't use the xp_auth pointer directly |
26 |
+ |
27 |
+In the latest libtirpc version to access the xp_auth |
28 |
+one must use the SVC_XP_AUTH macro. To be backwards |
29 |
+compatible a couple ifdefs were added to use the |
30 |
+macro when it exists. |
31 |
+ |
32 |
+Signed-off-by: Steve Dickson <steved@××××××.com> |
33 |
+--- |
34 |
+ src/rpcb_svc_com.c | 7 +++++++ |
35 |
+ 1 file changed, 7 insertions(+) |
36 |
+ |
37 |
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c |
38 |
+index 4ae93f1..22d6c84 100644 |
39 |
+--- a/src/rpcb_svc_com.c |
40 |
++++ b/src/rpcb_svc_com.c |
41 |
+@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) |
42 |
+ a.rmt_localvers = fi->versnum; |
43 |
+ |
44 |
+ xprt_set_caller(xprt, fi); |
45 |
++#if defined(SVC_XP_AUTH) |
46 |
++ SVC_XP_AUTH(xprt) = svc_auth_none; |
47 |
++#else |
48 |
+ xprt->xp_auth = &svc_auth_none; |
49 |
++#endif |
50 |
+ svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); |
51 |
++#if !defined(SVC_XP_AUTH) |
52 |
+ SVCAUTH_DESTROY(xprt->xp_auth); |
53 |
+ xprt->xp_auth = NULL; |
54 |
++#endif |
55 |
++ |
56 |
+ done: |
57 |
+ if (buffer) |
58 |
+ free(buffer); |
59 |
+-- |
60 |
+2.5.2 |
61 |
+ |
62 |
|
63 |
diff --git a/net-nds/rpcbind/rpcbind-0.2.3.ebuild b/net-nds/rpcbind/rpcbind-0.2.3.ebuild |
64 |
index 23a68ef..a2437fe 100644 |
65 |
--- a/net-nds/rpcbind/rpcbind-0.2.3.ebuild |
66 |
+++ b/net-nds/rpcbind/rpcbind-0.2.3.ebuild |
67 |
@@ -31,6 +31,7 @@ RDEPEND="${CDEPEND} |
68 |
|
69 |
src_prepare() { |
70 |
[[ ${PV} == "9999" ]] && eautoreconf |
71 |
+ epatch "${FILESDIR}"/${P}-libtirpc.patch |
72 |
epatch_user |
73 |
} |