From f8ce5542f2b139ac303774f8d2bf757f6c9a1561 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Wed, 15 Dec 2010 22:33:42 +0000
Subject: [PATCH] Fix 'intfMask != NULL' assertion on NetBSD when mdnsd
 encounters an IPv6 address; patch-ac changed the distribution source to not
 pull in netinet/in_var.h on NetBSD but that is where SIOCGIFNETMASK_IN6 comes
 from so bring it back in. Bump pkg revision.

---
 net/mDNSResponder/Makefile         |  3 ++-
 net/mDNSResponder/distinfo         |  4 ++--
 net/mDNSResponder/patches/patch-ac | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 63b5eb1f8a7..e164f365fc8 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/07/14 09:29:04 sbd Exp $
+# $NetBSD: Makefile,v 1.31 2010/07/16 07:34:02 tnn Exp $
 
 DISTNAME=	mDNSResponder-214.3.2
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.opensource.apple.com/tarballs/mDNSResponder/
 
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index ad8458f140d..836aaa24104 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2010/07/19 14:14:13 tnn Exp $
+$NetBSD: distinfo,v 1.22 2010/07/20 00:04:08 sbd Exp $
 
 SHA1 (mDNSResponder-214.3.2.tar.gz) = bd59e0e3008ba797a30360dd8e59beb7152d9872
 RMD160 (mDNSResponder-214.3.2.tar.gz) = f9670f661083dae5529422b19655ba9c473960c7
 Size (mDNSResponder-214.3.2.tar.gz) = 1633510 bytes
 SHA1 (patch-aa) = 6a899e729b7ed1aa43497934a98e37b2fd9411d4
 SHA1 (patch-ab) = 712e3999854215b9ea14f6d444262beef8c545b1
-SHA1 (patch-ac) = 60fd50c011dc086b6763fef617ab5f78c8ecc6b5
+SHA1 (patch-ac) = f328cfed7da68b61dc1afa9908aade33cfd5ecc3
 SHA1 (patch-ad) = fa77b934a63bd07f9b0a4697a3c1a59d242fca19
 SHA1 (patch-ae) = f124201460929b86300664ff9ee31c0d845759c9
diff --git a/net/mDNSResponder/patches/patch-ac b/net/mDNSResponder/patches/patch-ac
index 4e920f5103a..ec2f8856e5a 100644
--- a/net/mDNSResponder/patches/patch-ac
+++ b/net/mDNSResponder/patches/patch-ac
@@ -1,22 +1,25 @@
-$NetBSD$
+$NetBSD: patch-ac,v 1.7 2010/07/15 09:08:28 tnn 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.
 
---- mDNSPosix/mDNSUNP.c.orig	2009-01-13 05:31:35.000000000 +0000
-+++ mDNSPosix/mDNSUNP.c
-@@ -188,7 +188,7 @@ First checkin
+--- mDNSPosix/mDNSUNP.c.orig	2009-01-13 00:31:35.000000000 -0500
++++ mDNSPosix/mDNSUNP.c	2010-12-04 19:25:49.000000000 -0500
+@@ -188,8 +188,10 @@ First checkin
      #include <net/if_dl.h>
  #endif
  
 -#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX
-+#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX && !defined(sun) && !defined(__NetBSD__)
++#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX && !defined(sun)
++#if !defined(__NetBSD__)
  #include <net/if_var.h>
++#endif
  #include <netinet/in_var.h>
  // Note: netinet/in_var.h implicitly includes netinet6/in6_var.h for us
-@@ -239,6 +239,8 @@ struct ifi_info *get_ifi_info_linuxv6(in
+ #endif
+@@ -239,6 +241,8 @@ struct ifi_info *get_ifi_info_linuxv6(in
  					  addr[4],addr[5],addr[6],addr[7],
  					  &index, &plen, &scope, &flags, ifname) != EOF) {
  
@@ -25,7 +28,7 @@ $NetBSD$
  			myflags = 0;
  			if (strncmp(lastname, ifname, IFNAMSIZ) == 0) {
  				if (doaliases == 0)
-@@ -273,7 +275,6 @@ struct ifi_info *get_ifi_info_linuxv6(in
+@@ -273,7 +277,6 @@ struct ifi_info *get_ifi_info_linuxv6(in
  			memcpy(ifi->ifi_addr, res0->ai_addr, sizeof(struct sockaddr_in6));
  
  			/* Add netmask of the interface */
-- 
2.41.0