diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch | 30 | ||||
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 8 |
3 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch b/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch deleted file mode 100644 index 6fbc6364cb..0000000000 --- a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | The musl implementation of getaddrinfo and getservbyname does not | ||
2 | aliases. As a workaround we use "sunprc" instead of "portmapper" | ||
3 | |||
4 | ported from alpine linux | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: rpcbind-0.2.2/src/rpcbind.c | ||
10 | =================================================================== | ||
11 | --- rpcbind-0.2.2.orig/src/rpcbind.c | ||
12 | +++ rpcbind-0.2.2/src/rpcbind.c | ||
13 | @@ -491,7 +491,7 @@ init_transport(struct netconfig *nconf) | ||
14 | if ((aicode = getaddrinfo(hosts[nhostsbak], | ||
15 | servname, &hints, &res)) != 0) { | ||
16 | if ((aicode = getaddrinfo(hosts[nhostsbak], | ||
17 | - "portmapper", &hints, &res)) != 0) { | ||
18 | + "sunrpc", &hints, &res)) != 0) { | ||
19 | syslog(LOG_ERR, | ||
20 | "cannot get local address for %s: %s", | ||
21 | nconf->nc_netid, gai_strerror(aicode)); | ||
22 | @@ -564,7 +564,7 @@ init_transport(struct netconfig *nconf) | ||
23 | if ((strcmp(nconf->nc_netid, "local") != 0) && | ||
24 | (strcmp(nconf->nc_netid, "unix") != 0)) { | ||
25 | if ((aicode = getaddrinfo(NULL, servname, &hints, &res))!= 0) { | ||
26 | - if ((aicode = getaddrinfo(NULL, "portmapper", &hints, &res))!= 0) { | ||
27 | + if ((aicode = getaddrinfo(NULL, "sunrpc", &hints, &res))!= 0) { | ||
28 | printf("cannot get local address for %s: %s", nconf->nc_netid, gai_strerror(aicode)); | ||
29 | syslog(LOG_ERR, | ||
30 | "cannot get local address for %s: %s", | ||
diff --git a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch b/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch deleted file mode 100644 index 84fc974fdf..0000000000 --- a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | musl does not provide this header and here is reasoning | ||
2 | http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_sys.2Fqueue.h_not_included_.3F | ||
3 | |||
4 | So include it only when __GLIBC__ is defined which is true for uclibc and glibc | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: rpcbind-0.2.2/src/util.c | ||
10 | =================================================================== | ||
11 | --- rpcbind-0.2.2.orig/src/util.c | ||
12 | +++ rpcbind-0.2.2/src/util.c | ||
13 | @@ -41,7 +41,9 @@ | ||
14 | |||
15 | #include <sys/types.h> | ||
16 | #include <sys/socket.h> | ||
17 | +#ifdef __GLIBC__ | ||
18 | #include <sys/queue.h> | ||
19 | +#endif | ||
20 | #include <net/if.h> | ||
21 | #include <netinet/in.h> | ||
22 | #include <ifaddrs.h> | ||
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb index 4911fe51e8..d3ebcb3b25 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | |||
@@ -12,18 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ | |||
12 | 12 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ | 13 | SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ |
14 | file://init.d \ | 14 | file://init.d \ |
15 | file://remove-sys-queue.patch \ | ||
16 | ${UCLIBCPATCHES} \ | ||
17 | ${MUSLPATCHES} \ | ||
18 | file://rpcbind.conf \ | 15 | file://rpcbind.conf \ |
19 | file://rpcbind.socket \ | 16 | file://rpcbind.socket \ |
20 | file://rpcbind.service \ | 17 | file://rpcbind.service \ |
21 | " | 18 | " |
22 | MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch" | ||
23 | |||
24 | UCLIBCPATCHES ?= "" | ||
25 | MUSLPATCHES ?= "" | ||
26 | |||
27 | SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe" | 19 | SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe" |
28 | SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66" | 20 | SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66" |
29 | 21 | ||