summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-02-20 00:46:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:47 +0000
commitf5fed8115ac6e156a5346e434008b3cfdcfbb9b0 (patch)
treec7e28ae481375bd3d07babf2849225bfac78e36e /meta/recipes-extended
parentbaf263e40f34195e68db4f1e86c4216726defbad (diff)
downloadpoky-f5fed8115ac6e156a5346e434008b3cfdcfbb9b0.tar.gz
libtirpc: refresh patches
(From OE-Core rev: 1b674cc1df9e919d61ad45668b0dd3221b9b3544) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch23
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch58
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch29
3 files changed, 74 insertions, 36 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
index 1fe9833afe..7e3e2f86ad 100644
--- a/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
@@ -1,17 +1,15 @@
1From b80d3b573c1dade2b29b22f8acc3b9e2c7ddefd7 Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport
2From: Khem Raj <raj.khem@gmail.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Sat, 20 May 2017 13:36:43 -0700
4Subject: [PATCH] include stdint.h for uintptr_t
5 3
6Fixes 4From acb9a37977cf0a9630eac74af9adebf35e38e719 Mon Sep 17 00:00:00 2001
7| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? 5From: Thorsten Kukuk <kukuk@thkukuk.de>
8| if (len < (uintptr_t)xdrs->x_base) { 6Date: Tue, 14 Nov 2017 10:39:08 -0500
9| ^~~~~~~~~ 7Subject: [PATCH] Include stdint.h from xdr_sizeof.c to avoid missing
8 declaration errors.
10 9
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
11Signed-off-by: Steve Dickson <steved@redhat.com>
12--- 12---
13Upstream-Status: Pending
14
15 src/xdr_sizeof.c | 1 + 13 src/xdr_sizeof.c | 1 +
16 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
17 15
@@ -28,5 +26,4 @@ index d23fbd1..79d6707 100644
28 26
29 /* ARGSUSED */ 27 /* ARGSUSED */
30-- 28--
312.13.0 291.8.3.1
32
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
index d2b4da6ae2..7ae19cb319 100644
--- 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
@@ -1,17 +1,39 @@
1From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport
2From: Khem Raj <raj.khem@gmail.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Tue, 18 Apr 2017 09:35:35 -0700
4Subject: [PATCH] replace __bzero() with memset() API
5 3
6memset is available across all libc implementation 4From 5356b63005e9d8169e0399cb76f26fbd29a78dee Mon Sep 17 00:00:00 2001
5From: Joshua Kinard <kumba@gentoo.org>
6Date: Wed, 23 Aug 2017 14:31:36 -0400
7Subject: [PATCH] Replace bzero() calls with equivalent memset() calls
7 8
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 9As annotated in the bzero(3) man page, bzero() was marked as LEGACY in
9--- 10POSIX.1-2001 and removed in POSIX.1-2008, and should be replaced with
10Upstream-Status: Pending 11memset() calls to write zeros to a memory region. The attached patch
12replaces two bzero() calls and one __bzero() call in libtirpc with
13equivalent memset() calls. The latter replacement fixes a compile error
14under uclibc-ng, which lacks a definition for __bzero()
11 15
12 src/des_impl.c | 2 +- 16Signed-off-by: Joshua Kinard <kumba@gentoo.org>
13 1 file changed, 1 insertion(+), 1 deletion(-) 17Signed-off-by: Steve Dickson <steved@redhat.com>
18---
19 src/auth_time.c | 2 +-
20 src/des_impl.c | 2 +-
21 src/svc_auth_des.c | 2 +-
22 3 files changed, 3 insertions(+), 3 deletions(-)
14 23
24diff --git a/src/auth_time.c b/src/auth_time.c
25index 7f83ab4..69400bc 100644
26--- a/src/auth_time.c
27+++ b/src/auth_time.c
28@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
29 sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
30 useua = &ipuaddr[0];
31
32- bzero((char *)&sin, sizeof(sin));
33+ memset(&sin, 0, sizeof(sin));
34 if (uaddr_to_sockaddr(useua, &sin)) {
35 msg("unable to translate uaddr to sockaddr.");
36 if (needfree)
15diff --git a/src/des_impl.c b/src/des_impl.c 37diff --git a/src/des_impl.c b/src/des_impl.c
16index 9dbccaf..15bec2a 100644 38index 9dbccaf..15bec2a 100644
17--- a/src/des_impl.c 39--- a/src/des_impl.c
@@ -25,6 +47,18 @@ index 9dbccaf..15bec2a 100644
25 47
26 return (1); 48 return (1);
27 } 49 }
50diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c
51index 2e90146..19a7c60 100644
52--- a/src/svc_auth_des.c
53+++ b/src/svc_auth_des.c
54@@ -356,7 +356,7 @@ cache_init()
55
56 authdes_cache = (struct cache_entry *)
57 mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);
58- bzero((char *)authdes_cache,
59+ memset(authdes_cache, 0,
60 sizeof(struct cache_entry) * AUTHDES_CACHESZ);
61
62 authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);
28-- 63--
292.12.2 641.8.3.1
30
diff --git a/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch b/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
index a276ba27a5..d7f4968669 100644
--- a/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
@@ -1,18 +1,23 @@
1Add key_secretkey_is_set to exported symbols map 1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
2 3
3key_secret_is_set is a typo in libtirpc map 4From e51d67549b516b2dac6c71d92c8499f6e67125ad Mon Sep 17 00:00:00 2001
4Patch taken from 5From: Thorsten Kukuk <kukuk@thkukuk.de>
6Date: Tue, 14 Nov 2017 10:43:53 -0500
7Subject: [PATCH] Fix typo in src/libtirpc.map
5 8
6https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/ 9Which prevents that key_secretkey_is_set will be exported.
7 10
8Upstream-Status: Pending 11Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
12Signed-off-by: Steve Dickson <steved@redhat.com>
13---
14 src/libtirpc.map | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
9 16
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 17diff --git a/src/libtirpc.map b/src/libtirpc.map
11 18index f385de5..21d6065 100644
12Index: libtirpc-1.0.1/src/libtirpc.map 19--- a/src/libtirpc.map
13=================================================================== 20+++ b/src/libtirpc.map
14--- libtirpc-1.0.1.orig/src/libtirpc.map
15+++ libtirpc-1.0.1/src/libtirpc.map
16@@ -298,7 +298,7 @@ TIRPC_0.3.2 { 21@@ -298,7 +298,7 @@ TIRPC_0.3.2 {
17 key_gendes; 22 key_gendes;
18 key_get_conv; 23 key_get_conv;
@@ -22,3 +27,5 @@ Index: libtirpc-1.0.1/src/libtirpc.map
22 key_setnet; 27 key_setnet;
23 netname2host; 28 netname2host;
24 netname2user; 29 netname2user;
30--
311.8.3.1