summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-18 16:40:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 22:47:53 (GMT)
commit4517909ce6105dc9a414c24604c93670b5b81b8a (patch)
treecb65fbb73729ad6f7c78d77ade50f6ef75f06fdb
parent9a4f6264d24bda0ebfc2f22457a46e1277f20ffe (diff)
downloadpoky-4517909ce6105dc9a414c24604c93670b5b81b8a.tar.gz
libtirpc: Enable des APIs for musl
Use memset() API instead of __bzero() Drop the patch removing des_* functions for musl (From OE-Core rev: 8264826911888bd45b1d0cc914675d30a1a78546) 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>
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch30
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch139
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb5
3 files changed, 33 insertions, 141 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch
new file mode 100644
index 0000000..d2b4da6
--- /dev/null
+++ b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch
@@ -0,0 +1,30 @@
1From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 18 Apr 2017 09:35:35 -0700
4Subject: [PATCH] replace __bzero() with memset() API
5
6memset is available across all libc implementation
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 src/des_impl.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/des_impl.c b/src/des_impl.c
16index 9dbccaf..15bec2a 100644
17--- a/src/des_impl.c
18+++ b/src/des_impl.c
19@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
20 }
21 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
22 tbuf[0] = tbuf[1] = 0;
23- __bzero (schedule, sizeof (schedule));
24+ memset (schedule, 0, sizeof (schedule));
25
26 return (1);
27 }
28--
292.12.2
30
diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch
deleted file mode 100644
index 31e9774..0000000
--- a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch
+++ /dev/null
@@ -1,139 +0,0 @@
1uclibc and musl does not provide des functionality. Lets disable it.
2
3Upstream-Status: Inappropriate [uclibc and musl specific]
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
7Signed-off-by: Maxin B. John <maxin.john@intel.com>
8---
9Index: libtirpc-1.0.1/src/Makefile.am
10===================================================================
11--- libtirpc-1.0.1.orig/src/Makefile.am
12+++ libtirpc-1.0.1/src/Makefile.am
13@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
14 pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
15 rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
16 rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
17- svc_auth_des.c \
18 svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
19- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
20+ debug.c
21
22 ## XDR
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
24@@ -41,8 +40,8 @@ if GSS
25 libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
26 endif
27
28-libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
29-libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
30+#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
31+#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
32
33 CLEANFILES = cscope.* *~
34 DISTCLEANFILES = Makefile.in
35Index: libtirpc-1.0.1/src/rpc_soc.c
36===================================================================
37--- libtirpc-1.0.1.orig/src/rpc_soc.c
38+++ libtirpc-1.0.1/src/rpc_soc.c
39@@ -522,86 +522,6 @@ clnt_broadcast(prog, vers, proc, xargs,
40 }
41
42 /*
43- * Create the client des authentication object. Obsoleted by
44- * authdes_seccreate().
45- */
46-AUTH *
47-authdes_create(servername, window, syncaddr, ckey)
48- char *servername; /* network name of server */
49- u_int window; /* time to live */
50- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
51- des_block *ckey; /* optional conversation key to use */
52-{
53- AUTH *nauth;
54- char hostname[NI_MAXHOST];
55-
56- if (syncaddr) {
57- /*
58- * Change addr to hostname, because that is the way
59- * new interface takes it.
60- */
61- switch (syncaddr->sa_family) {
62- case AF_INET:
63- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
64- sizeof hostname, NULL, 0, 0) != 0)
65- goto fallback;
66- break;
67- case AF_INET6:
68- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname,
69- sizeof hostname, NULL, 0, 0) != 0)
70- goto fallback;
71- break;
72- default:
73- goto fallback;
74- }
75- nauth = authdes_seccreate(servername, window, hostname, ckey);
76- return (nauth);
77- }
78-fallback:
79- return authdes_seccreate(servername, window, NULL, ckey);
80-}
81-
82-/*
83- * Create the client des authentication object. Obsoleted by
84- * authdes_pk_seccreate().
85- */
86-extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
87- const des_block *, nis_server *);
88-
89-AUTH *
90-authdes_pk_create(servername, pkey, window, syncaddr, ckey)
91- char *servername; /* network name of server */
92- netobj *pkey; /* public key */
93- u_int window; /* time to live */
94- struct sockaddr *syncaddr; /* optional hostaddr to sync with */
95- des_block *ckey; /* optional conversation key to use */
96-{
97- AUTH *nauth;
98- char hostname[NI_MAXHOST];
99-
100- if (syncaddr) {
101- /*
102- * Change addr to hostname, because that is the way
103- * new interface takes it.
104- */
105- switch (syncaddr->sa_family) {
106- case AF_INET:
107- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
108- sizeof hostname, NULL, 0, 0) != 0)
109- goto fallback;
110- break;
111- default:
112- goto fallback;
113- }
114- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL);
115- return (nauth);
116- }
117-fallback:
118- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL);
119-}
120-
121-
122-/*
123 * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
124 */
125 CLIENT *
126Index: libtirpc-1.0.1/src/svc_auth.c
127===================================================================
128--- libtirpc-1.0.1.orig/src/svc_auth.c
129+++ libtirpc-1.0.1/src/svc_auth.c
130@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch
131 case AUTH_SHORT:
132 dummy = _svcauth_short(rqst, msg);
133 return (dummy);
134- case AUTH_DES:
135- dummy = _svcauth_des(rqst, msg);
136- return (dummy);
137 #ifdef HAVE_RPCSEC_GSS
138 case RPCSEC_GSS:
139 dummy = _svcauth_gss(rqst, msg, no_dispatch);
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
index b96abc4..662c899 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
@@ -14,12 +14,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \
14 file://libtirpc-1.0.2-rc3.patch \ 14 file://libtirpc-1.0.2-rc3.patch \
15 file://libtirpc-0.2.1-fortify.patch \ 15 file://libtirpc-0.2.1-fortify.patch \
16 file://export_key_secretkey_is_set.patch \ 16 file://export_key_secretkey_is_set.patch \
17 " 17 file://0001-replace-__bzero-with-memset-API.patch \
18 "
18 19
19SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ 20SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \
20 " 21 "
21 22
22SRC_URI_append_libc-musl = " file://remove-des-functionality.patch \ 23SRC_URI_append_libc-musl = " \
23 file://Use-netbsd-queue.h.patch \ 24 file://Use-netbsd-queue.h.patch \
24 " 25 "
25 26