Make this package work on Mac OS X.

4 files changed, 59 insertions, 5 deletions

diff --git a/security/rid/distinfo b/security/rid/distinfo
index f92d813a73b..4fa4b4ef1da 100644
--- a/security/rid/distinfo
+++ b/security/rid/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/12/08 17:41:16 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/05/27 22:28:21 agc Exp $
 
 SHA1 (rid-1.11.tgz) = 14ccad3ae413a1bed19ad5f063f8e563b9ddbbfb
 RMD160 (rid-1.11.tgz) = c39ffa2dfc7245022c3db1523909893983a99517
 Size (rid-1.11.tgz) = 122317 bytes
 SHA1 (patch-aa) = 8840f22028d1535c54a6dc84caeb1960cb93a5de
 SHA1 (patch-ab) = e6cf3017ad2d390f2e58d5739b1819dbb5ad1ae8
-SHA1 (patch-ac) = d151390e6306102dd3e6d2121473d727b5953f43
+SHA1 (patch-ac) = a633228b7429eb72f029e25d3acddf8a532dc4f4
+SHA1 (patch-ad) = 6a9c6f515b01c35066b28147f799d669cdeac11b
+SHA1 (patch-ae) = ed1788b1a0196fca6e5facf2d0d33971d0399c48
diff --git a/security/rid/patches/patch-ac b/security/rid/patches/patch-ac
index 38f42ab8cc5..8fdd10cb683 100644
--- a/security/rid/patches/patch-ac
+++ b/security/rid/patches/patch-ac
@@ -1,14 +1,30 @@
-$NetBSD: patch-ac,v 1.1 2005/12/08 17:41:16 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2008/05/27 22:28:21 agc Exp $
 
 --- grammer.y.orig	2005-12-08 17:37:54.000000000 +0000
 +++ grammer.y
-@@ -1,4 +1,5 @@
+@@ -1,4 +1,7 @@
  %{
++#include <sys/types.h>
++
 +#include <errno.h>
  #include <stdio.h>
  #include <strings.h>
  #include "netconfig.h"
-@@ -20,8 +21,6 @@ char *data;
+@@ -9,25 +12,23 @@
+ extern struct udp_item *UDP_Recv;
+ extern struct tcp_item *TCP_Send;
+ extern struct tcp_item *TCP_Recv;
+-extern u_short ConfigNum;
++extern uint16_t ConfigNum;
+ 
+ /* Fields that might be set */
+-u_long sport=-1, dport=-1, seq=-1, id=-1, type=-1, code=-1, ack=-1, win=-1;
+-u_long nmatch=-1;
++uint64_t sport=-1, dport=-1, seq=-1, id=-1, type=-1, code=-1, ack=-1, win=-1;
++uint64_t nmatch=-1;
+ 
+ /* Data in the packet */
+ char *data;
  
  /* Name of current ddos we're working on */
  char ddos_name[BUFSIZE];
@@ -17,3 +33,11 @@ $NetBSD: patch-ac,v 1.1 2005/12/08 17:41:16 joerg Exp $
  %}
  
  %union {
+ 	char *string;
+-	u_short us;
+-	u_long ul;
++	uint16_t us;
++	uint64_t ul;
+ }
+ 
+ %token START END SEND RECV
diff --git a/security/rid/patches/patch-ad b/security/rid/patches/patch-ad
new file mode 100644
index 00000000000..082efc39498
--- /dev/null
+++ b/security/rid/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2008/05/27 22:28:21 agc Exp $
+
+Fix the 3rd arg of waitpid to match the prototype
+
+--- rid.c	2008/05/27 12:45:41	1.1
++++ rid.c	2008/05/27 12:45:10
+@@ -295,7 +295,7 @@
+                 sender();
+ 		sleep(Sleep); /* Wait for all responses before exiting */
+                 kill(PidListener, SIGTERM);
+-                waitpid(PidListener, NULL, NULL);
++                waitpid(PidListener, NULL, 0);
+                 break;
+   }
+ 
diff --git a/security/rid/patches/patch-ae b/security/rid/patches/patch-ae
new file mode 100644
index 00000000000..93cf40a51e3
--- /dev/null
+++ b/security/rid/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/05/27 22:28:21 agc Exp $
+
+--- sender.c	2008/05/27 12:47:48	1.1
++++ sender.c	2008/05/27 12:48:45
+@@ -146,7 +146,7 @@
+   struct icmp_item *icmp_current;
+   static u_char outpack[IP_MAXPACKET];
+   register struct icmp *icp = (struct icmp *)outpack;
+-  char *data = &outpack[8];
++  char *data = (char *)&outpack[8];
+   int cc, i, j;
+   int RawSock;
+