mDNSResponder: upgrade to release 576.30.4

That's 197 more than the current release, surely a big improvement.

Change-Id: I48c81f9ae472a623ed9f59b94bb0bc921ad97c5c
Reviewed-on: https://gerrit.libreoffice.org/20303
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

3 files changed, 21 insertions, 2 deletions

diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
index 009901a26da5..5b0140e4c149 100644
--- a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
+++ b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mDNSResponder,$(MDNSRESPONDER_TARBA
 
 $(eval $(call gb_UnpackedTarball_add_patches,mDNSResponder,\
 	external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 \
+	external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 b/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
index e2840f52bc23..9952f86e88ec 100644
--- a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
+++ b/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1
@@ -16,7 +16,7 @@ diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h
 index 31daaeb..faaa741 100644
 --- a/mDNSShared/dns_sd.h
 +++ b/mDNSShared/dns_sd.h
-@@ -741,33 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty
+@@ -741,35 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty
  *
  *********************************************************************************************/
  
@@ -24,7 +24,7 @@ index 31daaeb..faaa741 100644
 - *
 - * Access underlying Unix domain socket for an initialized DNSServiceRef.
 - * The DNS Service Discovery implementation uses this socket to communicate between the client and
-- * the mDNSResponder daemon. The application MUST NOT directly read from or write to this socket.
+- * the daemon. The application MUST NOT directly read from or write to this socket.
 - * Access to the socket is provided so that it can be used as a kqueue event source, a CFRunLoop
 - * event source, in a select() loop, etc. When the underlying event management subsystem (kqueue/
 - * select/CFRunLoop etc.) indicates to the client that data is available for reading on the
@@ -34,6 +34,8 @@ index 31daaeb..faaa741 100644
 - * a client can choose to fork a thread and have it loop calling "DNSServiceProcessResult(ref);"
 - * If DNSServiceProcessResult() is called when no data is available for reading on the socket, it
 - * will block until data does become available, and then process the data and return to the caller.
+- * The application is reponsible for checking the return value of DNSServiceProcessResult() to determine
+- * if the socket is valid and if it should continue to process data on the socket.
 - * When data arrives on the socket, the client is responsible for calling DNSServiceProcessResult(ref)
 - * in a timely fashion -- if the client allows a large backlog of data to build up the daemon
 - * may terminate the connection.
diff --git a/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 b/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1
new file mode 100644
index 000000000000..9f5c06260b12
--- /dev/null
+++ b/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1
@@ -0,0 +1,16 @@
+--- mDNSResponder/mDNSShared/dnssd_clientstub.c.orig	2015-11-30 16:36:08.081554188 +0100
++++ mDNSResponder/mDNSShared/dnssd_clientstub.c	2015-11-30 16:38:35.749542735 +0100
+@@ -579,7 +579,12 @@
+             else 
+             {
+                 syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: connect() failed path:%s Socket:%d Err:%d Errno:%d %s", 
+-                       uds_serverpath, sdr->sockfd, err, dnssd_errno, dnssd_strerror(dnssd_errno));
++#if defined(USE_TCP_LOOPBACK)
++                       MDNS_TCP_SERVERADDR,
++#else
++                       uds_serverpath,
++#endif
++                       sdr->sockfd, err, dnssd_errno, dnssd_strerror(dnssd_errno));
+                 dnssd_close(sdr->sockfd); 
+                 FreeDNSServiceOp(sdr); 
+                 return kDNSServiceErr_ServiceNotRunning;