Update to mDNSResponder-214.3.2

Changes unknown.

Also install dns-sd and manpages.

8 files changed, 73 insertions, 80 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 77240320083..2367488730a 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2010/07/13 11:18:48 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2010/07/14 09:29:04 sbd Exp $
 
-DISTNAME=	mDNSResponder-108
-PKGREVISION=	2
+DISTNAME=	mDNSResponder-214.3.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.opensource.apple.com/tarballs/mDNSResponder/
 
@@ -11,9 +10,10 @@ COMMENT=	Apple's mDNS responder
 
 MAKE_JOBS_SAFE=	no
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake flex
 BUILD_DIRS=	mDNSPosix
 BUILDDIR=	${WRKSRC}/mDNSPosix/build/prod
+AUTO_MKDIRS=	yes
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -48,8 +48,6 @@ BINARY=		mDNSClientPosix mDNSIdentify mDNSNetMonitor \
 		mDNSProxyResponderPosix mDNSResponderPosix
 SBINARY=	mdnsd dnsextd
 
-INSTALLATION_DIRS=	bin include lib sbin
-
 .if !empty(MACHINE_PLATFORM:MNetBSD-3.99.[1-7]-*) || \
     !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9]-*) || \
     !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9][._]*) || \
@@ -78,6 +76,10 @@ do-install:
 	for i in ${SBINARY}; do \
 		${INSTALL_PROGRAM} ${BUILDDIR}/$$i ${DESTDIR}${PREFIX}/sbin; \
 	done
+	${INSTALL_PROGRAM} ${WRKSRC}/Clients/build/dns-sd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mDNSShared/dns-sd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/mDNSShared/dnsextd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/mDNSShared/mDNSResponder.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/mdnsd.8
 	${INSTALL_DATA} ${WRKSRC}/mDNSShared/dns_sd.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_LIB} ${BUILDDIR}/libdns_sd.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib
 
diff --git a/net/mDNSResponder/PLIST b/net/mDNSResponder/PLIST
index 736b78ddb71..5f7f2fba241 100644
--- a/net/mDNSResponder/PLIST
+++ b/net/mDNSResponder/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/23 20:20:23 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/07/14 09:29:04 sbd Exp $
+bin/dns-sd
 bin/mDNSClientPosix
 bin/mDNSIdentify
 bin/mDNSNetMonitor
@@ -6,5 +7,8 @@ bin/mDNSProxyResponderPosix
 bin/mDNSResponderPosix
 include/dns_sd.h
 lib/libdns_sd.${SO_SUFFIX}
+man/man1/dns-sd.1
+man/man8/dnsextd.8
+man/man8/mdnsd.8
 sbin/dnsextd
 sbin/mdnsd
diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk
index 9c0b4678d99..b04a7b03191 100644
--- a/net/mDNSResponder/buildlink3.mk
+++ b/net/mDNSResponder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/07/14 09:29:04 sbd Exp $
 
 BUILDLINK_TREE+=	mDNSResponder
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	mDNSResponder
 MDNSRESPONDER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mDNSResponder+=	mDNSResponder>=98
-BUILDLINK_ABI_DEPENDS.mDNSResponder?=	mDNSResponder>=107.5nb1
+BUILDLINK_ABI_DEPENDS.mDNSResponder?=	mDNSResponder>=214.3.2
 BUILDLINK_PKGSRCDIR.mDNSResponder?=	../../net/mDNSResponder
 .endif # MDNSRESPONDER_BUILDLINK3_MK
 
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index e9c35a0da73..96eae9a064f 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2010/07/01 15:05:06 tez Exp $
+$NetBSD: distinfo,v 1.19 2010/07/14 09:29:04 sbd Exp $
 
