From 1b674cc1df9e919d61ad45668b0dd3221b9b3544 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Feb 2018 00:46:52 +0000 Subject: libtirpc: refresh patches Signed-off-by: Ross Burton --- .../0001-include-stdint.h-for-uintptr_t.patch | 23 ++++----- .../0001-replace-__bzero-with-memset-API.patch | 58 +++++++++++++++++----- .../libtirpc/export_key_secretkey_is_set.patch | 29 +++++++---- 3 files changed, 74 insertions(+), 36 deletions(-) (limited to 'meta') 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 @@ -From b80d3b573c1dade2b29b22f8acc3b9e2c7ddefd7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 20 May 2017 13:36:43 -0700 -Subject: [PATCH] include stdint.h for uintptr_t +Upstream-Status: Backport +Signed-off-by: Ross Burton -Fixes -| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? -| if (len < (uintptr_t)xdrs->x_base) { -| ^~~~~~~~~ +From acb9a37977cf0a9630eac74af9adebf35e38e719 Mon Sep 17 00:00:00 2001 +From: Thorsten Kukuk +Date: Tue, 14 Nov 2017 10:39:08 -0500 +Subject: [PATCH] Include stdint.h from xdr_sizeof.c to avoid missing + declaration errors. -Signed-off-by: Khem Raj +Signed-off-by: Thorsten Kukuk +Signed-off-by: Steve Dickson --- -Upstream-Status: Pending - src/xdr_sizeof.c | 1 + 1 file changed, 1 insertion(+) @@ -28,5 +26,4 @@ index d23fbd1..79d6707 100644 /* ARGSUSED */ -- -2.13.0 - +1.8.3.1 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 @@ -From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Apr 2017 09:35:35 -0700 -Subject: [PATCH] replace __bzero() with memset() API +Upstream-Status: Backport +Signed-off-by: Ross Burton -memset is available across all libc implementation +From 5356b63005e9d8169e0399cb76f26fbd29a78dee Mon Sep 17 00:00:00 2001 +From: Joshua Kinard +Date: Wed, 23 Aug 2017 14:31:36 -0400 +Subject: [PATCH] Replace bzero() calls with equivalent memset() calls -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending +As annotated in the bzero(3) man page, bzero() was marked as LEGACY in +POSIX.1-2001 and removed in POSIX.1-2008, and should be replaced with +memset() calls to write zeros to a memory region. The attached patch +replaces two bzero() calls and one __bzero() call in libtirpc with +equivalent memset() calls. The latter replacement fixes a compile error +under uclibc-ng, which lacks a definition for __bzero() - src/des_impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Signed-off-by: Joshua Kinard +Signed-off-by: Steve Dickson +--- + src/auth_time.c | 2 +- + src/des_impl.c | 2 +- + src/svc_auth_des.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/src/auth_time.c b/src/auth_time.c +index 7f83ab4..69400bc 100644 +--- a/src/auth_time.c ++++ b/src/auth_time.c +@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) + sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4); + useua = &ipuaddr[0]; + +- bzero((char *)&sin, sizeof(sin)); ++ memset(&sin, 0, sizeof(sin)); + if (uaddr_to_sockaddr(useua, &sin)) { + msg("unable to translate uaddr to sockaddr."); + if (needfree) diff --git a/src/des_impl.c b/src/des_impl.c index 9dbccaf..15bec2a 100644 --- a/src/des_impl.c @@ -25,6 +47,18 @@ index 9dbccaf..15bec2a 100644 return (1); } +diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c +index 2e90146..19a7c60 100644 +--- a/src/svc_auth_des.c ++++ b/src/svc_auth_des.c +@@ -356,7 +356,7 @@ cache_init() + + authdes_cache = (struct cache_entry *) + mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ); +- bzero((char *)authdes_cache, ++ memset(authdes_cache, 0, + sizeof(struct cache_entry) * AUTHDES_CACHESZ); + + authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ); -- -2.12.2 - +1.8.3.1 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 @@ -Add key_secretkey_is_set to exported symbols map +Upstream-Status: Backport +Signed-off-by: Ross Burton -key_secret_is_set is a typo in libtirpc map -Patch taken from +From e51d67549b516b2dac6c71d92c8499f6e67125ad Mon Sep 17 00:00:00 2001 +From: Thorsten Kukuk +Date: Tue, 14 Nov 2017 10:43:53 -0500 +Subject: [PATCH] Fix typo in src/libtirpc.map -https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/ +Which prevents that key_secretkey_is_set will be exported. -Upstream-Status: Pending +Signed-off-by: Thorsten Kukuk +Signed-off-by: Steve Dickson +--- + src/libtirpc.map | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Signed-off-by: Khem Raj - -Index: libtirpc-1.0.1/src/libtirpc.map -=================================================================== ---- libtirpc-1.0.1.orig/src/libtirpc.map -+++ libtirpc-1.0.1/src/libtirpc.map +diff --git a/src/libtirpc.map b/src/libtirpc.map +index f385de5..21d6065 100644 +--- a/src/libtirpc.map ++++ b/src/libtirpc.map @@ -298,7 +298,7 @@ TIRPC_0.3.2 { key_gendes; key_get_conv; @@ -22,3 +27,5 @@ Index: libtirpc-1.0.1/src/libtirpc.map key_setnet; netname2host; netname2user; +-- +1.8.3.1 -- cgit 1.2.3-korg