Pullup ticket #5480 - requested by sevan
net/hping3: build fix

Revisions pulled up:
- net/hping3/Makefile                                           1.8
- net/hping3/distinfo                                           1.5
- net/hping3/options.mk                                         1.2
- net/hping3/patches/patch-aa                                   1.2
- net/hping3/patches/patch-ab                                   1.3
- net/hping3/patches/patch-ac                                   1.3
- net/hping3/patches/patch-ars.c                                1.1
- net/hping3/patches/patch-ars.h                                1.1
- net/hping3/patches/patch-gethostname.c                        1.1
- net/hping3/patches/patch-libpcap__stuff.c                     1.1
- net/hping3/patches/patch-sbignum.c                            1.1
- net/hping3/patches/patch-sendip.c                             1.1

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Wed Jun 14 12:17:30 UTC 2017

   Modified Files:
           pkgsrc/net/hping3: Makefile distinfo options.mk
           pkgsrc/net/hping3/patches: patch-aa patch-ab patch-ac
   Added Files:
           pkgsrc/net/hping3/patches: patch-ars.c patch-ars.h
   patch-gethostname.c
               patch-libpcap__stuff.c patch-sbignum.c patch-sendip.c

   Log Message:
   Various patches and cleanups to fix build on Darwin and SunOS.


(bsiegert)

$NetBSD: patch-ars.c,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

Darwin compatibility, from Homebrew.

--- ars.c.orig	2004-04-14 12:30:18.000000000 +0000
+++ ars.c
@@ -914,7 +914,7 @@ int ars_bsd_fix(struct ars_packet *pkt,
 		return -ARS_INVALID;
 	}
 	ip = (struct ars_iphdr*) packet;
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
 	ip->tot_len = ntohs(ip->tot_len);
 	ip->frag_off = ntohs(ip->frag_off);
 #endif

$NetBSD: patch-ars.h,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

SunOS requires alloca.h

--- ars.h.orig	2004-06-04 07:22:38.000000000 +0000
+++ ars.h
@@ -11,6 +11,9 @@
 #define _BSD_SOCKLEN_T_ int
 #endif
 
+#ifdef __sun
+#include <alloca.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string.h>

$NetBSD: patch-gethostname.c,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

Delete conflicting strlcpy definition.

--- gethostname.c.orig	2003-09-01 00:22:06.000000000 +0000
+++ gethostname.c
@@ -18,8 +18,6 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-size_t strlcpy(char *dst, const char *src, size_t siz);
-
 char *get_hostname(char* addr)
 {
 	static char answer[1024];

$NetBSD: patch-libpcap__stuff.c,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

Fix include ordering to avoid redefined bpf_* symbols.

--- libpcap_stuff.c.orig	2004-04-09 23:38:56.000000000 +0000
+++ libpcap_stuff.c
@@ -16,8 +16,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <pcap.h>
 #include <net/bpf.h>
+#include <pcap.h>
 
 #include "globals.h"
 

$NetBSD: patch-sbignum.c,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

SunOS requires alloca.h

--- sbignum.c.orig	2003-10-02 08:21:42.000000000 +0000
+++ sbignum.c
@@ -40,6 +40,9 @@
  * 12 Sep 2003: Fixed a memory leak in mpz_tostr().
  */
 
+#ifdef __sun
+#include <alloca.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

$NetBSD: patch-sendip.c,v 1.1.2.2 2017/06/21 18:20:04 bsiegert Exp $

Darwin compatibility, from Homebrew.

--- sendip.c.orig	2004-04-09 23:38:56.000000000 +0000
+++ sendip.c
@@ -48,7 +48,7 @@ void send_ip (char* src, char *dst, char
 	ip->ihl		= (IPHDR_SIZE + optlen + 3) >> 2;
 	ip->tos		= ip_tos;
 
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI
 /* FreeBSD */
 /* NetBSD */
 	ip->tot_len	= packetsize;
@@ -73,7 +73,7 @@ void send_ip (char* src, char *dst, char
 			htons((unsigned short) src_id);
 	}
 
-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI
+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI
 /* FreeBSD */
 /* NetBSD */
 	ip->frag_off	|= more_fragments;