diff options
author | Maxin B. John <maxin.john@intel.com> | 2015-12-21 17:59:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:18 +0000 |
commit | 866c693cd354eec625a9fdbadc3ac2f1c15792ef (patch) | |
tree | fe264a27216950a4f050a8bee5e99ebbb7ecdd48 /meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | |
parent | 5754b8304de3f4384cdfc3060f6e59647d27d6e2 (diff) | |
download | poky-866c693cd354eec625a9fdbadc3ac2f1c15792ef.tar.gz |
libtirpc: upgrade to 1.0.1
0.2.5 -> 1.0.1
Fixed build with uclibc and musl
(From OE-Core rev: 79fed87ca1fb2f33080920a97cf036d53f267d12)
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>
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch')
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch new file mode 100644 index 0000000000..512e93497d --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch | |||
@@ -0,0 +1,144 @@ | |||
1 | uclibc and musl does not provide des functionality. Lets disable it. | ||
2 | |||
3 | Upstream-Status: Inappropriate [uclibc and musl specific] | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
7 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
8 | --- | ||
9 | diff -Naur libtirpc-1.0.1-orig/src/Makefile.am libtirpc-1.0.1/src/Makefile.am | ||
10 | --- libtirpc-1.0.1-orig/src/Makefile.am 2015-10-30 17:15:14.000000000 +0200 | ||
11 | +++ libtirpc-1.0.1/src/Makefile.am 2015-12-21 15:56:17.094702429 +0200 | ||
12 | @@ -22,9 +22,8 @@ | ||
13 | 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 | 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_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 | + debug.c | ||
20 | |||
21 | ## 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 | @@ -41,8 +40,8 @@ | ||
24 | libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) | ||
25 | endif | ||
26 | |||
27 | -libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c | ||
28 | -libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c | ||
29 | +#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c | ||
30 | +#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c | ||
31 | |||
32 | CLEANFILES = cscope.* *~ | ||
33 | DISTCLEANFILES = Makefile.in | ||
34 | diff -Naur libtirpc-1.0.1-orig/src/rpc_soc.c 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 | +++ libtirpc-1.0.1/src/rpc_soc.c 2015-12-21 15:56:17.095702416 +0200 | ||
37 | @@ -61,7 +61,6 @@ | ||
38 | #include <string.h> | ||
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 | } | ||
47 | |||
48 | /* | ||
49 | - * Create the client des authentication object. Obsoleted by | ||
50 | - * authdes_seccreate(). | ||
51 | - */ | ||
52 | -AUTH * | ||
53 | -authdes_create(servername, window, syncaddr, ckey) | ||
54 | - char *servername; /* network name of server */ | ||
55 | - u_int window; /* time to live */ | ||
56 | - struct sockaddr *syncaddr; /* optional hostaddr to sync with */ | ||
57 | - des_block *ckey; /* optional conversation key to use */ | ||
58 | -{ | ||
59 | - AUTH *nauth; | ||
60 | - char hostname[NI_MAXHOST]; | ||
61 | - | ||
62 | - if (syncaddr) { | ||
63 | - /* | ||
64 | - * Change addr to hostname, because that is the way | ||
65 | - * new interface takes it. | ||
66 | - */ | ||
67 | - switch (syncaddr->sa_family) { | ||
68 | - case AF_INET: | ||
69 | - if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, | ||
70 | - sizeof hostname, NULL, 0, 0) != 0) | ||
71 | - goto fallback; | ||
72 | - break; | ||
73 | - case AF_INET6: | ||
74 | - if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname, | ||
75 | - sizeof hostname, NULL, 0, 0) != 0) | ||
76 | - goto fallback; | ||
77 | - break; | ||
78 | - default: | ||
79 | - goto fallback; | ||
80 | - } | ||
81 | - nauth = authdes_seccreate(servername, window, hostname, ckey); | ||
82 | - return (nauth); | ||
83 | - } | ||
84 | -fallback: | ||
85 | - return authdes_seccreate(servername, window, NULL, ckey); | ||
86 | -} | ||
87 | - | ||
88 | -/* | ||
89 | - * Create the client des authentication object. Obsoleted by | ||
90 | - * authdes_pk_seccreate(). | ||
91 | - */ | ||
92 | -extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *, | ||
93 | - const des_block *, nis_server *); | ||
94 | - | ||
95 | -AUTH * | ||
96 | -authdes_pk_create(servername, pkey, window, syncaddr, ckey) | ||
97 | - char *servername; /* network name of server */ | ||
98 | - netobj *pkey; /* public key */ | ||
99 | - u_int window; /* time to live */ | ||
100 | - struct sockaddr *syncaddr; /* optional hostaddr to sync with */ | ||
101 | - des_block *ckey; /* optional conversation key to use */ | ||
102 | -{ | ||
103 | - AUTH *nauth; | ||
104 | - char hostname[NI_MAXHOST]; | ||
105 | - | ||
106 | - if (syncaddr) { | ||
107 | - /* | ||
108 | - * Change addr to hostname, because that is the way | ||
109 | - * new interface takes it. | ||
110 | - */ | ||
111 | - switch (syncaddr->sa_family) { | ||
112 | - case AF_INET: | ||
113 | - if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, | ||
114 | - sizeof hostname, NULL, 0, 0) != 0) | ||
115 | - goto fallback; | ||
116 | - break; | ||
117 | - default: | ||
118 | - goto fallback; | ||
119 | - } | ||
120 | - nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL); | ||
121 | - return (nauth); | ||
122 | - } | ||
123 | -fallback: | ||
124 | - return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL); | ||
125 | -} | ||
126 | - | ||
127 | - | ||
128 | -/* | ||
129 | * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() | ||
130 | */ | ||
131 | CLIENT * | ||
132 | diff -Naur libtirpc-1.0.1-orig/src/svc_auth.c 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 | ||
134 | +++ libtirpc-1.0.1/src/svc_auth.c 2015-12-21 15:56:17.095702416 +0200 | ||
135 | @@ -114,9 +114,6 @@ | ||
136 | case AUTH_SHORT: | ||
137 | dummy = _svcauth_short(rqst, msg); | ||
138 | return (dummy); | ||
139 | - case AUTH_DES: | ||
140 | - dummy = _svcauth_des(rqst, msg); | ||
141 | - return (dummy); | ||
142 | #ifdef HAVE_RPCSEC_GSS | ||
143 | case RPCSEC_GSS: | ||
144 | dummy = _svcauth_gss(rqst, msg, no_dispatch); | ||