diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2019-02-20 15:23:11 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-02-22 14:30:53 +0100 |
commit | 963fcfcb6fc40811e3efd132fb07626b3094e843 (patch) | |
tree | 1555f624a0bd3f762189c939b4e141d1be054acb | |
parent | ca2fe7d646fb62f046b81a524cbcb3457252e89e (diff) |
mDNSResponder: upgrade to release 878.200.35
Apple can't afford the costly GPG licenses to sign releases apparently,
but the sha256 matches some OpenWRT and FreshPorts repos...
Fixes CVE-2015-7988.
Removing windows build patches, fixed upstream (except for the last hunk
of the SOCKET patch, but that is in code that is only used on MacOSX).
Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb
Reviewed-on: https://gerrit.libreoffice.org/68092
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/mdnsresponder/UnpackedTarball_mDNSResponder.mk | 5 | ||||
-rw-r--r-- | external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 | 85 | ||||
-rw-r--r-- | external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 | 16 |
4 files changed, 2 insertions, 108 deletions
diff --git a/download.lst b/download.lst index 8cea5fb5fa7f..6bb974abc429 100644 --- a/download.lst +++ b/download.lst @@ -110,8 +110,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 := 8855cf852a6088cfdc792c6f7ceb0243 export MDDS_TARBALL := mdds-1.2.2.tar.bz2 -export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762 -export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz +export MDNSRESPONDER_MD5SUM := e773f290a7d29f1072247985d6add2ff +export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk index 5b0140e4c149..9b436b2f077c 100644 --- a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk +++ b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mDNSResponder)) $(eval $(call gb_UnpackedTarball_set_tarball,mDNSResponder,$(MDNSRESPONDER_TARBALL))) -$(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 deleted file mode 100644 index 9952f86e88ec..000000000000 --- a/external/mdnsresponder/mDNSResponder_Win32_SOCKET.patch.1 +++ /dev/null @@ -1,85 +0,0 @@ -commit 77838efb0748689ee77007a92d9a01e03e6dbdb7 -Author: Stephan Bergmann <sbergman@redhat.com> -AuthorDate: Fri Nov 27 22:40:23 2015 +0100 -Commit: Stephan Bergmann <sbergman@redhat.com> -CommitDate: Sat Nov 28 14:00:07 2015 +0100 - - Use proper return type for DNSServiceRefSockFD - - ...which is e.g. unsigned long long for Windows 64-bit (and declaring the - function in dns_sd.h is not necessary, and the dnssd_sock_t typedef is not known - there) - - Change-Id: Iaa0eb03a83b76200204ba905313bcc27b5007b39 - -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,35 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty - * - *********************************************************************************************/ - --/* DNSServiceRefSockFD() -- * -- * Access underlying Unix domain socket for an initialized DNSServiceRef. -- * The DNS Service Discovery implementation uses this socket to communicate between the client and -- * 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 -- * socket, the client should call DNSServiceProcessResult(), which will extract the daemon's -- * reply from the socket, and pass it to the appropriate application callback. By using a run -- * loop or select(), results from the daemon can be processed asynchronously. Alternatively, -- * 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. -- * -- * sdRef: A DNSServiceRef initialized by any of the DNSService calls. -- * -- * return value: The DNSServiceRef's underlying socket descriptor, or -1 on -- * error. -- */ -- --int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef); -- -- - /* DNSServiceProcessResult() - * - * Read a reply from the daemon, calling the appropriate application callback. This call will -diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c -index c38197c..c6b50a2 100644 ---- a/mDNSShared/dnssd_clientstub.c -+++ b/mDNSShared/dnssd_clientstub.c -@@ -799,7 +799,7 @@ cleanup: - return err; - } - --int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) -+dnssd_sock_t DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) - { - if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD called with NULL DNSServiceRef"); return dnssd_InvalidSocket; } - -@@ -816,7 +816,7 @@ int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) - return dnssd_InvalidSocket; - } - -- return (int) sdRef->sockfd; -+ return sdRef->sockfd; - } - - #if _DNS_SD_LIBDISPATCH -@@ -2025,7 +2025,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue - dispatch_queue_t queue - ) - { -- int dnssd_fd = DNSServiceRefSockFD(service); -+ dnssd_sock_t dnssd_fd = DNSServiceRefSockFD(service); - if (dnssd_fd == dnssd_InvalidSocket) return kDNSServiceErr_BadParam; - if (!queue) - { diff --git a/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 b/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 deleted file mode 100644 index 9f5c06260b12..000000000000 --- a/external/mdnsresponder/mDNSResponder_Win32_buildfix.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ ---- 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; |