summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/socket/distinfo4
-rw-r--r--sysutils/socket/patches/patch-ai23
2 files changed, 20 insertions, 7 deletions
diff --git a/sysutils/socket/distinfo b/sysutils/socket/distinfo
index 2e8fc46b475..100fe19836e 100644
--- a/sysutils/socket/distinfo
+++ b/sysutils/socket/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/10/04 16:08:40 tron Exp $
+$NetBSD: distinfo,v 1.7 2005/10/04 16:12:28 tron Exp $
SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
RMD160 (socket-1.1.tar.gz) = 9a697cbdc807223f48229caa3349cba216b5ffc0
@@ -11,4 +11,4 @@ SHA1 (patch-ae) = 97bbe5066b8bf00fe45df1c1088768400abf102e
SHA1 (patch-af) = b40a7bbd22a6773816eb0e52403d67317979451d
SHA1 (patch-ag) = e106aac5b193a43ab208b648deadf173a78a6d6d
SHA1 (patch-ah) = 03a996a5d1a40cf573882b842d94d24b226f74ca
-SHA1 (patch-ai) = ca87ec49ff6d51d5cd978bed366a4a0dc937fce3
+SHA1 (patch-ai) = d91f586ff0e109b1b453671550e20c6f80fd9778
diff --git a/sysutils/socket/patches/patch-ai b/sysutils/socket/patches/patch-ai
index 3505f34fa14..6ef53251861 100644
--- a/sysutils/socket/patches/patch-ai
+++ b/sysutils/socket/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 1999/02/02 23:00:41 tron Exp $
+$NetBSD: patch-ai,v 1.2 2005/10/04 16:12:28 tron Exp $
---- utils.c.orig Wed Sep 9 16:31:16 1992
-+++ utils.c Tue Feb 2 23:52:03 1999
+--- utils.c.orig 1992-09-09 15:31:16.000000000 +0100
++++ utils.c 2005-10-04 17:09:34.000000000 +0100
@@ -25,8 +25,10 @@
#else
#include <sys/resource.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ai,v 1.1 1999/02/02 23:00:41 tron Exp $
/* Signal handler, print message and exit */
SIG_HANDLER_RET exitsig(sig)
-@@ -70,7 +72,7 @@
+@@ -70,10 +72,10 @@
/* set up signal handling. All except TSTP, CONT, CLD, and QUIT
* are caught with exitsig(). */
@@ -21,4 +21,17 @@ $NetBSD: patch-ai,v 1.1 1999/02/02 23:00:41 tron Exp $
+void init_signals()
{
int i ;
- #ifdef SIG_SETMASK /* only with BSD signals */
+-#ifdef SIG_SETMASK /* only with BSD signals */
++#if defined(SIG_SETMASK) && !defined(__NetBSD__) /* only with BSD signals */
+ static struct sigvec svec = { exitsig, ~0, 0 } ;
+ #endif
+
+@@ -103,7 +105,7 @@
+ case SIGQUIT: /* if the user wants a core dump, */
+ continue ; /* they can have it. */
+ default:
+-#ifdef SIG_SETMASK
++#if defined(SIG_SETMASK) && !defined(__NetBSD__)
+ sigvec(i, &svec, NULL) ;
+ #else
+ signal(i, exitsig) ;