-SHA1 (mDNSResponder-108.tar.gz) = d51509077be75ec8ba49c805fef701c3370428fc
-RMD160 (mDNSResponder-108.tar.gz) = 3a1961f3267bcf009b52c8d8ce234ee6045aeed2
-Size (mDNSResponder-108.tar.gz) = 1362840 bytes
-SHA1 (patch-aa) = 3e8dec4b8d28ed633818edcdea57881dcbb466dc
-SHA1 (patch-ab) = ca0921175169a007879dc3cea62ee191a969fbdc
-SHA1 (patch-ac) = 0613bd07f6626e5c06a3584bef8f2372dfef319a
-SHA1 (patch-udns) = 62710cea2b54af5f5dfca0ba04a36308e4456990
+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) = 9900768a7e3af94f2965320923ecf9d71ae8422b
+SHA1 (patch-ab) = 712e3999854215b9ea14f6d444262beef8c545b1
+SHA1 (patch-ac) = b7ca8fe77cae7f50dd715c910551818a65a0e118
+SHA1 (patch-ad) = fa77b934a63bd07f9b0a4697a3c1a59d242fca19
diff --git a/net/mDNSResponder/patches/patch-aa b/net/mDNSResponder/patches/patch-aa
index 4f63b058ba3..a2aa2fdcbc4 100644
--- a/net/mDNSResponder/patches/patch-aa
+++ b/net/mDNSResponder/patches/patch-aa
@@ -1,21 +1,24 @@
-$NetBSD: patch-aa,v 1.8 2006/03/03 22:30:56 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2010/07/14 09:29:04 sbd Exp $
 
---- mDNSPosix/Makefile.orig	2006-02-20 22:40:36.000000000 +0100
+Find libpthread.so when not on the default rpath.
+
+--- mDNSPosix/Makefile.orig	2009-02-02 19:44:06.000000000 +0000
 +++ mDNSPosix/Makefile
