[Libreoffice-commits] core.git: download.lst external/mdnsresponder

[Michael Stahl]

 download.lst                                                |    4 +--
 external/mdnsresponder/UnpackedTarball_mDNSResponder.mk     |    1 
 external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1   |    6 +++-
 external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 |   16 ++++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit e24d08836403fef63aec70af054ef0d42c924345
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 30 16:08:01 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/download.lst b/download.lst
index 0201a61e..ff8f27a 100755
--- a/download.lst
+++ b/download.lst
@@ -95,8 +95,8 @@ export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
 export MDDS_TARBALL := mdds_1.0.0.tar.bz2
-export MDNSRESPONDER_MD5SUM := dd557e1058b51ac2f29cd01d67be0145
-export MDNSRESPONDER_TARBALL := mDNSResponder-379.37.tar.gz
+export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762
+export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
 export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk
index 009901a..5b0140e 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 e2840f5..9952f86 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 0000000..9f5c062
--- /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;