Apply patch from Philpp Zabel to make xauth compile again, closes #178

diff --git a/packages/xauth/xauth/autofoo.patch b/packages/xauth/xauth/autofoo.patch
index 686e583..d279a6f 100644 (file)
--- a/packages/xauth/xauth/autofoo.patch
+++ b/packages/xauth/xauth/autofoo.patch
@@ -146,96 +146,3 @@ diff -urN xauth.orig/configure.ac xauth/configure.ac
 +fi
 +
 +AC_OUTPUT([Makefile])
-diff -urN xauth.orig/gethost.c xauth/gethost.c
---- xauth.orig/gethost.c       2004-04-23 21:54:38.000000000 +0200
-+++ xauth/gethost.c    2004-08-14 23:55:45.000000000 +0200
-@@ -28,6 +28,10 @@
- 
- /* $XFree86: xc/programs/xauth/gethost.c,v 3.20 2003/07/27 12:34:25 herrb Exp $ */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- /* sorry, streams support does not really work yet */
- #if defined(STREAMSCONN) && defined(SVR4)
- #undef STREAMSCONN
-@@ -89,17 +93,13 @@
- 
- static jmp_buf env;
- static 
--#ifdef SIGNALRETURNSINT
--int
--#else
--void
--#endif
-+RETSIGTYPE
- nameserver_lost(int sig)
- {
-   nameserver_timedout = True;
-   longjmp (env, -1);
-   /* NOTREACHED */
--#ifdef SIGNALRETURNSINT
-+#if (RETSIGTYPE == int)
-   return -1;                          /* for picky compilers */
- #endif
- }
-diff -urN xauth.orig/parsedpy.c xauth/parsedpy.c
---- xauth.orig/parsedpy.c      2004-04-23 21:54:38.000000000 +0200
-+++ xauth/parsedpy.c   2004-08-14 23:55:01.000000000 +0200
-@@ -31,6 +31,10 @@
- 
- /* $XFree86: xc/programs/xauth/parsedpy.c,v 3.7 2003/07/09 15:27:37 tsi Exp $ */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>                    /* for NULL */
- #include <ctype.h>                    /* for isascii() and isdigit() */
- #include <X11/Xos.h>                  /* for strchr() and string routines */
-diff -urN xauth.orig/process.c xauth/process.c
---- xauth.orig/process.c       2004-04-25 01:26:55.000000000 +0200
-+++ xauth/process.c    2004-08-14 23:55:25.000000000 +0200
-@@ -33,6 +33,10 @@
-  * Author:  Jim Fulton, MIT X Consortium
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "xauth.h"
- #include <ctype.h>
- #include <errno.h>
-@@ -626,11 +630,7 @@
- static char *xauth_filename = NULL;
- static volatile Bool dieing = False;
- 
--#ifdef SIGNALRETURNSINT
--#define _signal_t int
--#else
--#define _signal_t void
--#endif
-+#define _signal_t RETSIGTYPE
- 
- /* poor man's puts(), for under signal handlers */
- #define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
-@@ -642,7 +642,7 @@
-     dieing = True;
-     _exit (auth_finalize ());
-     /* NOTREACHED */
--#ifdef SIGNALRETURNSINT
-+#if (RETSIGTYPE == int)
-     return -1;                                /* for picky compilers */
- #endif
- }
-@@ -664,7 +664,7 @@
- #endif
-     die (sig);
-     /* NOTREACHED */
--#ifdef SIGNALRETURNSINT
-+#if (RETSIGTYPE == int)
-     return -1;                                /* for picky compilers */
- #endif
- }