From 68cd143404c1001b8ce018b4672a9ccdddf9b1f7 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 17 Mar 2018 10:25:35 +0100 Subject: [PATCH] libtirpc: update to 1.0.3 --- srcpkgs/libtirpc/patches/glibc-2.26.patch | 10 ----- srcpkgs/libtirpc/patches/musl.patch | 11 ++++++ .../patches/replace_bzero_with_memset.patch | 39 ------------------- srcpkgs/libtirpc/template | 4 +- 4 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/libtirpc/patches/glibc-2.26.patch create mode 100644 srcpkgs/libtirpc/patches/musl.patch delete mode 100644 srcpkgs/libtirpc/patches/replace_bzero_with_memset.patch diff --git a/srcpkgs/libtirpc/patches/glibc-2.26.patch b/srcpkgs/libtirpc/patches/glibc-2.26.patch deleted file mode 100644 index 5ddb7a3757..0000000000 --- a/srcpkgs/libtirpc/patches/glibc-2.26.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/xdr_sizeof.c.orig 2017-09-27 14:36:25.311693676 +0200 -+++ src/xdr_sizeof.c 2017-09-27 14:36:50.756424788 +0200 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "un-namespace.h" - - /* ARGSUSED */ diff --git a/srcpkgs/libtirpc/patches/musl.patch b/srcpkgs/libtirpc/patches/musl.patch new file mode 100644 index 0000000000..5a4fb04f50 --- /dev/null +++ b/srcpkgs/libtirpc/patches/musl.patch @@ -0,0 +1,11 @@ +--- ./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/srcpkgs/libtirpc/patches/replace_bzero_with_memset.patch b/srcpkgs/libtirpc/patches/replace_bzero_with_memset.patch deleted file mode 100644 index accb745e50..0000000000 --- a/srcpkgs/libtirpc/patches/replace_bzero_with_memset.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/auth_time.c b/src/auth_time.c -index 7f83ab4..69400bc 100644 ---- src/auth_time.c -+++ 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 ---- src/des_impl.c -+++ 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); - } -diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c -index 2e90146..19a7c60 100644 ---- src/svc_auth_des.c -+++ 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); diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template index aabf6b5093..0d8ac60efd 100644 --- a/srcpkgs/libtirpc/template +++ b/srcpkgs/libtirpc/template @@ -1,6 +1,6 @@ # Template file for 'libtirpc' pkgname=libtirpc -version=1.0.2 +version=1.0.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config mit-krb5-devel automake libtool" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD" homepage="http://libtirpc.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5 +checksum=86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e pre_configure() { autoreconf -fi