summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/rpcbind
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-29 00:29:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-30 23:04:15 +0100
commit43a60facf66f343ea5fc936bdd7fde65fa6e1714 (patch)
treeef5525a84422801f7c51a8a1bddc0867f357aa91 /meta/recipes-extended/rpcbind
parent18ed8ec921c0c61f1782e45ab4d2f7d668bf9047 (diff)
downloadpoky-43a60facf66f343ea5fc936bdd7fde65fa6e1714.tar.gz
rpcbind: 0.2.2 -> 0.2.3
* Updated 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch * Removed 0002-uclibc-rpcsvc-defines.patch since it is already in the source. (From OE-Core rev: 713ac3bfbc95e58ce3332409bae838053fdeced8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/rpcbind')
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch109
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch60
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb (renamed from meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb)10
3 files changed, 57 insertions, 122 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
index 6f5f5ddbef..eeef9f152f 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
@@ -5,21 +5,21 @@ Subject: [PATCH] Avoid use of glibc sys/cdefs.h header
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7--- 7---
8 src/check_bound.c | 2 +- 8 src/check_bound.c | 2 +-
9 src/pmap_svc.c | 10 +++++----- 9 src/pmap_svc.c | 10 +++++-----
10 src/rpcb_svc.c | 10 +++++----- 10 src/rpcb_svc.c | 10 +++++-----
11 src/rpcb_svc_4.c | 14 +++++++------- 11 src/rpcb_svc_4.c | 14 +++++++-------
12 src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- 12 src/rpcb_svc_com.c | 46 +++++++++++++++++++++++-----------------------
13 src/rpcbind.c | 12 ++++++------ 13 src/rpcbind.c | 12 ++++++------
14 src/util.c | 2 +- 14 src/util.c | 2 +-
15 src/warmstart.c | 4 ++-- 15 src/warmstart.c | 4 ++--
16 8 files changed, 50 insertions(+), 50 deletions(-) 16 8 files changed, 50 insertions(+), 50 deletions(-)
17 17
18Index: rpcbind-0.2.2/src/check_bound.c 18diff --git a/src/check_bound.c b/src/check_bound.c
19=================================================================== 19index c70b845..5d21730 100644
20--- rpcbind-0.2.2.orig/src/check_bound.c 20--- a/src/check_bound.c
21+++ rpcbind-0.2.2/src/check_bound.c 21+++ b/src/check_bound.c
22@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link li 22@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */
23 static struct fdlist *fdtail; 23 static struct fdlist *fdtail;
24 static char *nullstring = ""; 24 static char *nullstring = "";
25 25
@@ -28,13 +28,13 @@ Index: rpcbind-0.2.2/src/check_bound.c
28 28
29 /* 29 /*
30 * Returns 1 if the given address is bound for the given addr & transport 30 * Returns 1 if the given address is bound for the given addr & transport
31Index: rpcbind-0.2.2/src/pmap_svc.c 31diff --git a/src/pmap_svc.c b/src/pmap_svc.c
32=================================================================== 32index ad28b93..9c7d409 100644
33--- rpcbind-0.2.2.orig/src/pmap_svc.c 33--- a/src/pmap_svc.c
34+++ rpcbind-0.2.2/src/pmap_svc.c 34+++ b/src/pmap_svc.c
35@@ -58,11 +58,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1 35@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
36 #endif
37 #include "rpcbind.h" 36 #include "rpcbind.h"
37 #include "xlog.h"
38 #include <rpc/svc_soc.h> /* svc_getcaller routine definition */ 38 #include <rpc/svc_soc.h> /* svc_getcaller routine definition */
39-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, 39-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
40- rpcprot_t)); 40- rpcprot_t));
@@ -49,13 +49,13 @@ Index: rpcbind-0.2.2/src/pmap_svc.c
49 49
50 /* 50 /*
51 * Called for all the version 2 inquiries. 51 * Called for all the version 2 inquiries.
52Index: rpcbind-0.2.2/src/rpcb_svc.c 52diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
53=================================================================== 53index bd92201..6c7f7fe 100644
54--- rpcbind-0.2.2.orig/src/rpcb_svc.c 54--- a/src/rpcb_svc.c
55+++ rpcbind-0.2.2/src/rpcb_svc.c 55+++ b/src/rpcb_svc.c
56@@ -52,10 +52,10 @@ 56@@ -53,10 +53,10 @@
57
58 #include "rpcbind.h" 57 #include "rpcbind.h"
58 #include "xlog.h"
59 59
60-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, 60-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
61- rpcvers_t)); 61- rpcvers_t));
@@ -68,7 +68,7 @@ Index: rpcbind-0.2.2/src/rpcb_svc.c
68 68
69 /* 69 /*
70 * Called by svc_getreqset. There is a separate server handle for 70 * Called by svc_getreqset. There is a separate server handle for
71@@ -74,7 +74,7 @@ rpcb_service_3(struct svc_req *rqstp, SV 71@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
72 } argument; 72 } argument;
73 char *result; 73 char *result;
74 xdrproc_t xdr_argument, xdr_result; 74 xdrproc_t xdr_argument, xdr_result;
@@ -77,13 +77,13 @@ Index: rpcbind-0.2.2/src/rpcb_svc.c
77 rpcprog_t setprog = 0; 77 rpcprog_t setprog = 0;
78 78
79 rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); 79 rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
80Index: rpcbind-0.2.2/src/rpcb_svc_4.c 80diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
81=================================================================== 81index b673452..6764c0a 100644
82--- rpcbind-0.2.2.orig/src/rpcb_svc_4.c 82--- a/src/rpcb_svc_4.c
83+++ rpcbind-0.2.2/src/rpcb_svc_4.c 83+++ b/src/rpcb_svc_4.c
84@@ -53,13 +53,13 @@ 84@@ -54,13 +54,13 @@
85 #include <stdlib.h>
86 #include "rpcbind.h" 85 #include "rpcbind.h"
86 #include "xlog.h"
87 87
88-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, 88-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
89- rpcvers_t)); 89- rpcvers_t));
@@ -101,7 +101,7 @@ Index: rpcbind-0.2.2/src/rpcb_svc_4.c
101 101
102 /* 102 /*
103 * Called by svc_getreqset. There is a separate server handle for 103 * Called by svc_getreqset. There is a separate server handle for
104@@ -77,7 +77,7 @@ rpcb_service_4(struct svc_req *rqstp, SV 104@@ -78,7 +78,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
105 } argument; 105 } argument;
106 char *result; 106 char *result;
107 xdrproc_t xdr_argument, xdr_result; 107 xdrproc_t xdr_argument, xdr_result;
@@ -110,11 +110,11 @@ Index: rpcbind-0.2.2/src/rpcb_svc_4.c
110 rpcprog_t setprog = 0; 110 rpcprog_t setprog = 0;
111 111
112 rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); 112 rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
113Index: rpcbind-0.2.2/src/rpcb_svc_com.c 113diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
114=================================================================== 114index ff9ce6b..8aef9e5 100644
115--- rpcbind-0.2.2.orig/src/rpcb_svc_com.c 115--- a/src/rpcb_svc_com.c
116+++ rpcbind-0.2.2/src/rpcb_svc_com.c 116+++ b/src/rpcb_svc_com.c
117@@ -99,29 +99,29 @@ struct finfo { 117@@ -100,29 +100,29 @@ struct finfo {
118 static struct finfo FINFO[NFORWARD]; 118 static struct finfo FINFO[NFORWARD];
119 119
120 120
@@ -167,11 +167,11 @@ Index: rpcbind-0.2.2/src/rpcb_svc_com.c
167 167
168 /* 168 /*
169 * Set a mapping of program, version, netid 169 * Set a mapping of program, version, netid
170Index: rpcbind-0.2.2/src/rpcbind.c 170diff --git a/src/rpcbind.c b/src/rpcbind.c
171=================================================================== 171index 045daa1..137011b 100644
172--- rpcbind-0.2.2.orig/src/rpcbind.c 172--- a/src/rpcbind.c
173+++ rpcbind-0.2.2/src/rpcbind.c 173+++ b/src/rpcbind.c
174@@ -130,13 +130,13 @@ char *tcp_uaddr; /* Universal TCP addres 174@@ -135,13 +135,13 @@ char *tcp_uaddr; /* Universal TCP address */
175 static char servname[] = "rpcbind"; 175 static char servname[] = "rpcbind";
176 static char superuser[] = "superuser"; 176 static char superuser[] = "superuser";
177 177
@@ -191,26 +191,23 @@ Index: rpcbind-0.2.2/src/rpcbind.c
191 191
192 int 192 int
193 main(int argc, char *argv[]) 193 main(int argc, char *argv[])
194Index: rpcbind-0.2.2/src/util.c 194diff --git a/src/util.c b/src/util.c
195=================================================================== 195index a6c835b..33b9e4f 100644
196--- rpcbind-0.2.2.orig/src/util.c 196--- a/src/util.c
197+++ rpcbind-0.2.2/src/util.c 197+++ b/src/util.c
198@@ -70,9 +70,9 @@ static struct sockaddr_in *local_in4; 198@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
199 static struct sockaddr_in6 *local_in6; 199 static struct sockaddr_in6 *local_in6;
200 #endif 200 #endif
201 201
202-static int bitmaskcmp __P((void *, void *, void *, int)); 202-static int bitmaskcmp __P((void *, void *, void *, int));
203+static int bitmaskcmp (void *, void *, void *, int); 203+static int bitmaskcmp (void *, void *, void *, int);
204 #ifdef INET6
205-static void in6_fillscopeid __P((struct sockaddr_in6 *));
206+static void in6_fillscopeid (struct sockaddr_in6 *);
207 #endif
208 204
209 /* 205 /*
210Index: rpcbind-0.2.2/src/warmstart.c 206 * For all bits set in "mask", compare the corresponding bits in
211=================================================================== 207diff --git a/src/warmstart.c b/src/warmstart.c
212--- rpcbind-0.2.2.orig/src/warmstart.c 208index b6eb73e..42dd3af 100644
213+++ rpcbind-0.2.2/src/warmstart.c 209--- a/src/warmstart.c
210+++ b/src/warmstart.c
214@@ -58,8 +58,8 @@ 211@@ -58,8 +58,8 @@
215 #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" 212 #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
216 #endif 213 #endif
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch b/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
deleted file mode 100644
index 6b113165c4..0000000000
--- a/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Tue, 2 Feb 2010 09:47:57 +0000
4Subject: [PATCH 2/2] uclibc-rpcsvc-defines
5
6Upstream-Status: Pending
7
8---
9 src/security.c | 28 ++++++++++++++++++++++++++++
10 1 files changed, 28 insertions(+), 0 deletions(-)
11
12diff --git a/src/security.c b/src/security.c
13index 0edeac6..e9fed55 100644
14--- a/src/security.c
15+++ b/src/security.c
16@@ -20,6 +20,32 @@
17 /*
18 * XXX for special case checks in check_callit.
19 */
20+#if defined(__UCLIBC__) || !defined(__GLIBC__)
21+
22+#define MOUNTPROC_MNT 1
23+#define MOUNTPROC_UMNT 3
24+
25+#define NFS_PROGRAM 100003
26+#define YPPROG 100004
27+#define MOUNTPROG 100005
28+#define YPBINDPROG 100007
29+#define YPPASSWDPROG 100009
30+#define RQUOTAPROG 100011
31+
32+#define YPPROC_NULL 0
33+#define YPPROC_DOMAIN 1
34+#define YPPROC_DOMAIN_NONACK 2
35+#define YPPROC_MATCH 3
36+#define YPPROC_FIRST 4
37+#define YPPROC_NEXT 5
38+#define YPPROC_XFR 6
39+#define YPPROC_CLEAR 7
40+#define YPPROC_ALL 8
41+
42+#define YPBINDPROC_SETDOM 2
43+
44+#else
45+
46 #include <rpcsvc/mount.h>
47 #include <rpcsvc/rquota.h>
48 #include <rpcsvc/nfs_prot.h>
49@@ -27,6 +53,8 @@
50 #include <rpcsvc/ypclnt.h>
51 #include <rpcsvc/yppasswd.h>
52
53+#endif
54+
55 #include "rpcbind.h"
56
57 #ifdef LIBWRAP
58--
591.6.6.1
60
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index 51e456e4bd..333602185c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -12,9 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
14 file://init.d \ 14 file://init.d \
15 file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \ 15 file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \
16 file://0002-uclibc-rpcsvc-defines.patch \ 16 file://remove-sys-queue.patch \
17 file://remove-sys-queue.patch \
18 ${UCLIBCPATCHES} \ 17 ${UCLIBCPATCHES} \
19 ${MUSLPATCHES} \ 18 ${MUSLPATCHES} \
20 file://rpcbind.conf \ 19 file://rpcbind.conf \
@@ -24,13 +23,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
24MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch" 23MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch"
25 24
26UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ 25UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
27 file://0002-uclibc-rpcsvc-defines.patch \
28 " 26 "
29UCLIBCPATCHES ?= "" 27UCLIBCPATCHES ?= ""
30MUSLPATCHES ?= "" 28MUSLPATCHES ?= ""
31 29
32SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a" 30SRC_URI[md5sum] = "c8875246b2688a1adfbd6ad43480278d"
33SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29" 31SRC_URI[sha256sum] = "9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b"
34 32
35inherit autotools update-rc.d systemd pkgconfig 33inherit autotools update-rc.d systemd pkgconfig
36 34