jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8966 from Hoshpak/update-libtirpc

Browse source 
Update libtirpc and rpcbind
This commit is contained in:
Juan RP 2017-11-07 16:15:50 +01:00 committed by GitHub
commit 70184db76c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 74 additions and 493 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

37
srcpkgs/autofs/patches/autofs-5.0.6-fix-libtirpc-name-clash.patch
View file

@ -1,37 +0,0 @@
autofs-5.0.6 - fix libtirpc name clash
From: Ian Kent <ikent@redhat.com>
The tirpc function auth_destroy() is a macro definition in tirpc/rpc/auth.h
which includes an unconditional call to a function log_debug() which clashes
with an autofs function of the same name and has a different call signature.
To fix it redefine auth_destroy() and exclude the debug log call.
---
CHANGELOG | 1 +
lib/rpc_subs.c | 10 ++++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index cc08f05..d33a3c4 100644
--- lib/rpc_subs.c
+++ lib/rpc_subs.c
@@ -34,6 +34,16 @@
#include <pthread.h>
#include <poll.h>
+#ifdef WITH_LIBTIRPC
+#undef auth_destroy
+#define auth_destroy(auth) \
+ do { \
+ int refs; \
+ if ((refs = auth_put((auth))) == 0) \
+ ((*((auth)->ah_ops->ah_destroy))(auth));\
+ } while (0)
+#endif
+
#include "mount.h"
#include "rpc_subs.h"
#include "automount.h"

2
srcpkgs/autofs/template
View file

