Bug#833965: Uploaded fix to FTBFS to delayed/3

[Thomas Lange]

> On Fri, 30 Sep 2016 14:19:49 +0100, Alastair McKinstry 
>  said:

> I have patched 2 RC bugs that are threatening to get tcsh (and hence my
> packages) kicked out of testing.
> Please review the patch:

Sorry, I cannot review the patch, since I'm didn't program in C since
around 20 years. But here's the patch from upstream, I just
found. Feel free to decide if you want to use your patch or do another
NMU with the upstream patch.



commit 4689eb60a74bf13bc146ca3d76e9d7a124ab7b49
Author: christos 
Date:   Fri Sep 23 19:17:28 2016 +

Don't define BSDWAIT for linux anymore.

diff --git a/sh.proc.c b/sh.proc.c
index 49b199f..874d67c 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -47,11 +47,9 @@ RCSID("$tcsh$")
 # define HZ 16
 #endif /* aiws */
 
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || 
defined(__linux__) || defined(__GNU__)
-# if !defined(__ANDROID__) && !defined(__GLIBC__)
-#  define BSDWAIT
-# endif
-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid)
+# define BSDWAIT
+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid */
 #ifndef WTERMSIG
 # define WTERMSIG(w)   (((union wait *) &(w))->w_termsig)
 # ifndef BSDWAIT

-- 
regards Thomas

Bug#833965: Uploaded fix to FTBFS to delayed/3

[Alastair McKinstry]

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 
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.0 +
+++ 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, , , 
https://diaspora.sceal.ie/u/amckinstry
Misentropy: doubting that the Universe is becoming more disordered.