From 2f7b3edd373625b39a37031149e49ccd26bb7eb6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Dec 2016 16:24:57 +0100 Subject: rpcbind: update to 0.2.4 --- package/rpcbind/Makefile | 6 +- package/rpcbind/patches/patch-src_check_bound_c | 11 -- package/rpcbind/patches/patch-src_pmap_svc_c | 19 ---- package/rpcbind/patches/patch-src_rpcb_svc_4_c | 31 ------ package/rpcbind/patches/patch-src_rpcb_svc_c | 26 ----- package/rpcbind/patches/patch-src_rpcb_svc_com_c | 125 ----------------------- package/rpcbind/patches/patch-src_rpcbind_c | 40 -------- package/rpcbind/patches/patch-src_security_c | 10 +- package/rpcbind/patches/patch-src_util_c | 27 ----- package/rpcbind/patches/patch-src_warmstart_c | 13 --- 10 files changed, 8 insertions(+), 300 deletions(-) delete mode 100644 package/rpcbind/patches/patch-src_check_bound_c delete mode 100644 package/rpcbind/patches/patch-src_pmap_svc_c delete mode 100644 package/rpcbind/patches/patch-src_rpcb_svc_4_c delete mode 100644 package/rpcbind/patches/patch-src_rpcb_svc_c delete mode 100644 package/rpcbind/patches/patch-src_rpcb_svc_com_c delete mode 100644 package/rpcbind/patches/patch-src_rpcbind_c delete mode 100644 package/rpcbind/patches/patch-src_util_c delete mode 100644 package/rpcbind/patches/patch-src_warmstart_c (limited to 'package/rpcbind') diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index 252d046ca..3a91521f0 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rpcbind -PKG_VERSION:= 0.2.3 -PKG_RELEASE:= 2 -PKG_HASH:= 9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b +PKG_VERSION:= 0.2.4 +PKG_RELEASE:= 1 +PKG_HASH:= 074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66 PKG_DESCR:= converts rpc program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc diff --git a/package/rpcbind/patches/patch-src_check_bound_c b/package/rpcbind/patches/patch-src_check_bound_c deleted file mode 100644 index 9e79c1392..000000000 --- a/package/rpcbind/patches/patch-src_check_bound_c +++ /dev/null @@ -1,11 +0,0 @@ ---- rpcbind-0.2.3.orig/src/check_bound.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/check_bound.c 2016-10-08 18:19:45.000000000 +0200 -@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link li - 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/package/rpcbind/patches/patch-src_pmap_svc_c b/package/rpcbind/patches/patch-src_pmap_svc_c deleted file mode 100644 index 12eda401f..000000000 --- a/package/rpcbind/patches/patch-src_pmap_svc_c +++ /dev/null @@ -1,19 +0,0 @@ ---- rpcbind-0.2.3.orig/src/pmap_svc.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/pmap_svc.c 2016-10-08 18:19:45.000000000 +0200 -@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1 - #include "rpcbind.h" - #include "xlog.h" - #include /* 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/package/rpcbind/patches/patch-src_rpcb_svc_4_c b/package/rpcbind/patches/patch-src_rpcb_svc_4_c deleted file mode 100644 index fe2a0835c..000000000 --- a/package/rpcbind/patches/patch-src_rpcb_svc_4_c +++ /dev/null @@ -1,31 +0,0 @@ ---- rpcbind-0.2.3.orig/src/rpcb_svc_4.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/rpcb_svc_4.c 2016-10-08 18:19:45.000000000 +0200 -@@ -54,13 +54,13 @@ - #include "rpcbind.h" - #include "xlog.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 -@@ -78,7 +78,7 @@ rpcb_service_4(struct svc_req *rqstp, SV - } 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/package/rpcbind/patches/patch-src_rpcb_svc_c b/package/rpcbind/patches/patch-src_rpcb_svc_c deleted file mode 100644 index dbdbf00e2..000000000 --- a/package/rpcbind/patches/patch-src_rpcb_svc_c +++ /dev/null @@ -1,26 +0,0 @@ ---- rpcbind-0.2.3.orig/src/rpcb_svc.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/rpcb_svc.c 2016-10-08 18:19:45.000000000 +0200 -@@ -53,10 +53,10 @@ - #include "rpcbind.h" - #include "xlog.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 -@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SV - } 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/package/rpcbind/patches/patch-src_rpcb_svc_com_c b/package/rpcbind/patches/patch-src_rpcb_svc_com_c deleted file mode 100644 index f173f2e50..000000000 --- a/package/rpcbind/patches/patch-src_rpcb_svc_com_c +++ /dev/null @@ -1,125 +0,0 @@ ---- rpcbind-0.2.3.orig/src/rpcb_svc_com.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/rpcb_svc_com.c 2016-10-08 18:20:08.000000000 +0200 -@@ -42,8 +42,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include -@@ -54,6 +52,7 @@ - #include - #include - #include -+#include - #ifdef PORTMAP - #include - #include -@@ -100,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 -@@ -1183,12 +1182,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; - } -@@ -1274,10 +1294,17 @@ handle_reply(int fd, SVCXPRT *xprt) - a.rmt_localvers = fi->versnum; - - xprt_set_caller(xprt, fi); -+#if defined(SVC_XP_AUTH) -+ SVC_XP_AUTH(xprt) = svc_auth_none; -+#else - xprt->xp_auth = &svc_auth_none; -+#endif - svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); -+#if !defined(SVC_XP_AUTH) - SVCAUTH_DESTROY(xprt->xp_auth); - xprt->xp_auth = NULL; -+#endif -+ - done: - if (buffer) - free(buffer); diff --git a/package/rpcbind/patches/patch-src_rpcbind_c b/package/rpcbind/patches/patch-src_rpcbind_c deleted file mode 100644 index aa2bcc78e..000000000 --- a/package/rpcbind/patches/patch-src_rpcbind_c +++ /dev/null @@ -1,40 +0,0 @@ ---- rpcbind-0.2.3.orig/src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/rpcbind.c 2016-10-08 18:20:04.000000000 +0200 -@@ -135,13 +135,13 @@ char *tcp_uaddr; /* Universal TCP addres - 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[]) -@@ -532,7 +532,7 @@ init_transport(struct netconfig *nconf) - if ((aicode = getaddrinfo(hosts[nhostsbak], - servname, &hints, &res)) != 0) { - if ((aicode = getaddrinfo(hosts[nhostsbak], -- "portmapper", &hints, &res)) != 0) { -+ "sunrpc", &hints, &res)) != 0) { - syslog(LOG_ERR, - "cannot get local address for %s: %s", - nconf->nc_netid, gai_strerror(aicode)); -@@ -611,7 +611,7 @@ init_transport(struct netconfig *nconf) - if ((strcmp(nconf->nc_netid, "local") != 0) && - (strcmp(nconf->nc_netid, "unix") != 0)) { - if ((aicode = getaddrinfo(NULL, servname, &hints, &res))!= 0) { -- if ((aicode = getaddrinfo(NULL, "portmapper", &hints, &res))!= 0) { -+ if ((aicode = getaddrinfo(NULL, "sunrpc", &hints, &res))!= 0) { - printf("cannot get local address for %s: %s", nconf->nc_netid, gai_strerror(aicode)); - syslog(LOG_ERR, - "cannot get local address for %s: %s", diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c index 8f2d32330..c183919c9 100644 --- a/package/rpcbind/patches/patch-src_security_c +++ b/package/rpcbind/patches/patch-src_security_c @@ -1,6 +1,6 @@ ---- rpcbind-0.2.3.orig/src/security.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/security.c 2015-11-29 16:56:17.948705887 +0100 -@@ -20,14 +20,6 @@ +--- rpcbind-0.2.4.orig/src/security.c 2016-11-28 21:47:28.000000000 +0100 ++++ rpcbind-0.2.4/src/security.c 2016-12-31 16:11:48.723119783 +0100 +@@ -22,14 +22,6 @@ /* * XXX for special case checks in check_callit. */ @@ -15,7 +15,7 @@ # define MOUNTPROC_MNT 1 # define MOUNTPROC_UMNT 3 # define NFS_PROGRAM 100003 -@@ -42,7 +34,6 @@ +@@ -44,7 +36,6 @@ # define YPPROC_FIRST 4 # define YPPROC_NEXT 5 # define YPPROC_ALL 8 @@ -23,7 +23,7 @@ #include "rpcbind.h" -@@ -325,24 +316,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt +@@ -327,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt args->rmt_proc != MOUNTPROC_UMNT) break; goto deny; diff --git a/package/rpcbind/patches/patch-src_util_c b/package/rpcbind/patches/patch-src_util_c deleted file mode 100644 index 69669f0e1..000000000 --- a/package/rpcbind/patches/patch-src_util_c +++ /dev/null @@ -1,27 +0,0 @@ ---- rpcbind-0.2.3.orig/src/util.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/util.c 2016-10-08 18:28:03.000000000 +0200 -@@ -41,7 +41,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -56,6 +55,7 @@ - #include - #include - -+#include "queue.h" - #include "rpcbind.h" - - #define SA2SIN(sa) ((struct sockaddr_in *)(sa)) -@@ -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/package/rpcbind/patches/patch-src_warmstart_c b/package/rpcbind/patches/patch-src_warmstart_c deleted file mode 100644 index 79b342550..000000000 --- a/package/rpcbind/patches/patch-src_warmstart_c +++ /dev/null @@ -1,13 +0,0 @@ ---- rpcbind-0.2.3.orig/src/warmstart.c 2015-04-27 16:07:43.000000000 +0200 -+++ rpcbind-0.2.3/src/warmstart.c 2016-10-08 18:19:45.000000000 +0200 -@@ -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) -- cgit v1.2.3