Fix build under OpenBSD/amd64 5.5

7 files changed, 120 insertions, 20 deletions

diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index bbb1fdd5ee9..94665892e2a 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.31 2013/10/24 21:19:12 jperkin Exp $
+$NetBSD: distinfo,v 1.32 2014/05/12 15:06:55 ryoon Exp $
 
 SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b
 RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc
 Size (mDNSResponder-258.14.tar.gz) = 1833244 bytes
 SHA1 (patch-Clients_dns-sd.c) = 5adac63ba76497056c1abfd426460560b8a3f012
-SHA1 (patch-aa) = ca1e37346b7400649957da8470efb62a343aff68
-SHA1 (patch-ab) = 8567d3a9849377fdfd1fd98f1b0dd164561bb6c9
-SHA1 (patch-ac) = 3fb065c49ed434f031ea29214ec4140b24f8da64
+SHA1 (patch-aa) = 36bdbbe8d44391e6c625d38f5b77813b6d76f41e
+SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008
+SHA1 (patch-ac) = 1dd233e060f980eda9b11fbbf62f619e533ee96f
 SHA1 (patch-ad) = 612390897ad2f395ceb7394b644f977c4858d6cc
-SHA1 (patch-ae) = 551ddcaa508a2e77361a3b683f9de841ca4957b4
+SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b
 SHA1 (patch-af) = bce933daa008f081b72c5d509e84704be13360dc
 SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a
+SHA1 (patch-mDNSShared_dnssd__clientstub.c) = 591801ae08dce4a44c06dd52a46fcd63807eafcc
+SHA1 (patch-mDNSShared_uds__daemon.c) = df279d3871bb6ead1563c79c99c4d2dc6d91ff79
diff --git a/net/mDNSResponder/patches/patch-aa b/net/mDNSResponder/patches/patch-aa
index 4593a4d1bb2..23b91118703 100644
--- a/net/mDNSResponder/patches/patch-aa
+++ b/net/mDNSResponder/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.12 2013/10/24 21:19:12 jperkin Exp $
+$NetBSD: patch-aa,v 1.13 2014/05/12 15:06:56 ryoon Exp $
 
 Find libpthread.so when not on the default rpath.
 Allow custom CC and CFLAGS.
 Disable -Werror on OSX.
+Fix build failure under OpenBSD, __guard_local issue.
 
 --- mDNSPosix/Makefile.orig	2009-08-11 01:13:47.000000000 +0000
 +++ mDNSPosix/Makefile
@@ -41,7 +42,13 @@ Disable -Werror on OSX.
  JAVACFLAGS_OS += -I$(JDK)/include/freebsd
  LDCONFIG = ldconfig
  else
-@@ -139,9 +138,8 @@ else
+@@ -134,14 +133,14 @@ else
+ ifeq ($(os),openbsd)
+ CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR
+ LDCONFIG = ldconfig
++LD = cc -shared
+ else
+ 
  ifeq ($(os),x)
  # We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard
  # we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283)
@@ -52,7 +59,7 @@ Disable -Werror on OSX.
  LD = $(CC) -dynamiclib
  LINKOPTS = -lSystem
  LDSUFFIX = dylib
-@@ -205,7 +203,7 @@ endif
+@@ -205,7 +204,7 @@ endif
  endif
  endif
  
diff --git a/net/mDNSResponder/patches/patch-ab b/net/mDNSResponder/patches/patch-ab
index 28d6ece0acb..b750bedb119 100644
--- a/net/mDNSResponder/patches/patch-ab
+++ b/net/mDNSResponder/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2011/01/12 08:53:52 adam Exp $
+$NetBSD: patch-ab,v 1.9 2014/05/12 15:06:56 ryoon Exp $
 
-1) add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
+1) From http://lists.apple.com/archives/bonjour-dev/2007/Jan/msg00003.html
+
+2) add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
 
  -enable ipv6
  -fix some RFC2292 vs 3542 confusion which made the former fail
@@ -8,6 +10,15 @@ $NetBSD: patch-ab,v 1.8 2011/01/12 08:53:52 adam Exp $
 
 --- mDNSPosix/mDNSPosix.c.orig	2010-05-20 22:35:08.000000000 +0000
 +++ mDNSPosix/mDNSPosix.c