@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.3
revision=1
revision=2
build_style=gnu-configure
conf_files="/etc/autofs/*"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

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() {

2
srcpkgs/nfs-utils/template
View file

@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=1.3.4
revision=4
revision=5
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-gss

2
srcpkgs/quota/template
View file

@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.04
revision=2
revision=3
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"

223
srcpkgs/rpcbind/patches/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
View file

@ -1,223 +0,0 @@
From 2a44d862233f2126581e290d568e1c8b8f2eb9f5 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Thu, 19 Feb 2015 15:28:45 +0000
Subject: [PATCH] Avoid use of glibc sys/cdefs.h header
---
src/check_bound.c | 2 +-
src/pmap_svc.c | 10 +++++-----
src/rpcb_svc.c | 10 +++++-----
src/rpcb_svc_4.c | 14 +++++++-------
src/rpcb_svc_com.c | 46 +++++++++++++++++++++++-----------------------
src/rpcbind.c | 12 ++++++------
src/util.c | 2 +-
src/warmstart.c | 4 ++--
8 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/check_bound.c b/src/check_bound.c
index c70b845..5d21730 100644
--- src/check_bound.c
+++ src/check_bound.c
@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */
static struct fdlist *fdtail;
static char *nullstring = "";
-static bool_t check_bound __P((struct fdlist *, char *uaddr));
+static bool_t check_bound (struct fdlist *, char *uaddr);
/*
* Returns 1 if the given address is bound for the given addr & transport
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
index ad28b93..9c7d409 100644
--- src/pmap_svc.c
+++ src/pmap_svc.c
@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
#include "rpcbind.h"
#include "xlog.h"
#include <rpc/svc_soc.h> /* svc_getcaller routine definition */
-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
- rpcprot_t));
-static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
-static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
-static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
+static struct pmaplist *find_service_pmap (rpcprog_t, rpcvers_t,
+ rpcprot_t);
+static bool_t pmapproc_change (struct svc_req *, SVCXPRT *, u_long);
+static bool_t pmapproc_getport (struct svc_req *, SVCXPRT *);
+static bool_t pmapproc_dump (struct svc_req *, SVCXPRT *);
/*
* Called for all the version 2 inquiries.
diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
index 92361a2..95ffb9b 100644
--- src/rpcb_svc.c
+++ src/rpcb_svc.c
@@ -52,10 +52,10 @@
#include "rpcbind.h"
-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
- rpcvers_t));
-static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
- rpcvers_t));
+static void *rpcbproc_getaddr_3_local (void *, struct svc_req *, SVCXPRT *,
+ rpcvers_t);
+static void *rpcbproc_dump_3_local (void *, struct svc_req *, SVCXPRT *,
+ rpcvers_t);
/*
* Called by svc_getreqset. There is a separate server handle for
@@ -74,7 +74,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
} argument;
char *result;
xdrproc_t xdr_argument, xdr_result;
- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+ void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
rpcprog_t setprog = 0;
rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
index f1a72a6..b6fc6a8 100644
--- src/rpcb_svc_4.c
+++ src/rpcb_svc_4.c
@@ -53,13 +53,13 @@
#include <stdlib.h>
#include "rpcbind.h"
-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
- rpcvers_t));
-static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+static void *rpcbproc_getaddr_4_local (void *, struct svc_req *, SVCXPRT *,
+ rpcvers_t);
+static void *rpcbproc_getversaddr_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
static void *rpcbproc_getaddrlist_4_local
- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
-static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));
-static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+ (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+static void free_rpcb_entry_list (rpcb_entry_list_ptr *);
+static void *rpcbproc_dump_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
/*
* Called by svc_getreqset. There is a separate server handle for
@@ -77,7 +77,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
} argument;
char *result;
xdrproc_t xdr_argument, xdr_result;
- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+ void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
rpcprog_t setprog = 0;
rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
index 9a094f5..0b556a2 100644
--- src/rpcb_svc_com.c
+++ src/rpcb_svc_com.c
@@ -99,29 +99,29 @@ struct finfo {
static struct finfo FINFO[NFORWARD];
-static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *));
-static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *));
-static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
-static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
-static int find_rmtcallfd_by_netid __P((char *));
-static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
-static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
- rpcproc_t, rpcvers_t, u_int32_t *));
-static struct finfo *forward_find __P((u_int32_t));
-static int free_slot_by_xid __P((u_int32_t));
-static int free_slot_by_index __P((int));
-static int netbufcmp __P((struct netbuf *, struct netbuf *));
-static struct netbuf *netbufdup __P((struct netbuf *));
-static void netbuffree __P((struct netbuf *));
-static int check_rmtcalls __P((struct pollfd *, int));
-static void xprt_set_caller __P((SVCXPRT *, struct finfo *));
-static void send_svcsyserr __P((SVCXPRT *, struct finfo *));
-static void handle_reply __P((int, SVCXPRT *));
-static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *));
-static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));
-static char *getowner __P((SVCXPRT *, char *, size_t));
-static int add_pmaplist __P((RPCB *));
-static int del_pmaplist __P((RPCB *));
+static bool_t xdr_encap_parms (XDR *, struct encap_parms *);
+static bool_t xdr_rmtcall_args (XDR *, struct r_rmtcall_args *);
+static bool_t xdr_rmtcall_result (XDR *, struct r_rmtcall_args *);
+static bool_t xdr_opaque_parms (XDR *, struct r_rmtcall_args *);
+static int find_rmtcallfd_by_netid (char *);
+static SVCXPRT *find_rmtcallxprt_by_fd (int);
+static int forward_register (u_int32_t, struct netbuf *, int, char *,
+ rpcproc_t, rpcvers_t, u_int32_t *);
+static struct finfo *forward_find (u_int32_t);
+static int free_slot_by_xid (u_int32_t);
+static int free_slot_by_index (int);
+static int netbufcmp (struct netbuf *, struct netbuf *);
+static struct netbuf *netbufdup (struct netbuf *);
+static void netbuffree (struct netbuf *);
+static int check_rmtcalls (struct pollfd *, int);
+static void xprt_set_caller (SVCXPRT *, struct finfo *);
+static void send_svcsyserr (SVCXPRT *, struct finfo *);
+static void handle_reply (int, SVCXPRT *);
+static void find_versions (rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
+static rpcblist_ptr find_service (rpcprog_t, rpcvers_t, char *);
+static char *getowner (SVCXPRT *, char *, size_t);
+static int add_pmaplist (RPCB *);
+static int del_pmaplist (RPCB *);
/*
* Set a mapping of program, version, netid
diff --git a/src/rpcbind.c b/src/rpcbind.c
index 6d8bed2..63da6b2 100644
--- src/rpcbind.c
+++ src/rpcbind.c
@@ -132,13 +132,13 @@ char *tcp_uaddr; /* Universal TCP address */
static char servname[] = "rpcbind";
static char superuser[] = "superuser";
-int main __P((int, char *[]));
+int main (int, char *[]);
-static int init_transport __P((struct netconfig *));
-static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,
- struct netbuf *));
-static void terminate __P((int));
-static void parseargs __P((int, char *[]));
+static int init_transport (struct netconfig *);
+static void rbllist_add (rpcprog_t, rpcvers_t, struct netconfig *,
+ struct netbuf *);
+static void terminate (int);
+static void parseargs (int, char *[]);
int
main(int argc, char *argv[])
diff --git a/src/util.c b/src/util.c
index a6c835b..ff9e1f4 100644
--- src/util.c
+++ src/util.c
@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
static struct sockaddr_in6 *local_in6;
#endif
-static int bitmaskcmp __P((void *, void *, void *, int));
+static int bitmaskcmp (void *, void *, void *, int);
/*
* For all bits set in "mask", compare the corresponding bits in
diff --git a/src/warmstart.c b/src/warmstart.c
index b6eb73e..42dd3af 100644
--- src/warmstart.c
+++ src/warmstart.c
@@ -58,8 +58,8 @@
#define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
#endif
-static bool_t write_struct __P((char *, xdrproc_t, void *));
-static bool_t read_struct __P((char *, xdrproc_t, void *));
+static bool_t write_struct (char *, xdrproc_t, void *);
+static bool_t read_struct (char *, xdrproc_t, void *);
static bool_t
write_struct(char *filename, xdrproc_t structproc, void *list)
--
2.2.2

78
srcpkgs/rpcbind/patches/CVE-2015-7236.patch
View file

@ -1,78 +0,0 @@
commit 06f7ebb1dade2f0dbf872ea2bedf17cff4734bdd
Author: Olaf Kirch <okir () suse de>
Date: Thu Aug 6 16:27:20 2015 +0200
Fix memory corruption in PMAP_CALLIT code
- A PMAP_CALLIT call comes in on IPv4 UDP
- rpcbind duplicates the caller's address to a netbuf and stores it in
FINFO[0].caller_addr. caller_addr->buf now points to a memory region A
with a size of 16 bytes
- rpcbind forwards the call to the local service, receives a reply
- when processing the reply, it does this in xprt_set_caller:
xprt->xp_rtaddr = *FINFO[0].caller_addr
It sends out the reply, and then frees the netbuf caller_addr and
caller_addr.buf.
However, it does not clear xp_rtaddr, so xp_rtaddr.buf now refers
to memory region A, which is free.
- When the next call comes in on the UDP/IPv4 socket, svc_dg_recv will
be called, which will set xp_rtaddr to the client's address.
It will reuse the buffer inside xp_rtaddr, ie it will write a
sockaddr_in to region A
Some time down the road, an incoming TCP connection is accepted,
allocating a fresh SVCXPRT. The memory region A is inside the
new SVCXPRT
- While processing the TCP call, another UDP call comes in, again
overwriting region A with the client's address
- TCP client closes connection. In svc_destroy, we now trip over
the garbage left in region A
We ran into the case where a commercial scanner was triggering
occasional rpcbind segfaults. The core file that was captured showed
a corrupted xprt->xp_netid pointer that was really a sockaddr_in.
Signed-off-by: Olaf Kirch <okir () suse de>
---
src/rpcb_svc_com.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
--- src/rpcb_svc_com.c
+++ src/rpcb_svc_com.c
@@ -1204,12 +1204,33 @@ check_rmtcalls(struct pollfd *pfds, int
return (ncallbacks_found);
}
+/*
+ * This is really a helper function defined in libtirpc, but unfortunately, it hasn't
+ * been exported yet.
+ */
+static struct netbuf *
+__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
+{
+ if (nb->len != len) {
+ if (nb->len)
+ mem_free(nb->buf, nb->len);
+ nb->buf = mem_alloc(len);
+ if (nb->buf == NULL)
+ return NULL;
+
+ nb->maxlen = nb->len = len;
+ }
+ memcpy(nb->buf, ptr, len);
+ return nb;
+}
+
static void
xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
{
+ const struct netbuf *caller = fi->caller_addr;
u_int32_t *xidp;
- *(svc_getrpccaller(xprt)) = *(fi->caller_addr);
+ __rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
xidp = __rpcb_get_dg_xidp(xprt);
*xidp = fi->caller_xid;
}

