rel 27

diff --git a/netkit-rsh-0.17-union-wait.patch b/netkit-rsh-0.17-union-wait.patch
new file mode 100644 (file)
index 0000000..a3956a4
--- /dev/null
+++ b/netkit-rsh-0.17-union-wait.patch
@@ -0,0 +1,22 @@
+diff -ruN netkit-rsh-0.17.orig/rlogin/rlogin.c netkit-rsh-0.17/rlogin/rlogin.c
+--- netkit-rsh-0.17.orig/rlogin/rlogin.c       2016-12-21 13:25:05.138064634 -0500
++++ netkit-rsh-0.17/rlogin/rlogin.c    2016-12-21 13:34:24.172847615 -0500
+@@ -421,7 +421,7 @@
+ void
+ catch_child(int ignore)
+ {
+-      union wait status;
++      int status;
+       int pid;
+ 
+       (void)ignore;
+@@ -432,7 +432,7 @@
+                       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 */
+ }
+Binary files netkit-rsh-0.17.orig/rlogin/.rlogin.c.swp and netkit-rsh-0.17/rlogin/.rlogin.c.swp differ

diff --git a/rsh.spec b/rsh.spec
index 08db2b5b1559499814d04e7582584ccfe131a230..204063a6ec89ba92ff0948afcb88e70d39473295 100644 (file)
--- a/rsh.spec
+++ b/rsh.spec
@@ -3,7 +3,7 @@ Summary:        rsh client and rcp command
 Summary(pl.UTF-8):     Klient rsh i polecenie rcp
 Name:          rsh
 Version:       0.17
-Release:       26
+Release:       27
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch6:               netkit-%{name}-prompt.patch
 Patch7:                netkit-%{name}-rlogin=rsh.patch
 Patch8:                netkit-%{name}-nokrb.patch
 Patch9:                netkit-%{name}-auth.c.patch
+Patch10:        netkit-rsh-0.17-union-wait.patch
 BuildRequires: pam-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -137,6 +138,7 @@ programów ze zdalnych maszyn (rexec).
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %{__sed} -i 's/ARG_MAX/_POSIX_ARG_MAX/g' ./rshd/rshd.c ./rexecd/rexecd.c