- Update to 258.14

7 files changed, 33 insertions, 44 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index e26aa65f3997..5fc79a3b8343 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,14 +1,12 @@
-# ex:ts=8
 # Ports collection makefile for:  mDNSResponder
-# Date created:			  Tues Mar 2, 2004
-# Whom:				  Alfred Perlstein <alfred@freebsd.org>
+# Date created:		Tues Mar 2, 2004
+# Whom:			Alfred Perlstein <alfred@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	214.3.2
-PORTREVISION=	1
+PORTVERSION=	258.14
 CATEGORIES=	net dns
 MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
 
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 20d0ecd58e68..a66281e825f7 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mDNSResponder-214.3.2.tar.gz) = 5921fff55e66a53ca4f52065c18c6b06e97b1dd115959fad8a6410eb3ccf83cc
-SIZE (mDNSResponder-214.3.2.tar.gz) = 1633510
+SHA256 (mDNSResponder-258.14.tar.gz) = be654d50a3f8948bccf5711445364cf66cc6b3a14becb976bb718e3c9c732509
+SIZE (mDNSResponder-258.14.tar.gz) = 1833244
diff --git a/net/mDNSResponder/files/patch-aa b/net/mDNSResponder/files/patch-aa
deleted file mode 100644
index f056d9f1d7b4..000000000000
--- a/net/mDNSResponder/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- mDNSShared/dnssd_clientstub.c.orig	2009-12-24 18:06:21.000000000 +0900
-+++ mDNSShared/dnssd_clientstub.c	2009-12-24 18:09:24.000000000 +0900
-@@ -432,7 +432,7 @@
- 			{
- 			// Should never happen. If it does, it indicates some OS bug,
- 			// or that the mDNSResponder daemon crashed (which should never happen).
--			syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%d %d %s", sd, num_written, len,
-+			syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%d %d %s", sd, num_written, len,
- 				(num_written < 0) ? dnssd_errno                 : 0,
- 				(num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
- 			return -1;
-@@ -458,7 +458,7 @@
- 			{
- 			// Should never happen. If it does, it indicates some OS bug,
- 			// or that the mDNSResponder daemon crashed (which should never happen).
--			syslog(LOG_WARNING, "dnssd_clientstub read_all(%d) failed %ld/%d %d %s", sd, num_read, len,
-+			syslog(LOG_WARNING, "dnssd_clientstub read_all(%d) failed %zd/%d %d %s", sd, num_read, len,
- 				(num_read < 0) ? dnssd_errno                 : 0,
- 				(num_read < 0) ? dnssd_strerror(dnssd_errno) : "");
- 			return (num_read < 0 && dnssd_errno == dnssd_EWOULDBLOCK) ? read_all_wouldblock : read_all_fail;
diff --git a/net/mDNSResponder/files/patch-mDNSCore-mDNS.c b/net/mDNSResponder/files/patch-mDNSCore-mDNS.c
new file mode 100644
index 000000000000..db8070adab7e
--- /dev/null
+++ b/net/mDNSResponder/files/patch-mDNSCore-mDNS.c
@@ -0,0 +1,11 @@
+--- mDNSCore/mDNS.c.orig	2010-11-18 09:05:40.000000000 +0800
++++ mDNSCore/mDNS.c	2011-01-11 11:51:28.000000000 +0800
+@@ -4021,7 +4021,7 @@
+ 		}
+ 	
+ 	// Call the platform code to enable/disable sleep
+-	mDNSPlatformSetAllowSleep(m, allowSleep);
++	//mDNSPlatformSetAllowSleep(m, allowSleep);
+ 	}
+ 
+ mDNSlocal void SendSPSRegistration(mDNS *const m, NetworkInterfaceInfo *intf, const mDNSOpaque16 id)
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_Makefile b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
index ccb44e8b10bc..9d546ef5b950 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
@@ -1,6 +1,6 @@
---- mDNSPosix/Makefile.orig	2009-02-03 03:44:06.000000000 +0800
-+++ mDNSPosix/Makefile	2010-08-17 23:23:31.000000000 +0800
-@@ -380,7 +380,7 @@
+--- mDNSPosix/Makefile.orig	2009-08-11 09:13:47.000000000 +0800
++++ mDNSPosix/Makefile	2011-01-11 11:51:28.000000000 +0800
+@@ -118,7 +118,7 @@
  LOCALBASE?=/usr/local
  INSTBASE=$(LOCALBASE)
  STARTUPSCRIPTNAME=mdns.sh
@@ -9,7 +9,7 @@
  # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
  # and requires that the "-lpthread" link option NOT be used
  # This appies only to FreeBSD -- "man cc" on FreeBSD says:
-@@ -473,7 +473,7 @@
+@@ -211,7 +211,7 @@
  
  all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
  
@@ -18,7 +18,7 @@
  
  # 'setup' sets up the build directory structure the way we want
  setup:
-@@ -514,10 +514,10 @@
+@@ -252,10 +252,10 @@
  	@$(LD) $(LINKOPTS) -o $@ $+
  	@$(STRIP) $@
  
@@ -31,7 +31,7 @@
  	@$(MAKE) -C ../Clients
  
  # nss_mdns target builds the Name Service Switch module
-@@ -592,7 +592,7 @@
+@@ -330,7 +330,7 @@
  	cp $< $@
  	chmod 444 $@
  
@@ -40,7 +40,7 @@
  	cp $< $@
  	chmod 444 $@
  
-@@ -744,6 +744,8 @@
+@@ -482,6 +482,8 @@
  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
  
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c b/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
index 47cec1180bce..58c28b82169e 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
+++ b/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
@@ -1,6 +1,6 @@
---- mDNSPosix/mDNSPosix.c.orig	2009-01-25 04:16:46.000000000 +0100
-+++ mDNSPosix/mDNSPosix.c	2010-06-20 21:03:33.000000000 +0200
-@@ -581,7 +581,7 @@
+--- mDNSPosix/mDNSPosix.c.orig	2010-05-21 06:35:08.000000000 +0800
++++ mDNSPosix/mDNSPosix.c	2011-01-11 11:51:28.000000000 +0800
+@@ -467,7 +467,7 @@
  	{
  	char line[256];
  	char nameserver[16];
@@ -9,7 +9,7 @@
  	int  numOfServers = 0;
  	FILE *fp = fopen(filePath, "r");
  	if (fp == NULL) return -1;
-@@ -600,6 +600,7 @@
+@@ -486,6 +486,7 @@
  			numOfServers++;
  			}
  		}  
diff --git a/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h b/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
index 6a987ca7d5b4..98c9e318d054 100644
--- a/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
+++ b/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
@@ -1,6 +1,6 @@
---- mDNSShared/CommonServices.h.orig	2009-03-31 04:51:29.000000000 +0900
-+++ mDNSShared/CommonServices.h	2010-01-21 16:07:24.000000000 +0900
-@@ -92,6 +92,15 @@
+--- mDNSShared/CommonServices.h.orig	2009-08-11 09:13:47.000000000 +0800
++++ mDNSShared/CommonServices.h	2011-01-11 11:51:28.000000000 +0800
+@@ -54,6 +54,15 @@
  	#endif
  #endif
  
@@ -16,7 +16,7 @@
  // Linux
  
  #if( !defined( TARGET_OS_LINUX ) )
-@@ -128,7 +137,7 @@
+@@ -90,7 +99,7 @@
  	
  	// No predefined macro for VxWorks so just assume VxWorks if nothing else is set.
  	
@@ -25,7 +25,7 @@
  		#define	TARGET_OS_VXWORKS		1
  	#else
  		#define	TARGET_OS_VXWORKS		0
-@@ -217,6 +226,15 @@
+@@ -179,6 +188,15 @@
  	#include	<libkern/OSTypes.h>
  	#include	<sys/types.h>
  	
@@ -41,7 +41,7 @@
  #elif( TARGET_OS_LINUX )
  	
  	// Linux
-@@ -493,7 +511,7 @@
+@@ -455,7 +473,7 @@
  // - Windows
  
  #if( TARGET_LANGUAGE_C_LIKE )