+@@ -256,7 +256,7 @@ mDNSlocal void SocketDataReady(mDNS *con
+ 		// so all we can do is just assume it's a multicast
+ 
+ 		#if HAVE_BROKEN_RECVDSTADDR || (!defined(IP_PKTINFO) && !defined(IP_RECVDSTADDR))
+-			if ((destAddr.NotAnInteger == 0) && (flags & MSG_MCAST))
++			if ((destAddr.ip.v4.NotAnInteger == 0) && (flags & MSG_MCAST))
+ 				{
+ 				destAddr.type = senderAddr.type;
+ 				if      (senderAddr.type == mDNSAddrType_IPv4) destAddr.ip.v4 = AllDNSLinkGroup_v4.ip.v4;
 @@ -467,7 +467,7 @@ mDNSexport int ParseDNSServers(mDNS *m, 
  	{
  	char line[256];
diff --git a/net/mDNSResponder/patches/patch-ac b/net/mDNSResponder/patches/patch-ac
index 8d9e92af23c..023ae0e66d8 100644
--- a/net/mDNSResponder/patches/patch-ac
+++ b/net/mDNSResponder/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.9 2011/01/12 08:53:52 adam Exp $
+$NetBSD: patch-ac,v 1.10 2014/05/12 15:06:56 ryoon Exp $
 
 * Fix build on FreeBSD and DragonFly, as shown in recent bulk builds and
   PR 34022.
 * Don't try to include nonexistant ipv6 header on Solaris.
   From Volker Stolz in PR pkg/34883.
+* For OpenBSD, from
+  http://lists.apple.com/archives/bonjour-dev/2007/Jan/msg00003.html
 
---- mDNSPosix/mDNSUNP.c.orig	2009-01-13 00:31:35.000000000 -0500
-+++ mDNSPosix/mDNSUNP.c	2010-12-04 19:25:49.000000000 -0500
-@@ -54,8 +54,10 @@ First checkin
+--- mDNSPosix/mDNSUNP.c.orig	2010-06-24 21:49:06.000000000 +0000
++++ mDNSPosix/mDNSUNP.c
+@@ -54,8 +54,10 @@
      #include <net/if_dl.h>
  #endif
  
@@ -36,3 +38,19 @@ $NetBSD: patch-ac,v 1.9 2011/01/12 08:53:52 adam Exp $
  			plen_to_mask(plen, ipv6addr);
  			ifi->ifi_netmask = calloc(1, sizeof(struct sockaddr_in6));
  			if (ifi->ifi_addr == NULL) {
+@@ -488,7 +491,15 @@ recvfrom_flags(int fd, void *ptr, size_t
+            set the value to 0, but I'm concerned that 0 
+            might be a valid interface value.
+         */
++#if HAVE_BROKEN_RECVDSTADDR
++       /* similar to the issue with OpenBSD in mDNSPosix.c, we need
++          to preset sin_family to IF_NET, because of broken IP_RECVDSTADDR
++        */
++        struct in_pktinfo *tmp;
++        struct sockaddr_in *sin = (struct sockaddr_in*)&pktp->ipi_addr;
+         memset(pktp, 0, sizeof(struct my_in_pktinfo));
++        sin->sin_family = AF_INET;
++#endif
+         pktp->ipi_ifindex = -1;
+     }
+ /* end recvfrom_flags1 */
diff --git a/net/mDNSResponder/patches/patch-ae b/net/mDNSResponder/patches/patch-ae
index edbd1f2c3d5..e13ff7e797b 100644
--- a/net/mDNSResponder/patches/patch-ae
+++ b/net/mDNSResponder/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2014/05/12 14:14:30 ryoon Exp $
+$NetBSD: patch-ae,v 1.6 2014/05/12 15:06:56 ryoon Exp $
+
+* Add OpenBSD condition
 
 --- mDNSShared/CommonServices.h.orig	2009-08-11 01:13:47.000000000 +0000
 +++ mDNSShared/CommonServices.h
@@ -35,16 +37,33 @@ $NetBSD: patch-ae,v 1.5 2014/05/12 14:14:30 ryoon Exp $
  // Solaris
  
  #if( !defined( TARGET_OS_SOLARIS ) )
-@@ -90,7 +116,7 @@
+@@ -74,6 +100,16 @@
+ 	#endif
+ #endif
+ 
++// OpenBSD
++
++#if( !defined( TARGET_OS_OPENBSD ) )
++	#if( defined( __OpenBSD__ ) )
++		#define	TARGET_OS_OPENBSD		1
++	#else
++		#define	TARGET_OS_OPENBSD		0
++	#endif
++#endif
++
+ // Palm
+ 
+ #if( !defined( TARGET_OS_PALM ) )
+@@ -90,7 +126,7 @@
  	
  	// No predefined macro for VxWorks so just assume VxWorks if nothing else is set.
  	
 -	#if( !macintosh && !__MACH__  && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
-+	#if( !macintosh && !__MACH__  && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__))
++	#if( !macintosh && !__MACH__  && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__))
  		#define	TARGET_OS_VXWORKS		1
  	#else
  		#define	TARGET_OS_VXWORKS		0
-@@ -186,6 +212,27 @@
+@@ -186,6 +222,27 @@
  	#include	<stdint.h>
  	#include	<arpa/inet.h>
  	
@@ -72,12 +91,27 @@ $NetBSD: patch-ae,v 1.5 2014/05/12 14:14:30 ryoon Exp $
  #elif( TARGET_OS_SOLARIS )
  	
  	// Solaris
-@@ -455,7 +502,7 @@
+@@ -202,6 +259,14 @@
+ 		#define TARGET_RT_BIG_ENDIAN		1
+ 	#endif
+ 
++#elif ( TARGET_OS_OPENBSD )
++
++	// OpenBSD
++
++	#include	<pthread.h>
++	#include	<arpa/inet.h>
++	#include	<sys/socket.h> // for AF_INET6 definition
++
+ #elif( TARGET_OS_PALM )
+ 	
+ 	// Palm (no special includes yet).
+@@ -455,7 +520,7 @@
  // - Windows
  
  #if( TARGET_LANGUAGE_C_LIKE )
 -	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
-+	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC && !TARGET_OS_NETBSD && !TARGET_OS_DRAGONFLY && !TARGET_OS_FREEBSD)
++	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC && !TARGET_OS_NETBSD && !TARGET_OS_DRAGONFLY && !TARGET_OS_FREEBSD && !TARGET_OS_OPENBSD)
  		typedef int						ssize_t;
  	#endif
  #endif
diff --git a/net/mDNSResponder/patches/patch-mDNSShared_dnssd__clientstub.c b/net/mDNSResponder/patches/patch-mDNSShared_dnssd__clientstub.c
new file mode 100644
index 00000000000..78ea398c4aa
--- /dev/null
+++ b/net/mDNSResponder/patches/patch-mDNSShared_dnssd__clientstub.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-mDNSShared_dnssd__clientstub.c,v 1.1 2014/05/12 15:06:56 ryoon Exp $
+
+Required for OpenBSD 5.5
+
+--- mDNSShared/dnssd_clientstub.c.orig	2010-06-17 00:06:28.000000000 +0000
++++ mDNSShared/dnssd_clientstub.c
+@@ -74,6 +74,7 @@
+ 	#include <sys/fcntl.h>		// For O_RDWR etc.
+ 	#include <sys/time.h>
+ 	#include <sys/socket.h>
++	#include <sys/uio.h>
+ 	#include <syslog.h>
+ 	
+ 	#define sockaddr_mdns sockaddr_un
diff --git a/net/mDNSResponder/patches/patch-mDNSShared_uds__daemon.c b/net/mDNSResponder/patches/patch-mDNSShared_uds__daemon.c
new file mode 100644
index 00000000000..9b8cf1509ca
--- /dev/null
+++ b/net/mDNSResponder/patches/patch-mDNSShared_uds__daemon.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-mDNSShared_uds__daemon.c,v 1.1 2014/05/12 15:06:56 ryoon Exp $
+
+Required for OpenBSD 5.5
+
+--- mDNSShared/uds_daemon.c.orig	2010-08-24 00:28:17.000000000 +0000
++++ mDNSShared/uds_daemon.c
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <sys/uio.h>
+ #endif
+ 
+ #include <stdlib.h>