-@@ -275,6 +275,7 @@ CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE
- CC = gcc
- LD = gcc -shared
- LIBFLAGS = -lsocket -lnsl -lresolv
-+SYSTEMLIBS = -lsocket -lnsl
- JAVACFLAGS_OS += -I$(JDK)/include/solaris
- ifneq ($(DEBUG),1)
- STRIP = strip
-@@ -617,7 +618,7 @@ $(BUILDDIR)/mDNSNetMonitor:          $(S
- 	$(CC) $+ -o $@ $(LIBFLAGS)
- 
- $(BUILDDIR)/dnsextd:                 $(SPECIALOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
--	$(CC) $+ -o $@ $(LIBFLAGS) -lpthread
-+	$(CC) $+ -o $@ $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
- 
- #############################################################################
+@@ -326,7 +326,7 @@ LN = ln -s -f
+ CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
+ CFLAGS_PTHREAD =
+ LINKOPTS =
+-LINKOPTS_PTHREAD = -lpthread
++LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
+ LDSUFFIX = so
+ JAVACFLAGS_OS = -fPIC -shared -ldns_sd
  
+@@ -388,7 +388,7 @@ CFLAGS_OS =
+ #     -pthread
+ #       Link a user-threaded process against libc_r instead of libc.
+ CFLAGS_PTHREAD   = -pthread -D_THREAD_SAFE
+-LINKOPTS_PTHREAD = -pthread
++LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
+ JAVACFLAGS_OS += -I$(JDK)/include/freebsd
+ LDCONFIG = ldconfig
+ else
diff --git a/net/mDNSResponder/patches/patch-ab b/net/mDNSResponder/patches/patch-ab
index 8ba205b313d..dac0156ceb2 100644
--- a/net/mDNSResponder/patches/patch-ab
+++ b/net/mDNSResponder/patches/patch-ab
@@ -1,9 +1,14 @@
-$NetBSD: patch-ab,v 1.6 2010/07/01 15:05:06 tez Exp $
-add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
+$NetBSD: patch-ab,v 1.7 2010/07/14 09:29:04 sbd Exp $
 
---- mDNSPosix/mDNSPosix.c.orig	2006-02-20 15:40:36.000000000 -0600
-+++ mDNSPosix/mDNSPosix.c	2010-06-30 17:57:01.575378400 -0500
-@@ -633,7 +633,7 @@
+1) 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
+ -on NetBSD, build a HINFO record from hw.model and kern.osrelease
+
+--- mDNSPosix/mDNSPosix.c.orig	2009-01-25 03:16:46.000000000 +0000
++++ mDNSPosix/mDNSPosix.c
+@@ -581,7 +581,7 @@ mDNSexport int ParseDNSServers(mDNS *m, 
  	{
  	char line[256];
  	char nameserver[16];
@@ -12,7 +17,7 @@ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
  	int  numOfServers = 0;
  	FILE *fp = fopen(filePath, "r");
  	if (fp == NULL) return -1;
-@@ -652,6 +652,7 @@
+@@ -600,6 +600,7 @@ mDNSexport int ParseDNSServers(mDNS *m, 
  			numOfServers++;
  			}
  		}  
@@ -20,7 +25,7 @@ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
  	return (numOfServers > 0) ? 0 : -1;
  	}
  
-@@ -852,7 +853,13 @@
+@@ -802,7 +803,13 @@ mDNSlocal int SetupSocket(struct sockadd
  		{
  		struct ipv6_mreq imr6;
  		struct sockaddr_in6 bindAddr6;
@@ -35,7 +40,7 @@ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
  		if (err == 0)
  			{
  				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn));
-@@ -861,7 +868,13 @@
+@@ -811,7 +818,13 @@ mDNSlocal int SetupSocket(struct sockadd
  	#else
  		#warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
  	#endif
@@ -50,7 +55,7 @@ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
  		if (err == 0)
  			{
  				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn));
-@@ -1339,6 +1352,36 @@
+@@ -1293,6 +1306,36 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR
  	return(err == 0);
  	}
  
@@ -87,7 +92,7 @@ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007
  // mDNS core calls this routine to initialise the platform-specific data.
  mDNSexport mStatus mDNSPlatformInit(mDNS *const m)
  	{
-@@ -1360,6 +1403,10 @@
+@@ -1314,6 +1357,10 @@ mDNSexport mStatus mDNSPlatformInit(mDNS
  	GetUserSpecifiedRFC1034ComputerName(&m->hostlabel);
  	if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer");
  
diff --git a/net/mDNSResponder/patches/patch-ac b/net/mDNSResponder/patches/patch-ac
index 3e0cd44b478..8d9248f23d4 100644
--- a/net/mDNSResponder/patches/patch-ac
+++ b/net/mDNSResponder/patches/patch-ac
@@ -1,20 +1,22 @@
-$NetBSD: patch-ac,v 1.5 2007/03/10 00:59:28 rillig Exp $
+$NetBSD: patch-ac,v 1.6 2010/07/14 09:29:04 sbd Exp $
 
---- mDNSPosix/mDNSUNP.c.orig	2006-02-20 22:40:36.000000000 +0100
-+++ mDNSPosix/mDNSUNP.c	2007-03-10 01:50:52.000000000 +0100
-@@ -153,7 +153,10 @@ First checkin
+* 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
      #include <net/if_dl.h>
  #endif
  
 -#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX
 +#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX && !defined(sun)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <net/if_var.h>
-+#endif
- #include <netinet6/in6_var.h>
- #endif
- 
-@@ -203,6 +206,8 @@ struct ifi_info *get_ifi_info_linuxv6(in
+ #include <net/if_var.h>
+ #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
  					  addr[4],addr[5],addr[6],addr[7],
  					  &index, &plen, &scope, &flags, ifname) != EOF) {
  
@@ -23,7 +25,7 @@ $NetBSD: patch-ac,v 1.5 2007/03/10 00:59:28 rillig Exp $
  			myflags = 0;
  			if (strncmp(lastname, ifname, IFNAMSIZ) == 0) {
  				if (doaliases == 0)
-@@ -237,7 +242,6 @@ struct ifi_info *get_ifi_info_linuxv6(in
+@@ -273,7 +275,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 */
diff --git a/net/mDNSResponder/patches/patch-udns b/net/mDNSResponder/patches/patch-udns
deleted file mode 100644
index 317edab95ce..00000000000
--- a/net/mDNSResponder/patches/patch-udns
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-udns,v 1.2 2007/06/17 19:41:12 minskim Exp $
-
---- mDNSCore/uDNS.c.orig	2006-02-20 13:40:36.000000000 -0800
-+++ mDNSCore/uDNS.c
-@@ -3560,6 +3560,7 @@ mDNSlocal void getZoneData(mDNS *const m
- 	AsyncOpResult result;
- 	ntaContext *context = (ntaContext*)contextPtr;
- 	smAction action;
-+	mDNSIPPort zero = zeroIPPort;
- 
-     // unused
- 	(void)m;
-@@ -3622,8 +3623,8 @@ mDNSlocal void getZoneData(mDNS *const m
- 	result.zoneData.primaryAddr.type = mDNSAddrType_IPv4;
- 	AssignDomainName(&result.zoneData.zoneName, &context->zone);
- 	result.zoneData.zoneClass = context->zoneClass;
--	result.zoneData.llqPort    = context->findLLQPort    ? context->llqPort    : zeroIPPort;
--	result.zoneData.updatePort = context->findUpdatePort ? context->updatePort : zeroIPPort;
-+	result.zoneData.llqPort    = context->findLLQPort    ? context->llqPort    : zero;
-+	result.zoneData.updatePort = context->findUpdatePort ? context->updatePort : zero;
- 	context->callback(mStatus_NoError, context->m, context->callbackInfo, &result);
- 	goto cleanup;
-