Hi,

I have patched 2 RC bugs that are threatening to get tcsh (and hence my
packages) kicked out of testing.

Please review the patch:


Author: Alastair McKinstry <mckins...@debian.org>
Last-Updated: 2016-09-30
Forwarded: no
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837026
Description: Don't try to use BSDWAIT
 glibc-2.24 removed the deprecated BSD Union wait type.

diff -urN tcsh-6.18.01/sh.proc.c tcsh-6.18.01.new/sh.proc.c
--- tcsh-6.18.01/sh.proc.c      2012-01-25 15:34:41.000000000 +0000
+++ tcsh-6.18.01.new/sh.proc.c  2016-09-30 08:37:31.231484658 +0100
@@ -38,6 +38,10 @@
 #include "tc.h"
 #include "tc.wait.h"

+#ifdef BSDWAIT
+#undef BSDWAIT
+#endif
+
 #ifdef WINNT_NATIVE
 #undef POSIX
 #define POSIX
@@ -49,14 +53,14 @@

 #if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid)
|| defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
 # if !defined(__ANDROID__)
-#  define BSDWAIT
+// #  define BSDWAIT
 # endif
 #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
 #ifndef WTERMSIG
 # define WTERMSIG(w)   (((union wait *) &(w))->w_termsig)
-# ifndef BSDWAIT
-#  define BSDWAIT
-# endif /* !BSDWAIT */
+// # ifndef BSDWAIT
+//#  define BSDWAIT
+// # endif /* !BSDWAIT */
 #endif /* !WTERMSIG */
 #ifndef WEXITSTATUS
 # define WEXITSTATUS(w)        (((union wait *) &(w))->w_retcode)

Regards

Alastair



-- 
Alastair McKinstry, <alast...@sceal.ie>, <mckins...@debian.org>, 
https://diaspora.sceal.ie/u/amckinstry
Misentropy: doubting that the Universe is becoming more disordered. 

Reply via email to