diff options
| author | jmcneill <jmcneill> | 2010-12-15 22:33:41 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2010-12-15 22:33:41 +0000 |
| commit | 22fc2017b3942afbd5abd9918e3ad204ee09abf0 (patch) | |
| tree | 94ac0657ae74fde1b1044cb7f998bf8f611932a9 | |
| parent | b52966ffb25b3cd4398862bd7fa59ed65d754355 (diff) | |
| download | pkgsrc-22fc2017b3942afbd5abd9918e3ad204ee09abf0.tar.gz | |
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.
| -rw-r--r-- | net/mDNSResponder/Makefile | 3 | ||||
| -rw-r--r-- | net/mDNSResponder/distinfo | 4 | ||||
| -rw-r--r-- | net/mDNSResponder/patches/patch-ac | 17 |
3 files changed, 14 insertions, 10 deletions
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 7540098e93a..fb83dc40def 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2010/07/16 07:34:02 tnn Exp $ +# $NetBSD: Makefile,v 1.32 2010/12/15 22:33:41 jmcneill 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 e92213bf03a..0408b1b5396 100644 --- a/net/mDNSResponder/distinfo +++ b/net/mDNSResponder/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.22 2010/07/20 00:04:08 sbd Exp $ +$NetBSD: distinfo,v 1.23 2010/12/15 22:33:41 jmcneill 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 0f0cc2f4fa2..31b172f151e 100644 --- a/net/mDNSResponder/patches/patch-ac +++ b/net/mDNSResponder/patches/patch-ac @@ -1,22 +1,25 @@ -$NetBSD: patch-ac,v 1.7 2010/07/15 09:08:28 tnn Exp $ +$NetBSD: patch-ac,v 1.8 2010/12/15 22:33:42 jmcneill 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: patch-ac,v 1.7 2010/07/15 09:08:28 tnn Exp $ 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 */ |