From 3a2d075eb908fbad2338f72105bec3193f43d76c Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Tue, 27 Mar 2018 17:24:19 +0200 Subject: [PATCH] libtirpc: update to 1.0.3 * Remove unnecessary patch * fix musl types.h defines Signed-off-by: Andy Walsh --- libs/libtirpc/Makefile | 4 +-- .../02-replace-__bzero-with-memset-API.patch | 30 ------------------ ...-and-musl-does-not-install-rpcent.h.patch} | 0 ...isable-DES-authentification-support.patch} | 0 .../04-export_key_secretkey_is_set.patch | 24 -------------- .../patches/04-musl-rpc-fix-types.h.patch | 11 +++++++ .../06-include-stdint.h-for-uintptr_t.patch | 31 ------------------- 7 files changed, 13 insertions(+), 87 deletions(-) delete mode 100644 libs/libtirpc/patches/02-replace-__bzero-with-memset-API.patch rename libs/libtirpc/patches/{03-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch => 02-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch} (100%) rename libs/libtirpc/patches/{05-Disable-DES-authentification-support.patch => 03-Disable-DES-authentification-support.patch} (100%) delete mode 100644 libs/libtirpc/patches/04-export_key_secretkey_is_set.patch create mode 100644 libs/libtirpc/patches/04-musl-rpc-fix-types.h.patch delete mode 100644 libs/libtirpc/patches/06-include-stdint.h-for-uintptr_t.patch diff --git a/libs/libtirpc/Makefile b/libs/libtirpc/Makefile index 066163453..1e42b14f6 100644 --- a/libs/libtirpc/Makefile +++ b/libs/libtirpc/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtirpc -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.0.3 PKG_RELEASE:=1 PKG_SOURCE_URL:=@SF/libtirpc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5 +PKG_HASH:=86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=BSD-3-Clause diff --git a/libs/libtirpc/patches/02-replace-__bzero-with-memset-API.patch b/libs/libtirpc/patches/02-replace-__bzero-with-memset-API.patch deleted file mode 100644 index d2b4da6ae..000000000 --- a/libs/libtirpc/patches/02-replace-__bzero-with-memset-API.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - -memset is available across all libc implementation - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/des_impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/des_impl.c b/src/des_impl.c -index 9dbccaf..15bec2a 100644 ---- a/src/des_impl.c -+++ b/src/des_impl.c -@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp) - } - tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; - tbuf[0] = tbuf[1] = 0; -- __bzero (schedule, sizeof (schedule)); -+ memset (schedule, 0, sizeof (schedule)); - - return (1); - } --- -2.12.2 - diff --git a/libs/libtirpc/patches/03-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch b/libs/libtirpc/patches/02-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch similarity index 100% rename from libs/libtirpc/patches/03-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch rename to libs/libtirpc/patches/02-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch diff --git a/libs/libtirpc/patches/05-Disable-DES-authentification-support.patch b/libs/libtirpc/patches/03-Disable-DES-authentification-support.patch similarity index 100% rename from libs/libtirpc/patches/05-Disable-DES-authentification-support.patch rename to libs/libtirpc/patches/03-Disable-DES-authentification-support.patch diff --git a/libs/libtirpc/patches/04-export_key_secretkey_is_set.patch b/libs/libtirpc/patches/04-export_key_secretkey_is_set.patch deleted file mode 100644 index a276ba27a..000000000 --- a/libs/libtirpc/patches/04-export_key_secretkey_is_set.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add key_secretkey_is_set to exported symbols map - -key_secret_is_set is a typo in libtirpc map -Patch taken from - -https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/ - -Upstream-Status: Pending - -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 -@@ -298,7 +298,7 @@ TIRPC_0.3.2 { - key_gendes; - key_get_conv; - key_setsecret; -- key_secret_is_set; -+ key_secretkey_is_set; - key_setnet; - netname2host; - netname2user; diff --git a/libs/libtirpc/patches/04-musl-rpc-fix-types.h.patch b/libs/libtirpc/patches/04-musl-rpc-fix-types.h.patch new file mode 100644 index 000000000..b0616ead3 --- /dev/null +++ b/libs/libtirpc/patches/04-musl-rpc-fix-types.h.patch @@ -0,0 +1,11 @@ +--- a/tirpc/rpc/types.h 2018-03-27 ++++ b/tirpc/rpc/types.h 2018-03-27 +@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; + #define mem_free(ptr, bsize) free(ptr) + + +-#if defined __APPLE_CC__ || defined __FreeBSD__ ++#if defined __APPLE_CC__ || defined __FreeBSD__ || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + # define __u_char_defined + # define __daddr_t_defined + #endif diff --git a/libs/libtirpc/patches/06-include-stdint.h-for-uintptr_t.patch b/libs/libtirpc/patches/06-include-stdint.h-for-uintptr_t.patch deleted file mode 100644 index 62031613d..000000000 --- a/libs/libtirpc/patches/06-include-stdint.h-for-uintptr_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 18f8a605e176f0362da22fd1203eb7cedb136aaf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 20 Jun 2017 22:06:35 +0200 -Subject: [PATCH] include stdint.h for uintptr_t - -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) { -| ^~~~~~~~~ - -Signed-off-by: Khem Raj -Signed-off-by: Dmitrii Kolesnichenko ---- - src/xdr_sizeof.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c -index d23fbd1..79d6707 100644 ---- a/src/xdr_sizeof.c -+++ b/src/xdr_sizeof.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "un-namespace.h" - - /* ARGSUSED */ --- -2.9.4 -