diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-18 18:58:35 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-11 16:59:18 +0100 |
commit | c564d57c5b9a8fca9afc8fd2632185b20231a75a (patch) | |
tree | d31e1692f8b9575529f9842878a4d984c75f969b /meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | |
parent | 53073a1dce6c65163e244bee64e5489cbb44fcc1 (diff) | |
download | poky-c564d57c5b9a8fca9afc8fd2632185b20231a75a.tar.gz |
libtirpc: Backport fixes from 1.0.2rc3
These fixes are needed for it to work with gcc7
(From OE-Core rev: 7302d099f65215fe161f16593ad6f87e1944a8f7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch')
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch index 512e93497d..31e97744cb 100644 --- a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch +++ b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | |||
@@ -6,21 +6,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
6 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 6 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
7 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 7 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
8 | --- | 8 | --- |
9 | diff -Naur libtirpc-1.0.1-orig/src/Makefile.am libtirpc-1.0.1/src/Makefile.am | 9 | Index: libtirpc-1.0.1/src/Makefile.am |
10 | --- libtirpc-1.0.1-orig/src/Makefile.am 2015-10-30 17:15:14.000000000 +0200 | 10 | =================================================================== |
11 | +++ libtirpc-1.0.1/src/Makefile.am 2015-12-21 15:56:17.094702429 +0200 | 11 | --- libtirpc-1.0.1.orig/src/Makefile.am |
12 | @@ -22,9 +22,8 @@ | 12 | +++ libtirpc-1.0.1/src/Makefile.am |
13 | @@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u | ||
13 | pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ | 14 | pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ |
14 | rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ | 15 | rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ |
15 | rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ | 16 | rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ |
16 | - svc_auth_des.c \ | 17 | - svc_auth_des.c \ |
17 | svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ | 18 | svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ |
18 | - auth_time.c auth_des.c authdes_prot.c debug.c | 19 | - auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c |
19 | + debug.c | 20 | + debug.c |
20 | 21 | ||
21 | ## XDR | 22 | ## XDR |
22 | libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c | 23 | libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c |
23 | @@ -41,8 +40,8 @@ | 24 | @@ -41,8 +40,8 @@ if GSS |
24 | libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) | 25 | libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) |
25 | endif | 26 | endif |
26 | 27 | ||
@@ -31,18 +32,11 @@ diff -Naur libtirpc-1.0.1-orig/src/Makefile.am libtirpc-1.0.1/src/Makefile.am | |||
31 | 32 | ||
32 | CLEANFILES = cscope.* *~ | 33 | CLEANFILES = cscope.* *~ |
33 | DISTCLEANFILES = Makefile.in | 34 | DISTCLEANFILES = Makefile.in |
34 | diff -Naur libtirpc-1.0.1-orig/src/rpc_soc.c libtirpc-1.0.1/src/rpc_soc.c | 35 | Index: libtirpc-1.0.1/src/rpc_soc.c |
35 | --- libtirpc-1.0.1-orig/src/rpc_soc.c 2015-10-30 17:15:14.000000000 +0200 | 36 | =================================================================== |
36 | +++ libtirpc-1.0.1/src/rpc_soc.c 2015-12-21 15:56:17.095702416 +0200 | 37 | --- libtirpc-1.0.1.orig/src/rpc_soc.c |
37 | @@ -61,7 +61,6 @@ | 38 | +++ libtirpc-1.0.1/src/rpc_soc.c |
38 | #include <string.h> | 39 | @@ -522,86 +522,6 @@ clnt_broadcast(prog, vers, proc, xargs, |
39 | #include <unistd.h> | ||
40 | #include <fcntl.h> | ||
41 | -#include <rpcsvc/nis.h> | ||
42 | |||
43 | #include "rpc_com.h" | ||
44 | |||
45 | @@ -522,86 +521,6 @@ | ||
46 | } | 40 | } |
47 | 41 | ||
48 | /* | 42 | /* |
@@ -129,10 +123,11 @@ diff -Naur libtirpc-1.0.1-orig/src/rpc_soc.c libtirpc-1.0.1/src/rpc_soc.c | |||
129 | * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() | 123 | * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() |
130 | */ | 124 | */ |
131 | CLIENT * | 125 | CLIENT * |
132 | diff -Naur libtirpc-1.0.1-orig/src/svc_auth.c libtirpc-1.0.1/src/svc_auth.c | 126 | Index: libtirpc-1.0.1/src/svc_auth.c |
133 | --- libtirpc-1.0.1-orig/src/svc_auth.c 2015-10-30 17:15:14.000000000 +0200 | 127 | =================================================================== |
134 | +++ libtirpc-1.0.1/src/svc_auth.c 2015-12-21 15:56:17.095702416 +0200 | 128 | --- libtirpc-1.0.1.orig/src/svc_auth.c |
135 | @@ -114,9 +114,6 @@ | 129 | +++ libtirpc-1.0.1/src/svc_auth.c |
130 | @@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch | ||
136 | case AUTH_SHORT: | 131 | case AUTH_SHORT: |
137 | dummy = _svcauth_short(rqst, msg); | 132 | dummy = _svcauth_short(rqst, msg); |
138 | return (dummy); | 133 | return (dummy); |