20
srcpkgs/rpcbind/patches/CVE-2017-8779.patch
View file

@ -42,7 +42,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
--- src/pmap_svc.c
+++ src/pmap_svc.c
@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
@@ -175,6 +175,7 @@
long ans;
uid_t uid;
char uidbuf[32];
@ -50,7 +50,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
/*
* Can't use getpwnam here. We might end up calling ourselves
@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
@@ -194,7 +195,8 @@
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
svcerr_decode(xprt);
@ -60,7 +60,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
}
#ifdef RPCBIND_DEBUG
if (debugging)
@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
@@ -205,7 +207,8 @@
if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
svcerr_weakauth(xprt);
@ -70,7 +70,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
}
rpcbreg.r_prog = reg.pm_prog;
@@ -258,7 +261,16 @@ done_change:
@@ -258,7 +261,18 @@
rpcbs_set(RPCBVERS_2_STAT, ans);
else
rpcbs_unset(RPCBVERS_2_STAT, ans);
@ -78,7 +78,9 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
+done:
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
+ if (debugging) {
+#ifdef RPCBIND_DEBUG
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
+#endif
+ if (doabort) {
+ rpcbind_abort();
+ }
@ -88,7 +90,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
}
/* ARGSUSED */
@@ -272,15 +284,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
@@ -272,15 +286,18 @@
#ifdef RPCBIND_DEBUG
char *uaddr;
#endif
@ -109,7 +111,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
}
#ifdef RPCBIND_DEBUG
@@ -330,21 +345,34 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
@@ -330,21 +347,36 @@
pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
port ? udptrans : "");
@ -117,7 +119,9 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
+done:
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
+ if (debugging) {
+#ifdef RPCBIND_DEBUG
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
+#endif
+ if (doabort) {
+ rpcbind_abort();
+ }
@ -147,7 +151,7 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
}
if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
@@ -354,7 +382,17 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
@@ -354,7 +386,19 @@
rpcbind_abort();
}
}
@ -156,7 +160,9 @@ Signed-off-by: Steve Dickson <steved@redhat.com>
+done:
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) {
+ if (debugging) {
+#ifdef RPCBIND_DEBUG
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
+#endif
+ if (doabort) {
+ rpcbind_abort();
+ }

6
srcpkgs/rpcbind/template
View file

@ -1,7 +1,7 @@
# Template file for 'rpcbind'
pkgname=rpcbind
version=0.2.3
revision=6
version=0.2.4
revision=1
build_style=gnu-configure
configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc
--with-systemdsystemunitdir=no"
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://rpcbind.sourceforge.net"
license="BSD"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b
checksum=074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66
post_install() {
vlicense COPYING

2
srcpkgs/zfs/template
View file

@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
version=0.7.3
revision=1
revision=2
patch_args="-Np1"
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
build_style=gnu-configure