snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

libtirpc: update to 1.0.2

This commit is contained in:
Helmut Pozimski 2017-09-27 14:51:40 +02:00
parent 64e8a5910e
commit ffaf41191f
5 changed files with 54 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -939,7 +939,7 @@ libee.so.0 libee-0.3.2_1
libobt.so.2 libopenbox-3.5.2_1
libobrender.so.32 libopenbox-3.6.1_1
libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.1 libtirpc-0.2.2_1
libtirpc.so.3 libtirpc-1.0.2_1
librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.0 libnfsidmap-0.24_1
liblwres.so.141 bind-libs-9.10.2P3_2

137
srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain+fix_musl.patch
View File

@ -1,137 +0,0 @@
diff -r -up libtirpc-0.3.2.org/configure.ac libtirpc-0.3.2/configure.ac
--- configure.ac 2015-06-16 17:35:08.000000000 +0200
+++ configure.ac 2015-08-19 22:02:17.094796496 +0200
@@ -7,6 +7,8 @@ AC_PROG_CC
AC_CHECK_HEADER([gssapi/gssapi.h], [HAVE_GSSAPI_H=yes], [HAVE_GSSAPI_H=no])
+AC_CHECK_HEADER([rpcsvc/yp_prot.h], [HAVE_YP_PROT_H=yes], [HAVE_YP_PROT_H=no])
+AM_CONDITIONAL(HAVE_YP_PROT_H, test x$HAVE_YP_PROT_H = xyes)
AC_ARG_ENABLE(gssapi,
[AC_HELP_STRING([--disable-gssapi], [Disable GSSAPI support @<:@default=no@:>@])],
[],[enable_gssapi=yes])
diff -r -up libtirpc-0.3.2.org/src/Makefile.am libtirpc-0.3.2/src/Makefile.am
--- src/Makefile.am 2015-06-16 17:35:08.000000000 +0200
+++ src/Makefile.am 2015-08-19 22:08:02.241770664 +0200
@@ -51,7 +51,11 @@ libtirpc_la_SOURCES = auth_none.c auth_u
rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
- auth_time.c auth_des.c authdes_prot.c debug.c
+ debug.c
+
+if HAVE_YP_PROT_H
+libtirpc_la_SOURCES += auth_time.c auth_des.c authdes_prot.c
+endif
## XDR
libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
@@ -68,8 +72,11 @@ if GSS
libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
endif
+if HAVE_YP_PROT_H
libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
-libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
+libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
+endif
+
CLEANFILES = cscope.* *~
DISTCLEANFILES = Makefile.in
diff -Naur a/src/rpcdname.c b/src/rpcdname.c
--- src/rpcdname.c 1970-01-01 01:00:00.000000000 +0100
+++ src/rpcdname.c 2015-06-17 21:23:05.186276982 +0200
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * rpcdname.c
+ * Gets the default domain name
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+static char *default_domain = 0;
+
+static char *
+get_default_domain()
+{
+ char temp[256];
+
+ if (default_domain)
+ return (default_domain);
+ if (getdomainname(temp, sizeof(temp)) < 0)
+ return (0);
+ if ((int) strlen(temp) > 0) {
+ default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
+ if (default_domain == 0)
+ return (0);
+ (void) strcpy(default_domain, temp);
+ return (default_domain);
+ }
+ return (0);
+}
+
+/*
+ * This is a wrapper for the system call getdomainname which returns a
+ * ypclnt.h error code in the failure case. It also checks to see that
+ * the domain name is non-null, knowing that the null string is going to
+ * get rejected elsewhere in the NIS client package.
+ */
+int
+__rpc_get_default_domain(domain)
+ char **domain;
+{
+ if ((*domain = get_default_domain()) != 0)
+ return (0);
+ return (-1);
+}
--- src/rpc_soc.c 2016-01-08 14:58:32.342790730 -0800
+++ src/rpc_soc.c 2016-01-08 15:00:40.997863321 -0800
@@ -520,6 +520,8 @@
(resultproc_t) rpc_wrap_bcast, "udp");
}
+#ifdef HAVE_YP_PROT_H
+
/*
* Create the client des authentication object. Obsoleted by
* authdes_seccreate().
@@ -552,6 +554,8 @@
return (dummy);
}
+#endif
+
/*
* Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
*/

10
srcpkgs/libtirpc/patches/glibc-2.26.patch Normal file
View File

@ -0,0 +1,10 @@
--- 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 <rpc/xdr.h>
#include <sys/types.h>
#include <stdlib.h>
+#include <stdint.h>
#include "un-namespace.h"
/* ARGSUSED */

39
srcpkgs/libtirpc/patches/replace_bzero_with_memset.patch Normal file
View File

@ -0,0 +1,39 @@
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);

7
srcpkgs/libtirpc/template
View File

@ -1,7 +1,7 @@
# Template file for 'libtirpc'
pkgname=libtirpc
version=0.3.2
revision=4
version=1.0.2
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config mit-krb5-devel automake libtool"
makedepends="mit-krb5-devel libgssglue-devel"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="BSD"
homepage="http://libtirpc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc
checksum=723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5
pre_configure() {
autoreconf -fi
@ -19,6 +19,7 @@ pre_configure() {
post_install() {
vconf ${wrksrc}/doc/netconfig
vlicense COPYING
}
libtirpc-devel_package() {