From e604b5e20543c9a4e34d86ca7604176168c32c33 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Mon, 14 Mar 2005 15:02:14 +0000
Subject: Added two patches that comment out the sa_sigaction field of struct
 sigaction for NetBSD versions (<2.0) that don't have it. Approved by wiz.

---
 benchmarks/postal/distinfo         |  4 +++-
 benchmarks/postal/patches/patch-aa | 30 ++++++++++++++++++++++++++++++
 benchmarks/postal/patches/patch-ab | 30 ++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 benchmarks/postal/patches/patch-aa
 create mode 100644 benchmarks/postal/patches/patch-ab

(limited to 'benchmarks')

diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo
index 8d7b4dbb3b0..8689f4abe07 100644
--- a/benchmarks/postal/distinfo
+++ b/benchmarks/postal/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/22 21:16:36 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/14 15:02:14 rillig Exp $
 
 SHA1 (postal-0.62.tgz) = 6379ac223964921963389c8c600a1ba4b24a6ab3
 RMD160 (postal-0.62.tgz) = 694800444ff33c7c64c5b7915ef5438fdb3605f3
 Size (postal-0.62.tgz) = 84506 bytes
+SHA1 (patch-aa) = ec272095d02d2b8cde4e1f798ac8bfb3212d7874
+SHA1 (patch-ab) = 3a14324d2203fc2f6e0e8028f937906c7d95e7e0
diff --git a/benchmarks/postal/patches/patch-aa b/benchmarks/postal/patches/patch-aa
new file mode 100644
index 00000000000..64ad75a9049
--- /dev/null
+++ b/benchmarks/postal/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2005/03/14 15:02:14 rillig Exp $
+
+--- postal.cpp.orig	Tue Jan 14 12:33:27 2003
++++ postal.cpp	Sat Mar 12 00:24:43 2005
+@@ -11,6 +11,15 @@
+ #include "postal.h"
+ #include "logit.h"
+ 
++#ifdef __NetBSD__
++# include <sys/param.h>
++# if __NetBSD_Version__ >= 200000000
++#  define HAVE_STRUCT_SIGACTION_SA_SIGACTION
++# endif
++#else
++# define HAVE_STRUCT_SIGACTION_SA_SIGACTION
++#endif
++
+ void usage()
+ {
+   printf("Usage: postal [-m maximum-message-size] [-p processes] [-l local-address]\n"
+@@ -112,7 +121,9 @@ int main(int argc, char **argv)
+   }
+   struct sigaction sa;
+   sa.sa_handler = SIG_IGN;
++#ifdef HAVE_STRUCT_SIGACTION_SA_SIGACTION
+   sa.sa_sigaction = NULL;
++#endif
+   sa.sa_flags = 0;
+   if(sigaction(SIGPIPE, &sa, NULL))
+   {
diff --git a/benchmarks/postal/patches/patch-ab b/benchmarks/postal/patches/patch-ab
new file mode 100644
index 00000000000..8f13b179fc3
--- /dev/null
+++ b/benchmarks/postal/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2005/03/14 15:02:14 rillig Exp $
+
+--- rabid.cpp.orig	Tue Jan 14 12:33:02 2003
++++ rabid.cpp	Sat Mar 12 00:25:56 2005
+@@ -11,6 +11,15 @@
+ #include "postal.h"
+ #include "logit.h"
+ 
++#ifdef __NetBSD__
++# include <sys/param.h>
++# if __NetBSD_Version__ >= 200000000
++#  define HAVE_STRUCT_SIGACTION_SA_SIGACTION
++# endif
++#else
++# define HAVE_STRUCT_SIGACTION_SA_SIGACTION
++#endif
++
+ void usage()
+ {
+   printf("Usage: rabid [-r max-connections-per-minute] [-p processes] [-l local-address]\n"
+@@ -112,7 +121,9 @@ int main(int argc, char **argv)
+ 
+   struct sigaction sa;
+   sa.sa_handler = SIG_IGN;
++#ifdef HAVE_STRUCT_SIGACTION_SA_SIGACTION
+   sa.sa_sigaction = NULL;
++#endif
+   sa.sa_flags = 0;
+   if(sigaction(SIGPIPE, &sa, NULL))
+   {
-- 
cgit v1.2.3