libtirpc: update to 1.2.5

* update to 1.2.5
* remove upstream merged patches

Signed-off-by: Andy Walsh <redacted>

diff --git a/libs/libtirpc/Makefile b/libs/libtirpc/Makefile
index 333520edff82db8246c2ea8915c4370820ed8a22..2e52898a581b8d3531ffa326be201be3199440a2 100644 (file)
--- a/libs/libtirpc/Makefile
+++ b/libs/libtirpc/Makefile
@@ -1,19 +1,12 @@
-#
-# Copyright (C) 2006-2018 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtirpc
-PKG_VERSION:=1.1.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.2.5
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@SF/libtirpc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d
+PKG_HASH:=f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/libs/libtirpc/patches/001-musl.patch b/libs/libtirpc/patches/001-musl.patch
deleted file mode 100644 (file)
index 0c3ce60..0000000
--- a/libs/libtirpc/patches/001-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Consider musl provided built-in defines
-
-Helps compile libtirpc with musl
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- ./tirpc/rpc/types.h.orig   2018-03-17 10:23:10.022055255 +0100
-+++ ./tirpc/rpc/types.h        2018-03-17 10:23:30.877751656 +0100
-@@ -66,7 +66,7 @@
- #define mem_free(ptr, bsize)  free(ptr)
- 
- 
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif

diff --git a/libs/libtirpc/patches/010-b-functions.patch b/libs/libtirpc/patches/010-b-functions.patch
deleted file mode 100644 (file)
index 89e882a..0000000
--- a/libs/libtirpc/patches/010-b-functions.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/auth_des.c
-+++ b/src/auth_des.c
-@@ -396,7 +396,7 @@ authdes_validate(AUTH *auth, struct opaque_auth *rverf)
-       /*
-        * validate
-        */
--      if (bcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
-+      if (memcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
-                sizeof(struct timeval)) != 0) {
-               LIBTIRPC_DEBUG(1, ("authdes_validate: verifier mismatch"));
-               return (FALSE);
---- a/src/auth_time.c
-+++ b/src/auth_time.c
-@@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin)
-       p_bytes[1] = (unsigned char)a[5] & 0x000000FF;
- 
-       sin->sin_family = AF_INET; /* always */
--      bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2);
-+      memcpy((char *)&sin->sin_port, (char *)&p_bytes, 2);
- 
-       return (0);
- }
---- a/src/crypt_client.c
-+++ b/src/crypt_client.c
-@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms)
-       des_crypt_1_arg.desbuf.desbuf_val = buf;
-       des_crypt_1_arg.des_dir = dparms->des_dir;
-       des_crypt_1_arg.des_mode = dparms->des_mode;
--      bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
--      bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
-+      memcpy(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8);
-+      memcpy(des_crypt_1_arg.des_key, dparms->des_key, 8);
- 
-       result_1 = des_crypt_1(&des_crypt_1_arg, clnt);
-       if (result_1 == (desresp *) NULL) {
-@@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms)
- 
-       if (result_1->stat == DESERR_NONE ||
-           result_1->stat == DESERR_NOHWDEVICE) {
--              bcopy(result_1->desbuf.desbuf_val, buf, len);
--              bcopy(result_1->des_ivec, dparms->des_ivec, 8);
-+              memcpy(buf, result_1->desbuf.desbuf_val, len);
-+              memcpy(dparms->des_ivec, result_1->des_ivec, 8);
-       }
- 
-       clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1);
---- a/src/svc_auth_des.c
-+++ b/src/svc_auth_des.c
-@@ -145,7 +145,7 @@ _svcauth_des(rqst, msg)
-                       return (AUTH_BADCRED);
-               }
-               cred->adc_fullname.name = area->area_netname;
--              bcopy((char *)ixdr, cred->adc_fullname.name, 
-+              memcpy(cred->adc_fullname.name, (char *)ixdr,
-                       (u_int)namelen);
-               cred->adc_fullname.name[namelen] = 0;
-               ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT);
-@@ -419,7 +419,7 @@ cache_spot(key, name, timestamp)
-               if (cp->key.key.high == hi && 
-                   cp->key.key.low == key->key.low &&
-                   cp->rname != NULL &&
--                  bcmp(cp->rname, name, strlen(name) + 1) == 0) {
-+                  memcmp(cp->rname, name, strlen(name) + 1) == 0) {
-                       if (BEFORE(timestamp, &cp->laststamp)) {
-                               svcauthdes_stats.ncachereplays++;
-                               return (-1); /* replay */