netkit-rsh: fix build issue.

glibc deprecate union wait and remove support from wait functions
https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html
change rlogin.c accordingly

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Armin Kuster 2016-05-23 21:30:34 -07:00 committed by Joe MacDonald
parent 880c3dce36
commit 62e3df2ddb
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,34 @@
Fix build issue do to Deprecate union wait and remove support from wait functions [BZ #19613]
| rlogin.c: In function 'catch_child':
| rlogin.c:463:13: error: storage size of 'status' isn't known
| union wait status;
https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html
Upstream-Status: Inappropriate [ no upstream maintaner ]
Signed-off-by Armin Kuster <akuster@mvista.com>
Index: netkit-rsh-0.17/rlogin/rlogin.c
===================================================================
--- netkit-rsh-0.17.orig/rlogin/rlogin.c
+++ netkit-rsh-0.17/rlogin/rlogin.c
@@ -460,7 +460,7 @@ writeroob(int ignore)
void
catch_child(int ignore)
{
- union wait status;
+ int status;
int pid;
(void)ignore;
@@ -471,7 +471,7 @@ catch_child(int ignore)
return;
/* if the child (reader) dies, just quit */
if (pid < 0 || (pid == childpid && !WIFSTOPPED(status)))
- done((int)(status.w_termsig | status.w_retcode));
+ done((int)(WTERMSIG(status) | WEXITSTATUS(status)));
}
/* NOTREACHED */
}

View File

@ -15,6 +15,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=
file://rsh.xinetd.netkit \
file://netkit-rsh-0.17-rexec-ipv6.patch \
file://fix-host-variable.patch \
file://fixup_wait3_api_change.patch \
"
SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096"